summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2009-08-01 22:09:40 +0000
committerPaul Smith <psmith@gnu.org>2009-08-01 22:09:40 +0000
commite2f16fdf45ec0506c68f32e9fc6a7b31ae17fdc6 (patch)
tree65af39bacf361af1a13c0a44780a9927175886a2 /configure.in
parent139c28ae6966b84e4c30898829a2202c6f3e0a3e (diff)
downloadgunmake-e2f16fdf45ec0506c68f32e9fc6a7b31ae17fdc6.tar.gz
Changes from Ralf Wildenhues.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index db19f91..2a0dffe 100644
--- a/configure.in
+++ b/configure.in
@@ -347,7 +347,6 @@ rm -f s.conftest conftoast
# Check the system to see if it provides GNU glob. If not, use our
# local version.
-
AC_MSG_CHECKING(if system libc has GNU glob)
AC_CACHE_VAL(make_cv_sys_gnu_glob, [
AC_EGREP_CPP(gnu glob,[
@@ -364,9 +363,14 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
#endif
], [AC_MSG_RESULT(yes)
make_cv_sys_gnu_glob=yes], [AC_MSG_RESULT([no; using local copy])
-AC_SUBST(GLOBINC) GLOBINC='-I$(srcdir)/glob'
-AC_SUBST(GLOBLIB) GLOBLIB=glob/libglob.a
make_cv_sys_gnu_glob=no])])
+if test "$make_cv_sys_gnu_glob" = no; then
+ GLOBINC='-I$(srcdir)/glob'
+ GLOBLIB=glob/libglob.a
+fi
+AC_SUBST(GLOBINC)
+AC_SUBST(GLOBLIB)
+
# Tell automake about this, so it can build the right .c files.
AM_CONDITIONAL(USE_LOCAL_GLOB, test "$make_cv_sys_gnu_glob" = no)