Changeset 24398


Ignore:
Timestamp:
Apr 24, 2007, 1:55:13 AM (13 years ago)
Author:
jmpp@…
Message:

Bring back autoconf detection of the mtree(8) binary in the same fashion as we do for tar, rsync and others, per jberry's suggestion.
This differs from what he had before for mtree(8), however, as we don't provide our own copy of the sources any longer in case the binary
can't be found.

Location:
trunk/base
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Mk/dports.autoconf.mk.in

    r24366 r24398  
    2626MD5_LIBS                = @MD5_LIBS@
    2727INSTALL                 = @INSTALL@
     28MTREE                   = @MTREE@
    2829LN_S                    = @LN_S@
    2930XCODEBUILD              = @XCODEBUILD@
  • trunk/base/configure

    r24366 r24398  
    678678SET_MAKE
    679679LN_S
     680MTREE
    680681CVS
    681682RSYNC
     
    752753LIBS
    753754CPPFLAGS
     755MTREE
    754756CVS
    755757RSYNC
     
    13671369  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
    13681370              you have headers in a nonstandard directory <include dir>
     1371  MTREE       path to mtree command
    13691372  CVS         path to cvs command
    13701373  RSYNC       path to rsync command
     
    30343037fi
    30353038
     3039# Extract the first word of "mtree", so it can be a program name with args.
     3040set dummy mtree; ac_word=$2
     3041{ echo "$as_me:$LINENO: checking for $ac_word" >&5
     3042echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
     3043if test "${ac_cv_path_MTREE+set}" = set; then
     3044  echo $ECHO_N "(cached) $ECHO_C" >&6
     3045else
     3046  case $MTREE in
     3047  [\\/]* | ?:[\\/]*)
     3048  ac_cv_path_MTREE="$MTREE" # Let the user override the test with a path.
     3049  ;;
     3050  *)
     3051  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     3052for as_dir in $PATH
     3053do
     3054  IFS=$as_save_IFS
     3055  test -z "$as_dir" && as_dir=.
     3056  for ac_exec_ext in '' $ac_executable_extensions; do
     3057  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3058    ac_cv_path_MTREE="$as_dir/$ac_word$ac_exec_ext"
     3059    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3060    break 2
     3061  fi
     3062done
     3063done
     3064IFS=$as_save_IFS
     3065
     3066  ;;
     3067esac
     3068fi
     3069MTREE=$ac_cv_path_MTREE
     3070if test -n "$MTREE"; then
     3071  { echo "$as_me:$LINENO: result: $MTREE" >&5
     3072echo "${ECHO_T}$MTREE" >&6; }
     3073else
     3074  { echo "$as_me:$LINENO: result: no" >&5
     3075echo "${ECHO_T}no" >&6; }
     3076fi
     3077
     3078
    30363079# Extract the first word of "cvs", so it can be a program name with args.
    30373080set dummy cvs; ac_word=$2
     
    33133356
    33143357# Define some precious variables allowing user to override PATH for some programs
     3358
    33153359
    33163360
     
    1017710221SET_MAKE!$SET_MAKE$ac_delim
    1017810222LN_S!$LN_S$ac_delim
     10223MTREE!$MTREE$ac_delim
    1017910224CVS!$CVS$ac_delim
    1018010225RSYNC!$RSYNC$ac_delim
     
    1021210257TCL_VERSION!$TCL_VERSION$ac_delim
    1021310258TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
    10214 TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
    1021510259_ACEOF
    1021610260
     
    1025410298for ac_last_try in false false false false false :; do
    1025510299  cat >conf$$subs.sed <<_ACEOF
     10300TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
    1025610301TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
    1025710302TCL_LIB_FLAG!$TCL_LIB_FLAG$ac_delim
     
    1028510330_ACEOF
    1028610331
    10287   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
     10332  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
    1028810333    break
    1028910334  elif $ac_last_try; then
  • trunk/base/configure.ac

    r24366 r24398  
    1414AC_PROG_MAKE_SET
    1515AC_PROG_LN_S
     16AC_PATH_PROG(MTREE, [mtree], [])
    1617AC_PATH_PROG(CVS, [cvs], [])
    1718AC_PATH_PROG(RSYNC, [rsync], [])
     
    2324
    2425# Define some precious variables allowing user to override PATH for some programs
     26AC_ARG_VAR(MTREE, [path to mtree command])
    2527AC_ARG_VAR(CVS, [path to cvs command])
    2628AC_ARG_VAR(RSYNC, [path to rsync command])
  • trunk/base/doc/Makefile

    r24366 r24398  
    2121        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${portconfigdir}
    2222
    23         cat prefix.mtree | mtree -U -e -p ${INSTALLDIR} > /dev/null
     23        cat prefix.mtree | $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
    2424        if test -L "${INSTALLDIR}/man" ; then \
    2525                rm -f "${INSTALLDIR}/man"; \
  • trunk/base/src/port/Makefile

    r24366 r24398  
    2222
    2323mkdirs:
    24         cat ../../doc/prefix.mtree | mtree -U -d -e -p ${INSTALLDIR} > /dev/null
     24        cat ../../doc/prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
    2525
    2626clean:
Note: See TracChangeset for help on using the changeset viewer.