diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 1998-12-17 08:06:51 +0800 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-12-17 08:06:51 +0800 |
| commit | 52f6c4b4fe2c9ed4bed484b9e9d20a378275de61 (patch) | |
| tree | 10414afc3145a6a870585d335efccade7b3416bc | |
| parent | 853d13b9df8a8cd02081ea197770e8919d35f5d9 (diff) | |
| download | gsoc2013-evolution-52f6c4b4fe2c9ed4bed484b9e9d20a378275de61.tar gsoc2013-evolution-52f6c4b4fe2c9ed4bed484b9e9d20a378275de61.tar.gz gsoc2013-evolution-52f6c4b4fe2c9ed4bed484b9e9d20a378275de61.tar.bz2 gsoc2013-evolution-52f6c4b4fe2c9ed4bed484b9e9d20a378275de61.tar.lz gsoc2013-evolution-52f6c4b4fe2c9ed4bed484b9e9d20a378275de61.tar.xz gsoc2013-evolution-52f6c4b4fe2c9ed4bed484b9e9d20a378275de61.tar.zst gsoc2013-evolution-52f6c4b4fe2c9ed4bed484b9e9d20a378275de61.zip | |
Merge the changes from GNOME_STABLE into HEAD.
Merge the changes from GNOME_STABLE into HEAD.
Miguel.
svn path=/trunk/; revision=533
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/gnome-support.m4 | 23 |
2 files changed, 5 insertions, 23 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 7b84c4c4a5..d79fea7521 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +1998-12-16 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * gnome-support.m4: Removed all the stuff for argp, that was + causing gnomesupport not to build. + 1998-12-15 Martin Baulig <martin@home-of-linux.org> * gnome-gettext.m4: Add the hacked version of the gettext diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4 index 458b61096c..bfdad36e5f 100644 --- a/macros/gnome-support.m4 +++ b/macros/gnome-support.m4 @@ -15,29 +15,6 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[ AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") - # We check for argp_domain because we use it, and it appears only in - # very recent versions of the argp library. - 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) - - # 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" - fi - - # This header enables some optimizations inside argp. - AC_CHECK_HEADERS(linewrap.h) # for `scandir' AC_HEADER_DIRENT |