[90072] trunk/base

Revision: 90072 http://trac.macports.org/changeset/90072 Author: jberry@macports.org Date: 2012-02-20 14:46:41 -0800 (Mon, 20 Feb 2012) Log Message: ----------- Cleanup and sort AC_PATH_PROG checking in configure Modified Paths: -------------- trunk/base/configure trunk/base/configure.ac Modified: trunk/base/configure =================================================================== --- trunk/base/configure 2012-02-20 22:23:51 UTC (rev 90071) +++ trunk/base/configure 2012-02-20 22:46:41 UTC (rev 90072) @@ -679,58 +679,58 @@ TAR_CMD TAR_Q SED_EXT -MDLS -MDFIND -SWIG -OPEN -XAR -PAX -MKBOM -LSBOM +HAVE_LAUNCHD +ZIP XZ -LZMA -BZIP2 -GNUPATCH -GNUMAKE -GNUTAR XCRUN XCODEBUILD -LAUNCHCTL -HAVE_LAUNCHD -HDIUTIL -MAKE -BSDMAKE -ZIP +XAR UNZIP TAR +SWIG +SVN SED -OPENSSL RSYNC RMDIR +PAX PATCH +OPENSSL +OPEN +MTREE +MKBOM +MDLS +MDFIND +MAKE +LZMA +LSBOM LIPO +LAUNCHCTL +HG +HDIUTIL GZIP -HG +GNUTAR +GNUPATCH +GNUMAKE GIT -SVN -CVS -BZR FILE DSEDITGROUP DSCL DIFF +CVS CPIO CP CHOWN -MTREE +BZR +BZIP2 +BSDMAKE +ac_ct_OBJC +OBJCFLAGS +OBJC +SET_MAKE LN_S -SET_MAKE INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -ac_ct_OBJC -OBJCFLAGS -OBJC OBJEXT EXEEXT ac_ct_CC @@ -832,23 +832,23 @@ CPPFLAGS OBJC OBJCFLAGS +BSDMAKE +BZIP2 +CVS +GNUMAKE +GNUTAR +LZMA +MAKE MTREE -CVS -SVN +OPEN OPENSSL RSYNC SED +SVN +SWIG TAR -MAKE -GNUTAR -BSDMAKE -GNUMAKE -BZIP2 -LZMA +XAR XZ -XAR -OPEN -SWIG OBJCPP CPP' ac_subdirs_all='src/thread2.6' @@ -1519,23 +1519,23 @@ you have headers in a nonstandard directory <include dir> OBJC Objective C compiler command OBJCFLAGS Objective C compiler flags + BSDMAKE path to bsdmake/pmake command + BZIP2 path to bzip2 command + CVS path to cvs command + GNUMAKE path to gnumake command + GNUTAR path to gnutar command + LZMA path to lzma command + MAKE path to make command MTREE path to mtree command - CVS path to cvs command - SVN path to svn command + OPEN path to open command OPENSSL path to openssl command RSYNC path to rsync command SED path to sed command + SVN path to svn command + SWIG path to swig command TAR path to tar command - MAKE path to make command - GNUTAR path to gnutar command - BSDMAKE path to bsdmake/pmake command - GNUMAKE path to gnumake command - BZIP2 path to bzip2 command - LZMA path to lzma command + XAR path to xar command XZ path to xz command - XAR path to xar command - OPEN path to open command - SWIG path to swig command OBJCPP Objective C preprocessor CPP C preprocessor @@ -3782,6 +3782,141 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL 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. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + ac_ext=m ac_cpp='$OBJCPP $CPPFLAGS' ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4033,162 +4168,112 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : + +for ac_prog in bsdmake pmake +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_BSDMAKE+:} false; then : $as_echo_n "(cached) " >&6 else + case $BSDMAKE in + [\\/]* | ?:[\\/]*) + ac_cv_path_BSDMAKE="$BSDMAKE" # 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=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - + 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_BSDMAKE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS -rm -rf conftest.one conftest.two conftest.dir - + ;; +esac fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL 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. - INSTALL=$ac_install_sh - fi +BSDMAKE=$ac_cv_path_BSDMAKE +if test -n "$BSDMAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BSDMAKE" >&5 +$as_echo "$BSDMAKE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + test -n "$BSDMAKE" && break +done -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +# Extract the first word of "bzip2", so it can be a program name with args. +set dummy bzip2; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_BZIP2+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; + case $BZIP2 in + [\\/]* | ?:[\\/]*) + ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path. + ;; *) - eval ac_cv_prog_make_${ac_make}_set=no;; + 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_BZIP2="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; esac -rm -f conftest.make fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= +BZIP2=$ac_cv_path_BZIP2 +if test -n "$BZIP2"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5 +$as_echo "$BZIP2" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi -# Extract the first word of "mtree", so it can be a program name with args. -set dummy mtree; ac_word=$2 +# Extract the first word of "bzr", so it can be a program name with args. +set dummy bzr; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MTREE+:} false; then : +if ${ac_cv_path_BZR+:} false; then : $as_echo_n "(cached) " >&6 else - case $MTREE in + case $BZR in [\\/]* | ?:[\\/]*) - ac_cv_path_MTREE="$MTREE" # Let the user override the test with a path. + ac_cv_path_BZR="$BZR" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/sbin" -for as_dir in $as_dummy +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_MTREE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_BZR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4199,10 +4284,10 @@ ;; esac fi -MTREE=$ac_cv_path_MTREE -if test -n "$MTREE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MTREE" >&5 -$as_echo "$MTREE" >&6; } +BZR=$ac_cv_path_BZR +if test -n "$BZR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZR" >&5 +$as_echo "$BZR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -4330,6 +4415,46 @@ fi +# Extract the first word of "cvs", so it can be a program name with args. +set dummy cvs; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CVS+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $CVS in + [\\/]* | ?:[\\/]*) + ac_cv_path_CVS="$CVS" # 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_CVS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +CVS=$ac_cv_path_CVS +if test -n "$CVS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CVS" >&5 +$as_echo "$CVS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "diff", so it can be a program name with args. set dummy diff; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4490,16 +4615,16 @@ fi -# Extract the first word of "bzr", so it can be a program name with args. -set dummy bzr; ac_word=$2 +# Extract the first word of "git", so it can be a program name with args. +set dummy git; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_BZR+:} false; then : +if ${ac_cv_path_GIT+:} false; then : $as_echo_n "(cached) " >&6 else - case $BZR in + case $GIT in [\\/]* | ?:[\\/]*) - ac_cv_path_BZR="$BZR" # Let the user override the test with a path. + ac_cv_path_GIT="$GIT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4509,7 +4634,7 @@ 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_BZR="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GIT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4520,36 +4645,39 @@ ;; esac fi -BZR=$ac_cv_path_BZR -if test -n "$BZR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZR" >&5 -$as_echo "$BZR" >&6; } +GIT=$ac_cv_path_GIT +if test -n "$GIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 +$as_echo "$GIT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "cvs", so it can be a program name with args. -set dummy cvs; ac_word=$2 +for ac_prog in gnumake gmake +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_CVS+:} false; then : +if ${ac_cv_path_GNUMAKE+:} false; then : $as_echo_n "(cached) " >&6 else - case $CVS in + case $GNUMAKE in [\\/]* | ?:[\\/]*) - ac_cv_path_CVS="$CVS" # Let the user override the test with a path. + ac_cv_path_GNUMAKE="$GNUMAKE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +as_dummy="$PATH:/usr/local/bin" +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_CVS="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GNUMAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4560,36 +4688,42 @@ ;; esac fi -CVS=$ac_cv_path_CVS -if test -n "$CVS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CVS" >&5 -$as_echo "$CVS" >&6; } +GNUMAKE=$ac_cv_path_GNUMAKE +if test -n "$GNUMAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5 +$as_echo "$GNUMAKE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "svn", so it can be a program name with args. -set dummy svn; ac_word=$2 + test -n "$GNUMAKE" && break +done + +for ac_prog in gnupatch gpatch +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SVN+:} false; then : +if ${ac_cv_path_GNUPATCH+:} false; then : $as_echo_n "(cached) " >&6 else - case $SVN in + case $GNUPATCH in [\\/]* | ?:[\\/]*) - ac_cv_path_SVN="$SVN" # Let the user override the test with a path. + ac_cv_path_GNUPATCH="$GNUPATCH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +as_dummy="$PATH:/usr/local/bin" +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_SVN="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GNUPATCH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4600,36 +4734,42 @@ ;; esac fi -SVN=$ac_cv_path_SVN -if test -n "$SVN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SVN" >&5 -$as_echo "$SVN" >&6; } +GNUPATCH=$ac_cv_path_GNUPATCH +if test -n "$GNUPATCH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUPATCH" >&5 +$as_echo "$GNUPATCH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "git", so it can be a program name with args. -set dummy git; ac_word=$2 + test -n "$GNUPATCH" && break +done + +for ac_prog in gnutar gtar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GIT+:} false; then : +if ${ac_cv_path_GNUTAR+:} false; then : $as_echo_n "(cached) " >&6 else - case $GIT in + case $GNUTAR in [\\/]* | ?:[\\/]*) - ac_cv_path_GIT="$GIT" # Let the user override the test with a path. + ac_cv_path_GNUTAR="$GNUTAR" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +as_dummy="$PATH:/usr/local/bin" +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_GIT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4640,56 +4780,19 @@ ;; esac fi -GIT=$ac_cv_path_GIT -if test -n "$GIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 -$as_echo "$GIT" >&6; } +GNUTAR=$ac_cv_path_GNUTAR +if test -n "$GNUTAR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 +$as_echo "$GNUTAR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "hg", so it can be a program name with args. -set dummy hg; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_HG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $HG in - [\\/]* | ?:[\\/]*) - ac_cv_path_HG="$HG" # 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_HG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi + test -n "$GNUTAR" && break done - done -IFS=$as_save_IFS - ;; -esac -fi -HG=$ac_cv_path_HG -if test -n "$HG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5 -$as_echo "$HG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4730,16 +4833,16 @@ fi -# Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 +# Extract the first word of "hdiutil", so it can be a program name with args. +set dummy hdiutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LIPO+:} false; then : +if ${ac_cv_path_HDIUTIL+:} false; then : $as_echo_n "(cached) " >&6 else - case $LIPO in + case $HDIUTIL in [\\/]* | ?:[\\/]*) - ac_cv_path_LIPO="$LIPO" # Let the user override the test with a path. + ac_cv_path_HDIUTIL="$HDIUTIL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4749,7 +4852,7 @@ 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_LIPO="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_HDIUTIL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4760,26 +4863,26 @@ ;; esac fi -LIPO=$ac_cv_path_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } +HDIUTIL=$ac_cv_path_HDIUTIL +if test -n "$HDIUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HDIUTIL" >&5 +$as_echo "$HDIUTIL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "patch", so it can be a program name with args. -set dummy patch; ac_word=$2 +# Extract the first word of "hg", so it can be a program name with args. +set dummy hg; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PATCH+:} false; then : +if ${ac_cv_path_HG+:} false; then : $as_echo_n "(cached) " >&6 else - case $PATCH in + case $HG in [\\/]* | ?:[\\/]*) - ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path. + ac_cv_path_HG="$HG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4789,7 +4892,7 @@ 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_PATCH="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4800,26 +4903,26 @@ ;; esac fi -PATCH=$ac_cv_path_PATCH -if test -n "$PATCH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5 -$as_echo "$PATCH" >&6; } +HG=$ac_cv_path_HG +if test -n "$HG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5 +$as_echo "$HG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "rmdir", so it can be a program name with args. -set dummy rmdir; ac_word=$2 +# Extract the first word of "launchctl", so it can be a program name with args. +set dummy launchctl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RMDIR+:} false; then : +if ${ac_cv_path_LAUNCHCTL+:} false; then : $as_echo_n "(cached) " >&6 else - case $RMDIR in + case $LAUNCHCTL in [\\/]* | ?:[\\/]*) - ac_cv_path_RMDIR="$RMDIR" # Let the user override the test with a path. + ac_cv_path_LAUNCHCTL="$LAUNCHCTL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4829,7 +4932,7 @@ 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_RMDIR="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_LAUNCHCTL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4840,26 +4943,26 @@ ;; esac fi -RMDIR=$ac_cv_path_RMDIR -if test -n "$RMDIR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5 -$as_echo "$RMDIR" >&6; } +LAUNCHCTL=$ac_cv_path_LAUNCHCTL +if test -n "$LAUNCHCTL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LAUNCHCTL" >&5 +$as_echo "$LAUNCHCTL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "rsync", so it can be a program name with args. -set dummy rsync; ac_word=$2 +# Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RSYNC+:} false; then : +if ${ac_cv_path_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else - case $RSYNC in + case $LIPO in [\\/]* | ?:[\\/]*) - ac_cv_path_RSYNC="$RSYNC" # Let the user override the test with a path. + ac_cv_path_LIPO="$LIPO" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4869,7 +4972,7 @@ 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_RSYNC="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4880,26 +4983,26 @@ ;; esac fi -RSYNC=$ac_cv_path_RSYNC -if test -n "$RSYNC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RSYNC" >&5 -$as_echo "$RSYNC" >&6; } +LIPO=$ac_cv_path_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "openssl", so it can be a program name with args. -set dummy openssl; ac_word=$2 +# Extract the first word of "lsbom", so it can be a program name with args. +set dummy lsbom; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_OPENSSL+:} false; then : +if ${ac_cv_path_LSBOM+:} false; then : $as_echo_n "(cached) " >&6 else - case $OPENSSL in + case $LSBOM in [\\/]* | ?:[\\/]*) - ac_cv_path_OPENSSL="$OPENSSL" # Let the user override the test with a path. + ac_cv_path_LSBOM="$LSBOM" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4909,7 +5012,7 @@ 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_OPENSSL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_LSBOM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4920,26 +5023,26 @@ ;; esac fi -OPENSSL=$ac_cv_path_OPENSSL -if test -n "$OPENSSL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5 -$as_echo "$OPENSSL" >&6; } +LSBOM=$ac_cv_path_LSBOM +if test -n "$LSBOM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LSBOM" >&5 +$as_echo "$LSBOM" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "sed", so it can be a program name with args. -set dummy sed; ac_word=$2 +# Extract the first word of "lzma", so it can be a program name with args. +set dummy lzma; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SED+:} false; then : +if ${ac_cv_path_LZMA+:} false; then : $as_echo_n "(cached) " >&6 else - case $SED in + case $LZMA in [\\/]* | ?:[\\/]*) - ac_cv_path_SED="$SED" # Let the user override the test with a path. + ac_cv_path_LZMA="$LZMA" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4949,7 +5052,7 @@ 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_SED="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_LZMA="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4960,26 +5063,26 @@ ;; esac fi -SED=$ac_cv_path_SED -if test -n "$SED"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 -$as_echo "$SED" >&6; } +LZMA=$ac_cv_path_LZMA +if test -n "$LZMA"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZMA" >&5 +$as_echo "$LZMA" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "tar", so it can be a program name with args. -set dummy tar; ac_word=$2 +# Extract the first word of "make", so it can be a program name with args. +set dummy make; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_TAR+:} false; then : +if ${ac_cv_path_MAKE+:} false; then : $as_echo_n "(cached) " >&6 else - case $TAR in + case $MAKE in [\\/]* | ?:[\\/]*) - ac_cv_path_TAR="$TAR" # Let the user override the test with a path. + ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4989,7 +5092,7 @@ 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_TAR="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5000,26 +5103,26 @@ ;; esac fi -TAR=$ac_cv_path_TAR -if test -n "$TAR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5 -$as_echo "$TAR" >&6; } +MAKE=$ac_cv_path_MAKE +if test -n "$MAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5 +$as_echo "$MAKE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "unzip", so it can be a program name with args. -set dummy unzip; ac_word=$2 +# Extract the first word of "mdfind", so it can be a program name with args. +set dummy mdfind; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_UNZIP+:} false; then : +if ${ac_cv_path_MDFIND+:} false; then : $as_echo_n "(cached) " >&6 else - case $UNZIP in + case $MDFIND in [\\/]* | ?:[\\/]*) - ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path. + ac_cv_path_MDFIND="$MDFIND" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5029,7 +5132,7 @@ 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_UNZIP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MDFIND="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5040,26 +5143,26 @@ ;; esac fi -UNZIP=$ac_cv_path_UNZIP -if test -n "$UNZIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5 -$as_echo "$UNZIP" >&6; } +MDFIND=$ac_cv_path_MDFIND +if test -n "$MDFIND"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MDFIND" >&5 +$as_echo "$MDFIND" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "zip", so it can be a program name with args. -set dummy zip; ac_word=$2 +# Extract the first word of "mdls", so it can be a program name with args. +set dummy mdls; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ZIP+:} false; then : +if ${ac_cv_path_MDLS+:} false; then : $as_echo_n "(cached) " >&6 else - case $ZIP in + case $MDLS in [\\/]* | ?:[\\/]*) - ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path. + ac_cv_path_MDLS="$MDLS" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5069,7 +5172,7 @@ 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_ZIP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MDLS="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5080,28 +5183,26 @@ ;; esac fi -ZIP=$ac_cv_path_ZIP -if test -n "$ZIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5 -$as_echo "$ZIP" >&6; } +MDLS=$ac_cv_path_MDLS +if test -n "$MDLS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MDLS" >&5 +$as_echo "$MDLS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -for ac_prog in bsdmake pmake -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "mkbom", so it can be a program name with args. +set dummy mkbom; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_BSDMAKE+:} false; then : +if ${ac_cv_path_MKBOM+:} false; then : $as_echo_n "(cached) " >&6 else - case $BSDMAKE in + case $MKBOM in [\\/]* | ?:[\\/]*) - ac_cv_path_BSDMAKE="$BSDMAKE" # Let the user override the test with a path. + ac_cv_path_MKBOM="$MKBOM" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5111,7 +5212,7 @@ 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_BSDMAKE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MKBOM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5122,39 +5223,37 @@ ;; esac fi -BSDMAKE=$ac_cv_path_BSDMAKE -if test -n "$BSDMAKE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BSDMAKE" >&5 -$as_echo "$BSDMAKE" >&6; } +MKBOM=$ac_cv_path_MKBOM +if test -n "$MKBOM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKBOM" >&5 +$as_echo "$MKBOM" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$BSDMAKE" && break -done - -# Extract the first word of "make", so it can be a program name with args. -set dummy make; ac_word=$2 +# Extract the first word of "mtree", so it can be a program name with args. +set dummy mtree; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MAKE+:} false; then : +if ${ac_cv_path_MTREE+:} false; then : $as_echo_n "(cached) " >&6 else - case $MAKE in + case $MTREE in [\\/]* | ?:[\\/]*) - ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path. + ac_cv_path_MTREE="$MTREE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +as_dummy="$PATH:/usr/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_MAKE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MTREE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5165,26 +5264,26 @@ ;; esac fi -MAKE=$ac_cv_path_MAKE -if test -n "$MAKE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5 -$as_echo "$MAKE" >&6; } +MTREE=$ac_cv_path_MTREE +if test -n "$MTREE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MTREE" >&5 +$as_echo "$MTREE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "hdiutil", so it can be a program name with args. -set dummy hdiutil; ac_word=$2 +# Extract the first word of "open", so it can be a program name with args. +set dummy open; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_HDIUTIL+:} false; then : +if ${ac_cv_path_OPEN+:} false; then : $as_echo_n "(cached) " >&6 else - case $HDIUTIL in + case $OPEN in [\\/]* | ?:[\\/]*) - ac_cv_path_HDIUTIL="$HDIUTIL" # Let the user override the test with a path. + ac_cv_path_OPEN="$OPEN" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5194,7 +5293,7 @@ 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_HDIUTIL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_OPEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5205,63 +5304,26 @@ ;; esac fi -HDIUTIL=$ac_cv_path_HDIUTIL -if test -n "$HDIUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HDIUTIL" >&5 -$as_echo "$HDIUTIL" >&6; } +OPEN=$ac_cv_path_OPEN +if test -n "$OPEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPEN" >&5 +$as_echo "$OPEN" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "launchd", so it can be a program name with args. -set dummy launchd; ac_word=$2 +# Extract the first word of "openssl", so it can be a program name with args. +set dummy openssl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAVE_LAUNCHD+:} false; then : +if ${ac_cv_path_OPENSSL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$HAVE_LAUNCHD"; then - ac_cv_prog_HAVE_LAUNCHD="$HAVE_LAUNCHD" # Let the user override the test. -else -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_prog_HAVE_LAUNCHD="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -HAVE_LAUNCHD=$ac_cv_prog_HAVE_LAUNCHD -if test -n "$HAVE_LAUNCHD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LAUNCHD" >&5 -$as_echo "$HAVE_LAUNCHD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "launchctl", so it can be a program name with args. -set dummy launchctl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LAUNCHCTL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LAUNCHCTL in + case $OPENSSL in [\\/]* | ?:[\\/]*) - ac_cv_path_LAUNCHCTL="$LAUNCHCTL" # Let the user override the test with a path. + ac_cv_path_OPENSSL="$OPENSSL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5271,7 +5333,7 @@ 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_LAUNCHCTL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_OPENSSL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5282,26 +5344,26 @@ ;; esac fi -LAUNCHCTL=$ac_cv_path_LAUNCHCTL -if test -n "$LAUNCHCTL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LAUNCHCTL" >&5 -$as_echo "$LAUNCHCTL" >&6; } +OPENSSL=$ac_cv_path_OPENSSL +if test -n "$OPENSSL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5 +$as_echo "$OPENSSL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "xcodebuild", so it can be a program name with args. -set dummy xcodebuild; ac_word=$2 +# Extract the first word of "patch", so it can be a program name with args. +set dummy patch; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XCODEBUILD+:} false; then : +if ${ac_cv_path_PATCH+:} false; then : $as_echo_n "(cached) " >&6 else - case $XCODEBUILD in + case $PATCH in [\\/]* | ?:[\\/]*) - ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path. + ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5311,7 +5373,7 @@ 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_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5322,26 +5384,26 @@ ;; esac fi -XCODEBUILD=$ac_cv_path_XCODEBUILD -if test -n "$XCODEBUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5 -$as_echo "$XCODEBUILD" >&6; } +PATCH=$ac_cv_path_PATCH +if test -n "$PATCH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5 +$as_echo "$PATCH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "xcrun", so it can be a program name with args. -set dummy xcrun; ac_word=$2 +# Extract the first word of "pax", so it can be a program name with args. +set dummy pax; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XCRUN+:} false; then : +if ${ac_cv_path_PAX+:} false; then : $as_echo_n "(cached) " >&6 else - case $XCRUN in + case $PAX in [\\/]* | ?:[\\/]*) - ac_cv_path_XCRUN="$XCRUN" # Let the user override the test with a path. + ac_cv_path_PAX="$PAX" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5351,7 +5413,7 @@ 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_XCRUN="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_PAX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5362,39 +5424,36 @@ ;; esac fi -XCRUN=$ac_cv_path_XCRUN -if test -n "$XCRUN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCRUN" >&5 -$as_echo "$XCRUN" >&6; } +PAX=$ac_cv_path_PAX +if test -n "$PAX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PAX" >&5 +$as_echo "$PAX" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -for ac_prog in gnutar gtar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "rmdir", so it can be a program name with args. +set dummy rmdir; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GNUTAR+:} false; then : +if ${ac_cv_path_RMDIR+:} false; then : $as_echo_n "(cached) " >&6 else - case $GNUTAR in + case $RMDIR in [\\/]* | ?:[\\/]*) - ac_cv_path_GNUTAR="$GNUTAR" # Let the user override the test with a path. + ac_cv_path_RMDIR="$RMDIR" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +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_GNUTAR="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5405,42 +5464,36 @@ ;; esac fi -GNUTAR=$ac_cv_path_GNUTAR -if test -n "$GNUTAR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 -$as_echo "$GNUTAR" >&6; } +RMDIR=$ac_cv_path_RMDIR +if test -n "$RMDIR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5 +$as_echo "$RMDIR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GNUTAR" && break -done - -for ac_prog in gnumake gmake -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "rsync", so it can be a program name with args. +set dummy rsync; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GNUMAKE+:} false; then : +if ${ac_cv_path_RSYNC+:} false; then : $as_echo_n "(cached) " >&6 else - case $GNUMAKE in + case $RSYNC in [\\/]* | ?:[\\/]*) - ac_cv_path_GNUMAKE="$GNUMAKE" # Let the user override the test with a path. + ac_cv_path_RSYNC="$RSYNC" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +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_GNUMAKE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_RSYNC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5451,42 +5504,36 @@ ;; esac fi -GNUMAKE=$ac_cv_path_GNUMAKE -if test -n "$GNUMAKE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5 -$as_echo "$GNUMAKE" >&6; } +RSYNC=$ac_cv_path_RSYNC +if test -n "$RSYNC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RSYNC" >&5 +$as_echo "$RSYNC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GNUMAKE" && break -done - -for ac_prog in gnupatch gpatch -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "sed", so it can be a program name with args. +set dummy sed; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GNUPATCH+:} false; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else - case $GNUPATCH in + case $SED in [\\/]* | ?:[\\/]*) - ac_cv_path_GNUPATCH="$GNUPATCH" # Let the user override the test with a path. + ac_cv_path_SED="$SED" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +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_GNUPATCH="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5497,29 +5544,26 @@ ;; esac fi -GNUPATCH=$ac_cv_path_GNUPATCH -if test -n "$GNUPATCH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUPATCH" >&5 -$as_echo "$GNUPATCH" >&6; } +SED=$ac_cv_path_SED +if test -n "$SED"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +$as_echo "$SED" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GNUPATCH" && break -done - -# Extract the first word of "bzip2", so it can be a program name with args. -set dummy bzip2; ac_word=$2 +# Extract the first word of "svn", so it can be a program name with args. +set dummy svn; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_BZIP2+:} false; then : +if ${ac_cv_path_SVN+:} false; then : $as_echo_n "(cached) " >&6 else - case $BZIP2 in + case $SVN in [\\/]* | ?:[\\/]*) - ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path. + ac_cv_path_SVN="$SVN" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5529,7 +5573,7 @@ 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_BZIP2="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_SVN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5540,36 +5584,37 @@ ;; esac fi -BZIP2=$ac_cv_path_BZIP2 -if test -n "$BZIP2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5 -$as_echo "$BZIP2" >&6; } +SVN=$ac_cv_path_SVN +if test -n "$SVN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SVN" >&5 +$as_echo "$SVN" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "lzma", so it can be a program name with args. -set dummy lzma; ac_word=$2 +# Extract the first word of "swig", so it can be a program name with args. +set dummy swig; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LZMA+:} false; then : +if ${ac_cv_path_SWIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $LZMA in + case $SWIG in [\\/]* | ?:[\\/]*) - ac_cv_path_LZMA="$LZMA" # Let the user override the test with a path. + ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +as_dummy="$PATH:/usr/local/bin" +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_LZMA="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5580,26 +5625,26 @@ ;; esac fi -LZMA=$ac_cv_path_LZMA -if test -n "$LZMA"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZMA" >&5 -$as_echo "$LZMA" >&6; } +SWIG=$ac_cv_path_SWIG +if test -n "$SWIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 +$as_echo "$SWIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "xz", so it can be a program name with args. -set dummy xz; ac_word=$2 +# Extract the first word of "tar", so it can be a program name with args. +set dummy tar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XZ+:} false; then : +if ${ac_cv_path_TAR+:} false; then : $as_echo_n "(cached) " >&6 else - case $XZ in + case $TAR in [\\/]* | ?:[\\/]*) - ac_cv_path_XZ="$XZ" # Let the user override the test with a path. + ac_cv_path_TAR="$TAR" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5609,7 +5654,7 @@ 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_XZ="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5620,26 +5665,26 @@ ;; esac fi -XZ=$ac_cv_path_XZ -if test -n "$XZ"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XZ" >&5 -$as_echo "$XZ" >&6; } +TAR=$ac_cv_path_TAR +if test -n "$TAR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5 +$as_echo "$TAR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "lsbom", so it can be a program name with args. -set dummy lsbom; ac_word=$2 +# Extract the first word of "unzip", so it can be a program name with args. +set dummy unzip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LSBOM+:} false; then : +if ${ac_cv_path_UNZIP+:} false; then : $as_echo_n "(cached) " >&6 else - case $LSBOM in + case $UNZIP in [\\/]* | ?:[\\/]*) - ac_cv_path_LSBOM="$LSBOM" # Let the user override the test with a path. + ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5649,7 +5694,7 @@ 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_LSBOM="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5660,26 +5705,26 @@ ;; esac fi -LSBOM=$ac_cv_path_LSBOM -if test -n "$LSBOM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LSBOM" >&5 -$as_echo "$LSBOM" >&6; } +UNZIP=$ac_cv_path_UNZIP +if test -n "$UNZIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5 +$as_echo "$UNZIP" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "mkbom", so it can be a program name with args. -set dummy mkbom; ac_word=$2 +# Extract the first word of "xar", so it can be a program name with args. +set dummy xar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MKBOM+:} false; then : +if ${ac_cv_path_XAR+:} false; then : $as_echo_n "(cached) " >&6 else - case $MKBOM in + case $XAR in [\\/]* | ?:[\\/]*) - ac_cv_path_MKBOM="$MKBOM" # Let the user override the test with a path. + ac_cv_path_XAR="$XAR" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5689,7 +5734,7 @@ 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_MKBOM="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_XAR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5700,26 +5745,26 @@ ;; esac fi -MKBOM=$ac_cv_path_MKBOM -if test -n "$MKBOM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKBOM" >&5 -$as_echo "$MKBOM" >&6; } +XAR=$ac_cv_path_XAR +if test -n "$XAR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAR" >&5 +$as_echo "$XAR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "pax", so it can be a program name with args. -set dummy pax; ac_word=$2 +# Extract the first word of "xcodebuild", so it can be a program name with args. +set dummy xcodebuild; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PAX+:} false; then : +if ${ac_cv_path_XCODEBUILD+:} false; then : $as_echo_n "(cached) " >&6 else - case $PAX in + case $XCODEBUILD in [\\/]* | ?:[\\/]*) - ac_cv_path_PAX="$PAX" # Let the user override the test with a path. + ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5729,7 +5774,7 @@ 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_PAX="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5740,26 +5785,26 @@ ;; esac fi -PAX=$ac_cv_path_PAX -if test -n "$PAX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PAX" >&5 -$as_echo "$PAX" >&6; } +XCODEBUILD=$ac_cv_path_XCODEBUILD +if test -n "$XCODEBUILD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5 +$as_echo "$XCODEBUILD" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "xar", so it can be a program name with args. -set dummy xar; ac_word=$2 +# Extract the first word of "xcrun", so it can be a program name with args. +set dummy xcrun; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XAR+:} false; then : +if ${ac_cv_path_XCRUN+:} false; then : $as_echo_n "(cached) " >&6 else - case $XAR in + case $XCRUN in [\\/]* | ?:[\\/]*) - ac_cv_path_XAR="$XAR" # Let the user override the test with a path. + ac_cv_path_XCRUN="$XCRUN" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5769,7 +5814,7 @@ 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" + ac_cv_path_XCRUN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5780,26 +5825,26 @@ ;; esac fi -XAR=$ac_cv_path_XAR -if test -n "$XAR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAR" >&5 -$as_echo "$XAR" >&6; } +XCRUN=$ac_cv_path_XCRUN +if test -n "$XCRUN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCRUN" >&5 +$as_echo "$XCRUN" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "open", so it can be a program name with args. -set dummy open; ac_word=$2 +# Extract the first word of "xz", so it can be a program name with args. +set dummy xz; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_OPEN+:} false; then : +if ${ac_cv_path_XZ+:} false; then : $as_echo_n "(cached) " >&6 else - case $OPEN in + case $XZ in [\\/]* | ?:[\\/]*) - ac_cv_path_OPEN="$OPEN" # Let the user override the test with a path. + ac_cv_path_XZ="$XZ" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5809,7 +5854,7 @@ 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_OPEN="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_XZ="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5820,37 +5865,36 @@ ;; esac fi -OPEN=$ac_cv_path_OPEN -if test -n "$OPEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPEN" >&5 -$as_echo "$OPEN" >&6; } +XZ=$ac_cv_path_XZ +if test -n "$XZ"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XZ" >&5 +$as_echo "$XZ" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "swig", so it can be a program name with args. -set dummy swig; ac_word=$2 +# Extract the first word of "zip", so it can be a program name with args. +set dummy zip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SWIG+:} false; then : +if ${ac_cv_path_ZIP+:} false; then : $as_echo_n "(cached) " >&6 else - case $SWIG in + case $ZIP in [\\/]* | ?:[\\/]*) - ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path. + ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +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_SWIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5861,36 +5905,35 @@ ;; esac fi -SWIG=$ac_cv_path_SWIG -if test -n "$SWIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 -$as_echo "$SWIG" >&6; } +ZIP=$ac_cv_path_ZIP +if test -n "$ZIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5 +$as_echo "$ZIP" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "mdfind", so it can be a program name with args. -set dummy mdfind; ac_word=$2 + +# Extract the first word of "launchd", so it can be a program name with args. +set dummy launchd; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MDFIND+:} false; then : +if ${ac_cv_prog_HAVE_LAUNCHD+:} false; then : $as_echo_n "(cached) " >&6 else - case $MDFIND in - [\\/]* | ?:[\\/]*) - ac_cv_path_MDFIND="$MDFIND" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$HAVE_LAUNCHD"; then + ac_cv_prog_HAVE_LAUNCHD="$HAVE_LAUNCHD" # Let the user override the test. +else +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_MDFIND="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_HAVE_LAUNCHD="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5898,54 +5941,13 @@ done IFS=$as_save_IFS - ;; -esac fi -MDFIND=$ac_cv_path_MDFIND -if test -n "$MDFIND"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MDFIND" >&5 -$as_echo "$MDFIND" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } fi - - -# Extract the first word of "mdls", so it can be a program name with args. -set dummy mdls; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MDLS+:} false; then : - $as_echo_n "(cached) " >&6 +HAVE_LAUNCHD=$ac_cv_prog_HAVE_LAUNCHD +if test -n "$HAVE_LAUNCHD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LAUNCHD" >&5 +$as_echo "$HAVE_LAUNCHD" >&6; } else - case $MDLS in - [\\/]* | ?:[\\/]*) - ac_cv_path_MDLS="$MDLS" # 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_MDLS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MDLS=$ac_cv_path_MDLS -if test -n "$MDLS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MDLS" >&5 -$as_echo "$MDLS" >&6; } -else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi Modified: trunk/base/configure.ac =================================================================== --- trunk/base/configure.ac 2012-02-20 22:23:51 UTC (rev 90071) +++ trunk/base/configure.ac 2012-02-20 22:46:41 UTC (rev 90072) @@ -82,73 +82,75 @@ # Checks for programs. AC_PROG_CC -AC_PROG_OBJC AC_PROG_INSTALL +AC_PROG_LN_S AC_PROG_MAKE_SET -AC_PROG_LN_S -AC_PATH_PROG(MTREE, [mtree], [], [$PATH:/usr/sbin]) +AC_PROG_OBJC + +AC_PATH_PROGS(BSDMAKE, [bsdmake pmake], []) +AC_PATH_PROG(BZIP2, [bzip2], []) +AC_PATH_PROG(BZR, [bzr], []) AC_PATH_PROG(CHOWN, [chown], [], [$PATH:/usr/sbin]) AC_PATH_PROG(CP, [cp], []) AC_PATH_PROG(CPIO, [cpio], []) +AC_PATH_PROG(CVS, [cvs], []) AC_PATH_PROG(DIFF, [diff], []) AC_PATH_PROG(DSCL, [dscl], []) AC_PATH_PROG(DSEDITGROUP, [dseditgroup], []) AC_PATH_PROG(FILE, [file], []) -AC_PATH_PROG(BZR, [bzr], []) -AC_PATH_PROG(CVS, [cvs], []) -AC_PATH_PROG(SVN, [svn], []) AC_PATH_PROG(GIT, [git], []) +AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [], [$PATH:/usr/local/bin]) +AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [], [$PATH:/usr/local/bin]) +AC_PATH_PROGS(GNUTAR, [gnutar gtar], [], [$PATH:/usr/local/bin]) +AC_PATH_PROG(GZIP, [gzip], []) +AC_PATH_PROG(HDIUTIL, [hdiutil], []) AC_PATH_PROG(HG, [hg], []) -AC_PATH_PROG(GZIP, [gzip], []) +AC_PATH_PROG(LAUNCHCTL, [launchctl], []) AC_PATH_PROG(LIPO, [lipo], []) +AC_PATH_PROG(LSBOM, [lsbom], []) +AC_PATH_PROG(LZMA, [lzma], []) +AC_PATH_PROG(MAKE, [make]) +AC_PATH_PROG(MDFIND, [mdfind], []) +AC_PATH_PROG(MDLS, [mdls], []) +AC_PATH_PROG(MKBOM, [mkbom], []) +AC_PATH_PROG(MTREE, [mtree], [], [$PATH:/usr/sbin]) +AC_PATH_PROG(OPEN, [open], []) +AC_PATH_PROG(OPENSSL, [openssl], []) AC_PATH_PROG(PATCH, [patch], []) +AC_PATH_PROG(PAX, [pax], []) AC_PATH_PROG(RMDIR, [rmdir], []) AC_PATH_PROG(RSYNC, [rsync], []) -AC_PATH_PROG(OPENSSL, [openssl], []) AC_PATH_PROG(SED, [sed]) +AC_PATH_PROG(SVN, [svn], []) +AC_PATH_PROG(SWIG, [swig], [], [$PATH:/usr/local/bin]) AC_PATH_PROG(TAR, [tar]) AC_PATH_PROG(UNZIP, [unzip]) -AC_PATH_PROG(ZIP, [zip]) -AC_PATH_PROGS(BSDMAKE, [bsdmake pmake], []) -AC_PATH_PROG(MAKE, [make]) -AC_PATH_PROG(HDIUTIL, [hdiutil], []) -AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], []) -AC_PATH_PROG(LAUNCHCTL, [launchctl], []) +AC_PATH_PROG(XAR, [xar], []) AC_PATH_PROG(XCODEBUILD, [xcodebuild], []) AC_PATH_PROG(XCRUN, [xcrun], []) -AC_PATH_PROGS(GNUTAR, [gnutar gtar], [], [$PATH:/usr/local/bin]) -AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [], [$PATH:/usr/local/bin]) -AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [], [$PATH:/usr/local/bin]) -AC_PATH_PROG(BZIP2, [bzip2], []) -AC_PATH_PROG(LZMA, [lzma], []) AC_PATH_PROG(XZ, [xz], []) -AC_PATH_PROG(LSBOM, [lsbom], []) -AC_PATH_PROG(MKBOM, [mkbom], []) -AC_PATH_PROG(PAX, [pax], []) -AC_PATH_PROG(XAR, [xar], []) -AC_PATH_PROG(OPEN, [open], []) -AC_PATH_PROG(SWIG, [swig], [], [$PATH:/usr/local/bin]) -AC_PATH_PROG(MDFIND, [mdfind], []) -AC_PATH_PROG(MDLS, [mdls], []) +AC_PATH_PROG(ZIP, [zip]) +AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], []) + # Define some precious variables allowing user to override PATH for some programs +AC_ARG_VAR(BSDMAKE, [path to bsdmake/pmake command]) +AC_ARG_VAR(BZIP2, [path to bzip2 command]) +AC_ARG_VAR(CVS, [path to cvs command]) +AC_ARG_VAR(GNUMAKE, [path to gnumake command]) +AC_ARG_VAR(GNUTAR, [path to gnutar command]) +AC_ARG_VAR(LZMA, [path to lzma command]) +AC_ARG_VAR(MAKE, [path to make command]) AC_ARG_VAR(MTREE, [path to mtree command]) -AC_ARG_VAR(CVS, [path to cvs command]) -AC_ARG_VAR(SVN, [path to svn command]) +AC_ARG_VAR(OPEN, [path to open command]) AC_ARG_VAR(OPENSSL, [path to openssl command]) AC_ARG_VAR(RSYNC, [path to rsync command]) AC_ARG_VAR(SED, [path to sed command]) +AC_ARG_VAR(SVN, [path to svn command]) +AC_ARG_VAR(SWIG, [path to swig command]) AC_ARG_VAR(TAR, [path to tar command]) -AC_ARG_VAR(MAKE, [path to make command]) -AC_ARG_VAR(GNUTAR, [path to gnutar command]) -AC_ARG_VAR(BSDMAKE, [path to bsdmake/pmake command]) -AC_ARG_VAR(GNUMAKE, [path to gnumake command]) -AC_ARG_VAR(BZIP2, [path to bzip2 command]) -AC_ARG_VAR(LZMA, [path to lzma command]) +AC_ARG_VAR(XAR, [path to xar command]) AC_ARG_VAR(XZ, [path to xz command]) -AC_ARG_VAR(XAR, [path to xar command]) -AC_ARG_VAR(OPEN, [path to open command]) -AC_ARG_VAR(SWIG, [path to swig command]) MP_SED_EXTENDED_REGEXP MP_TAR_FAST_READ