[23689] trunk/base/configure

source_changes at macosforge.org source_changes at macosforge.org
Fri Apr 6 14:02:43 PDT 2007


Revision: 23689
          http://trac.macosforge.org/projects/macports/changeset/23689
Author:   jberry at macports.org
Date:     2007-04-06 14:02:43 -0700 (Fri, 06 Apr 2007)

Log Message:
-----------
reconf following xar addition

Modified Paths:
--------------
    trunk/base/configure

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2007-04-06 21:01:55 UTC (rev 23688)
+++ trunk/base/configure	2007-04-06 21:02:43 UTC (rev 23689)
@@ -689,6 +689,7 @@
 CFLAGS_QUICHEEATERS
 MTREE
 subdirs
+XAR
 ENABLE_LAUNCHD_SUPPORT
 HAVE_FRAMEWORK_COREFOUNDATION
 HAVE_FRAMEWORK_SYSTEMCONFIGURATION
@@ -760,6 +761,7 @@
 CPP
 XMKMF'
 ac_subdirs_all='src/programs/mtree
+src/programs/xar
 src/thread2.6'
 
 # Initialize some variables set by options.
@@ -3492,12 +3494,64 @@
 		subdirs="$subdirs src/programs/mtree"
 
 		MTREE='$(TOPSRCDIR)/src/programs/mtree/mtree'
-#		MTREE='${prefix}/bin/mtree'
 		REPLACEMENT_PROGS="$REPLACEMENT_PROGS mtree"
 	fi
 
 
 
+
+
+	# Extract the first word of "xar", so it can be a program name with args.
+set dummy xar; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XAR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $XAR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XAR="$XAR" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="/usr/bin:/usr/sbin:/bin:/sbin"
+for as_dir in $as_dummy
+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_XAR="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XAR=$ac_cv_path_XAR
+if test -n "$XAR"; then
+  { echo "$as_me:$LINENO: result: $XAR" >&5
+echo "${ECHO_T}$XAR" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+	if test "x$XAR" = "x" ; then
+		subdirs="$subdirs src/programs/xar"
+
+		XAR='$(TOPSRCDIR)/src/programs/xar/xar'
+		REPLACEMENT_PROGS="$REPLACEMENT_PROGS xar"
+	fi
+
+
+
 # Check whether --enable-launchd-support was given.
 if test "${enable_launchd_support+set}" = set; then
   enableval=$enable_launchd_support;
@@ -10202,6 +10256,7 @@
 CFLAGS_QUICHEEATERS!$CFLAGS_QUICHEEATERS$ac_delim
 MTREE!$MTREE$ac_delim
 subdirs!$subdirs$ac_delim
+XAR!$XAR$ac_delim
 ENABLE_LAUNCHD_SUPPORT!$ENABLE_LAUNCHD_SUPPORT$ac_delim
 HAVE_FRAMEWORK_COREFOUNDATION!$HAVE_FRAMEWORK_COREFOUNDATION$ac_delim
 HAVE_FRAMEWORK_SYSTEMCONFIGURATION!$HAVE_FRAMEWORK_SYSTEMCONFIGURATION$ac_delim
@@ -10225,7 +10280,6 @@
 X_PRE_LIBS!$X_PRE_LIBS$ac_delim
 X_LIBS!$X_LIBS$ac_delim
 X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-TCL_VERSION!$TCL_VERSION$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -10267,6 +10321,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+TCL_VERSION!$TCL_VERSION$ac_delim
 TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
 TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
 TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
@@ -10299,7 +10354,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070406/5fa723eb/attachment.html


More information about the macports-changes mailing list