summaryrefslogtreecommitdiff
path: root/glob
diff options
context:
space:
mode:
Diffstat (limited to 'glob')
-rw-r--r--glob/ChangeLog6
-rw-r--r--glob/Makefile.am6
2 files changed, 11 insertions, 1 deletions
diff --git a/glob/ChangeLog b/glob/ChangeLog
index 98c506d..1ebf879 100644
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-22 Paul D. Smith <psmith@gnu.org>
+
+ * Makefile.am: Use automake 1.6.
+ Use new automake condition USE_LOCAL_GLOB to decide whether or not
+ to build the local GNU glob library or use the system one.
+
1999-09-12 Paul D. Smith <psmith@gnu.org>
* fnmatch.c: Last GLIBC version wouldn't compile outside of GLIBC
diff --git a/glob/Makefile.am b/glob/Makefile.am
index bd55725..325d200 100644
--- a/glob/Makefile.am
+++ b/glob/Makefile.am
@@ -2,9 +2,13 @@
AUTOMAKE_OPTIONS = 1.6 foreign
-noinst_LIBRARIES = libglob.a
+# Only build the library when the system doesn't already have GNU glob.
+if USE_LOCAL_GLOB
+ noinst_LIBRARIES = libglob.a
+endif
libglob_a_SOURCES = glob.c glob.h fnmatch.c fnmatch.h
+
EXTRA_DIST = COPYING.LIB Makefile.ami SCOPTIONS SMakefile \
configure.bat