Changeset 1082 for trunk/configure

Timestamp:

Jul 31, 2008, 6:30:08 PM (11 years ago)

Author:

gah

Message:

update makefile with mkdir_p

File:

• trunk/configure (modified) (11 diffs)

trunk/configure

@@ -692 +692 @@
 RANLIB
 LN_S
+MKDIR_P
 CPP
 GREP
@@ -732 +733 @@
 PERL_INCLUDES
 PERL_SITE_PACKAGES
+PERL_ARCHLIB
 PYTHON
 PYTHON_CPPFLAGS
@@ -750 +752 @@
 RP_BASE
 SHLIB_LDFLAGS
+TCL_VERSION
+TK_VERSION
 CFLAGS_DEFAULT
 LDFLAGS_DEFAULT
@@ -3472 +3476 @@
 $as_echo "no, using $LN_S" >&6; }
 fi
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+         for ac_exec_ext in '' $ac_executable_extensions; do
+           { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+             'mkdir (GNU coreutils) '* | \
+             'mkdir (coreutils) '* | \
+             'mkdir (fileutils) '4.1*)
+               ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+               break 3;;
+           esac
+         done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 
@@ -8721 +8767 @@
 PERL_INCLUDES=
 PERL_SITE_PACKAGES=
+PERL_ARCHLIB=
 if test "$with_perl" != "no" ; then
     { $as_echo "$as_me:$LINENO: checking for perl" >&5
 $as_echo_n "checking for perl... " >&6; }
-    if test -x "$with_perl/bin/perl"
-    then
-        echo Found perl in $with_perl/bin/perl
-        PERL="$with_perl/bin/perl"
-    else
-        if test -x "$with_perl"
-        then
-            echo Found perl in $with_perl
-            PERL="$with_perl"
-        else
-            # Extract the first word of "perl", so it can be a program name with args.
+    if test "$with_perl" != "yes" ; then
+      # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -8761 +8799 @@
 IFS=$as_save_IFS
 
+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="$with_perl/bin:$with_perl"
   ;;
 esac
@@ -8774 +8813 @@
 
 
-        fi
+    else
+      # Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PERL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
     fi
-    PERL_SITE_PACKAGES='$(libdir)/perl5'
+    if test "x${PERL}" != "x" ; then
+      PERL_ARCHLIB=`${PERL} -MConfig -e 'print $Config{archlib}'`
+      PERL_SITE_PACKAGES='$(libdir)/perl5'
+    fi
 fi
 { $as_echo "$as_me:$LINENO: result: ${PERL}" >&5
 $as_echo "${PERL}" >&6; }
+
 
 
@@ -9433 +9516 @@
 
 
+. ${exec_prefix}/lib/tclConfig.sh
+. ${exec_prefix}/lib/tkConfig.sh
+
+
+
 #--------------------------------------------------------------------
 # Set the default compiler switches based on the --enable-symbols
@@ -10019 +10107 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 AWK='$AWK'
 test -n "\$AWK" || AWK=awk
@@ -10574 +10663 @@
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
@@ -10630 +10724 @@
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "