summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>1998-03-19 07:24:22 +0000
committerTom Tromey <tromey@src.gnome.org>1998-03-19 07:24:22 +0000
commit9f85771f49a585638244e110090b28eb56ff421c (patch)
tree04505ed0d2e571db5640933f61f58ec52d433582
parent82bc60b9f9d27a53e58b157b768b1b0bd13d0d56 (diff)
downloadshared-mime-info-9f85771f49a585638244e110090b28eb56ff421c.tar.gz
Cache results of argp check.
Thu Mar 19 00:17:46 1998 Tom Tromey <tromey@cygnus.com> * gnome-support.m4: Cache results of argp check. svn path=/trunk/; revision=150
-rw-r--r--macros/ChangeLog4
-rw-r--r--macros/gnome-support.m416
2 files changed, 16 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 3ee6de53..b35b2a56 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 19 00:17:46 1998 Tom Tromey <tromey@cygnus.com>
+
+ * gnome-support.m4: Cache results of argp check.
+
Sun Mar 15 15:54:43 1998 Owen Taylor <owt1@cornell.edu>
* gnome-x-checks.m4: Replaced checks for X and GTK
diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4
index d6645a3d..d309f6de 100644
--- a/macros/gnome-support.m4
+++ b/macros/gnome-support.m4
@@ -14,10 +14,18 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[
# We check for argp_domain because we use it, and it appears only in
# very recent versions of the argp library.
- AC_TRY_COMPILE([#include <argp.h>], [
- struct argp foo;
- extern char *foo2;
- foo.argp_domain = foo2;],,LIBOBJS="$LIBOBJS argp-ba.o argp-eexst.o argp-fmtstream.o argp-fs-xinl.o argp-help.o argp-parse.o argp-pv.o argp-pvh.o argp-xinl.o")
+ AC_CACHE_CHECK([for working argp code], gnome_cv_argp, [
+ AC_TRY_COMPILE([#include <argp.h>], [
+ struct argp foo;
+ extern char *foo2;
+ foo.argp_domain = foo2;],
+ gnome_cv_argp=yes,
+ gnome_cv_argp=no)])
+
+ if test "$gnome_cv_argp" = no; then
+ LIBOBJS="$LIBOBJS argp-ba.o argp-eexst.o argp-fmtstream.o argp-fs-xinl.o argp-help.o argp-parse.o argp-pv.o argp-pvh.o argp-xinl.o"
+ fi
+
# This header enables some optimizations inside argp.
AC_CHECK_HEADERS(linewrap.h)