From 73795d4af5570440331621772d542df7922e6f5c Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 17 Sep 2005 18:02:42 +0000 Subject: [PATCH] Fix gnulib problems. --- ChangeLog | 9 +++++++++ Smake | 9 ++++++++- configure.ac | 4 ---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 357233d3..6792eb90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Sep 17 11:01:44 2005 Ben Pfaff + + Adapt to newer versions of gnulib. + + * Smake: Put gnulib options directly on its command line, instead + of embedding them in configure.ac. + + * configure.ac: Remove gnulib option commands. + Fri Aug 3 07:22:28 2005 Ben Pfaff * PSPP 0.4.0 released. diff --git a/Smake b/Smake index 404eb8a2..aaeb8c0b 100644 --- a/Smake +++ b/Smake @@ -3,10 +3,17 @@ GNULIB = ../gnulib GNULIB_TOOL = $(GNULIB)/gnulib-tool +GNULIB_MODULES = alloca alloca-opt assert full-read full-write \ +gethostname getline getlogin_r getopt gettext memchr memcmp memmem \ +memmove memset progname readlink restrict snprintf stat-macros stdbool \ +stpcpy strcase strcspn strerror strftime strstr strtod strtok_r strtol \ +strtoul vsnprintf xalloc xalloc-die xreadlink + all: po/POTFILES.in test -d m4 || mkdir m4 touch m4/Makefile.am - $(GNULIB_TOOL) --import + $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \ + --source-base=gl --lib=libgl --import $(GNULIB_MODULES) autoreconf --install gettextize: diff --git a/configure.ac b/configure.ac index f6474865..6fb870a7 100644 --- a/configure.ac +++ b/configure.ac @@ -97,10 +97,6 @@ AC_CHECK_HEADERS([limits.h memory.h sys/stat.h sys/time.h sys/types.h \ fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h] ) # For gnulib. -gl_LIB(libgl) -gl_SOURCE_BASE(gl) -gl_M4_BASE(gl/m4) -gl_MODULES(alloca alloca-opt assert full-read full-write gethostname getline getlogin_r getopt gettext memchr memcmp memmem memmove memset progname readlink restrict snprintf stat-macros stdbool stpcpy strcase strcspn strerror strftime strstr strtod strtok_r strtol strtoul vsnprintf xalloc xalloc-die xreadlink) gl_INIT AC_C_CONST -- 2.30.2