Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/configure.ac b/configure.ac
index 01fa0f0bdaf7a1094a327bde230d3dad5c762a62..84fd7f1e1f2fd670de38a43bfe65d3988fc4767e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,12 +69,26 @@ fi \
 ## Site configuration related to programs (before tests)
 ## --with-PACKAGE[=ARG] and --without-PACKAGE
 #
+# Set lib to alternative name of lib directory (e.g. lib64)
+AC_ARG_WITH([lib],
+ [AS_HELP_STRING([--with-lib=ARG],
+                 [ARG specifies alternative name for lib directory])],
+ [if test "$withval" = "no" -o "$withval" = "yes"; then \
+       AC_MSG_WARN([You should provide name for --with-lib=ARG]); \
+else \
+       GIT_CONF_APPEND_LINE(lib=$withval); \
+fi; \
+],[])
+#
 # Define SHELL_PATH to provide path to shell.
 GIT_ARG_SET_PATH(shell)
 #
 # Define PERL_PATH to provide path to Perl.
 GIT_ARG_SET_PATH(perl)
 #
+# Define ZLIB_PATH to provide path to zlib.
+GIT_ARG_SET_PATH(zlib)
+#
 # Declare the with-tcltk/without-tcltk options.
 AC_ARG_WITH(tcltk,
 AS_HELP_STRING([--with-tcltk],[use Tcl/Tk GUI (default is YES)])
@@ -102,12 +116,10 @@ if test -z "$NO_TCLTK"; then
   elif test "$with_tcltk" = "yes"; then
   # Tcl/Tk check requested.
     AC_CHECK_PROGS(TCLTK_PATH, [wish], )
-  elif test -x "$with_tcltk"; then
+  else
     AC_MSG_RESULT([Using Tcl/Tk interpreter $with_tcltk])
     TCLTK_PATH="$with_tcltk"
     AC_SUBST(TCLTK_PATH)
-  else
-    AC_MSG_ERROR([Tcl/Tk interpreter was not found in $with_tcltk])
   fi
 fi