[104693] branches/new-help-system/base

31 Mar 2013

Revision: 104693
          https://trac.macports.org/changeset/104693
Author:   raimue@macports.org
Date:     2013-03-31 14:46:35 -0700 (Sun, 31 Mar 2013)
Log Message:
-----------
configure, macports1.0:
Detect path to man during configure and assign in macports_autoconf.tcl.in

Modified Paths:
--------------
    branches/new-help-system/base/configure
    branches/new-help-system/base/configure.ac
    branches/new-help-system/base/src/macports1.0/macports_autoconf.tcl.in

Modified: branches/new-help-system/base/configure
===================================================================

--- branches/new-help-system/base/configure	2013-03-31 21:43:13 UTC (rev 104692)
+++ branches/new-help-system/base/configure	2013-03-31 21:46:35 UTC (rev 104693)
@@ -638,7 +638,6 @@
 SHLIB_CFLAGS
 SHLIB_LD
 STLIB_LD
-PATHCONF
 INCLUDES
 subdirs
 SQLITE3_TCL_DIR
@@ -721,6 +720,7 @@
 MKBOM
 MDLS
 MDFIND
+MAN
 MAKE
 LZMA
 LSBOM
@@ -861,6 +861,7 @@
 GNUTAR
 LZMA
 MAKE
+MAN
 MTREE
 OPEN
 OPENSSL
@@ -1546,6 +1547,7 @@
   GNUTAR      path to gnutar command
   LZMA        path to lzma command
   MAKE        path to make command
+  MAN         path to man command
   MTREE       path to mtree command
   OPEN        path to open command
   OPENSSL     path to openssl command
@@ -5185,6 +5187,46 @@
 fi
 
 
+# Extract the first word of "man", so it can be a program name with args.
+set dummy man; 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_MAN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MAN="$MAN" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MAN="$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
+MAN=$ac_cv_path_MAN
+if test -n "$MAN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAN" >&5
+$as_echo "$MAN" >&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
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -6085,6 +6127,7 @@
 
 
 
+
 if test "x$MTREE" = "x"; then
     as_fn_error $? "mtree not found" "$LINENO" 5
 fi
@@ -10068,7 +10111,6 @@
 
 
 
-
 # misc variables that need to be expanded for substitution into tcl
 
 oldprefix=$prefix

Modified: branches/new-help-system/base/configure.ac
===================================================================
--- branches/new-help-system/base/configure.ac	2013-03-31 21:43:13 UTC (rev 104692)
+++ branches/new-help-system/base/configure.ac	2013-03-31 21:46:35 UTC (rev 104693)
@@ -124,6 +124,7 @@
 AC_PATH_PROG(LSBOM, [lsbom], [])
 AC_PATH_PROG(LZMA, [lzma], [])
 AC_PATH_PROG(MAKE, [make])
+AC_PATH_PROG(MAN, [man])
 AC_PATH_PROG(MDFIND, [mdfind], [])
 AC_PATH_PROG(MDLS, [mdls], [])
 AC_PATH_PROG(MKBOM, [mkbom], [])
@@ -156,6 +157,7 @@
 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(MAN, [path to man command])
 AC_ARG_VAR(MTREE, [path to mtree command])
 AC_ARG_VAR(OPEN, [path to open command])
 AC_ARG_VAR(OPENSSL, [path to openssl command])

Modified: branches/new-help-system/base/src/macports1.0/macports_autoconf.tcl.in
===================================================================
--- branches/new-help-system/base/src/macports1.0/macports_autoconf.tcl.in	2013-03-31 21:43:13 UTC (rev 104692)
+++ branches/new-help-system/base/src/macports1.0/macports_autoconf.tcl.in	2013-03-31 21:46:35 UTC (rev 104693)
@@ -40,6 +40,7 @@
     variable macports_version "@MACPORTS_VERSION@"
     variable macports_user_dir "~/.macports"
     variable macportsuser "@RUNUSR@"
+    variable man_path "@MAN@"
     variable mdfind_path "@MDFIND@"
     variable mdls_path "@MDLS@"
     variable open_path "@OPEN@"

    

raimue＠macports.org

tags

participants (1)