diff options
| author | Tom Tromey <tromey@cygnus.com> | 1998-03-19 20:23:21 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@src.gnome.org> | 1998-03-19 20:23:21 +0000 |
| commit | 2812276f15c49e9bb94197a207e0ec8022d3709b (patch) | |
| tree | 375fef4c336b1fef5c7c902a3ec0845fa336a483 | |
| parent | 9f85771f49a585638244e110090b28eb56ff421c (diff) | |
| download | gnome-common-2812276f15c49e9bb94197a207e0ec8022d3709b.tar.gz | |
Cache results of check for program_invocation_short_name,
Thu Mar 19 00:17:46 1998 Tom Tromey <tromey@cygnus.com>
* gnome-support.m4: Cache results of check for
program_invocation_short_name, program_invocation_name. Check to
make sure argp functions are in a library.
svn path=/trunk/; revision=151
| -rw-r--r-- | macros/ChangeLog | 4 | ||||
| -rw-r--r-- | macros/gnome-support.m4 | 30 |
2 files changed, 27 insertions, 7 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index b35b2a5..598e046 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,5 +1,9 @@ Thu Mar 19 00:17:46 1998 Tom Tromey <tromey@cygnus.com> + * gnome-support.m4: Cache results of check for + program_invocation_short_name, program_invocation_name. Check to + make sure argp functions are in a library. + * gnome-support.m4: Cache results of argp check. Sun Mar 15 15:54:43 1998 Owen Taylor <owt1@cornell.edu> diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4 index d309f6d..c2b28b4 100644 --- a/macros/gnome-support.m4 +++ b/macros/gnome-support.m4 @@ -20,7 +20,14 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[ extern char *foo2; foo.argp_domain = foo2;], gnome_cv_argp=yes, - gnome_cv_argp=no)]) + gnome_cv_argp=no) + + # It is possible to have the argp headers installed but not have + # the code in the C library. At least, there have been reports of + # this happening. So we check for this case explicitly. + if test "$gnome_cv_argp" = yes; then + AC_CHECK_FUNC(argp_parse,,gnome_cv_argp=no) + fi]) 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" @@ -29,12 +36,21 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[ # This header enables some optimizations inside argp. AC_CHECK_HEADERS(linewrap.h) - AC_TRY_LINK([#include <errno.h>],[ - char *foo = program_invocation_short_name], [ - AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME)]) - AC_TRY_LINK([#include <errno.h>],[ - char *foo = program_invocation_name], [ - AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME)]) + AC_CACHE_CHECK([for program_invocation_short_name], gnome_cv_short_name, [ + AC_TRY_LINK([#include <errno.h>],[ + char *foo = program_invocation_short_name], + gnome_cv_short_name=yes, gnome_cv_short_name=no)]) + if test "$gnome_cv_short_name" = yes; then + AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME) + fi + + AC_CACHE_CHECK([for program_invocation_name], gnome_cv_invocation_name, [ + AC_TRY_LINK([#include <errno.h>],[ + char *foo = program_invocation_name], + gnome_cv_invocation_name=yes, gnome_cv_invocation_name=no)]) + if test "$gnome_cv_invocation_name" = yes; then + AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME) + fi AC_CHECK_FUNCS(vsnprintf,,[ AC_CHECK_FUNCS(__vsnprintf, |