diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 1998-12-17 00:07:13 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-12-17 00:07:13 +0000 |
| commit | 2ae2fbdbff3dbd6df7a0d1e3698bfa97c141d21f (patch) | |
| tree | e00e19083517a7ce533de50211a5fb22cde16ecd | |
| parent | 62179bbd789010c850e089dcbaefd003c5a81d50 (diff) | |
| download | gnome-common-2ae2fbdbff3dbd6df7a0d1e3698bfa97c141d21f.tar.gz | |
Merge the changes from GNOME_STABLE into HEAD.
Merge the changes from GNOME_STABLE into HEAD.
Miguel.
svn path=/trunk/; revision=535
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/gnome-support.m4 | 23 | ||||
| -rw-r--r-- | support/ChangeLog | 7 | ||||
| -rw-r--r-- | support/Makefile.am | 4 |
4 files changed, 14 insertions, 25 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 7b84c4c..d79fea7 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 458b610..bfdad36 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 diff --git a/support/ChangeLog b/support/ChangeLog index 1f4644a..8bef4ed 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,10 @@ +1998-12-16 Sebastian Wilhelmi <wilhelmi@ira.uka.de> + + * Makefile.am (libgnomesupport_la_SOURCES): added gnome-argp.c, + which is needed for platforms without + program_invocation_short_name and program_invocation_name. + (libgnomesupport_la_LIBADD): reinstalled the correct value. + 1998-12-15 Martin Baulig <martin@home-of-linux.org> * Makefile.am (EXTRA_DIST): Add all source and header files here. diff --git a/support/Makefile.am b/support/Makefile.am index 4665ee4..aec0419 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -23,8 +23,8 @@ include_HEADERS = popt-gnome.h popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c -libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) -#libgnomesupport_la_LIBADD = @LTLIBOBJS@ +libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c +libgnomesupport_la_LIBADD = @LTLIBOBJS@ libgnomesupport_la_LDFLAGS = -version-info 0:0:0 BUILT_SOURCES = gnomesupport.h |