From adf0be6ea87d85d79f2c0c4ddc3b22509ec51d17 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Thu, 9 Feb 2006 12:38:12 +0000 Subject: [PATCH] Update gnulib. --- configure.in | 5 +---- gl/Makefile.am | 10 ++++++++-- gl/dummy.c | 30 ++++++++++++++++++++++++++++++ gl/m4/gnulib-cache.m4 | 28 ++++++++++++++++++++++++++++ gl/m4/gnulib-comp.m4 | 39 +++++++++++++++++++++++++++++++++++++++ gl/m4/gnulib-tool.m4 | 33 +++++++++++++++++++++++++++++++++ gl/m4/gnulib.m4 | 40 ---------------------------------------- gl/memmove.c | 2 +- 8 files changed, 140 insertions(+), 47 deletions(-) create mode 100644 gl/dummy.c create mode 100644 gl/m4/gnulib-cache.m4 create mode 100644 gl/m4/gnulib-comp.m4 create mode 100644 gl/m4/gnulib-tool.m4 delete mode 100644 gl/m4/gnulib.m4 diff --git a/configure.in b/configure.in index 72e80e8..f60ccad 100644 --- a/configure.in +++ b/configure.in @@ -98,10 +98,7 @@ AC_ARG_ENABLE([ld-version-script], [ : ] ) AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") -gl_SOURCE_BASE(gl) -gl_M4_BASE(gl/m4) -gl_MODULES(memmove) -gl_LGPL +# For gnulib compatibility modules in gl/. gl_INIT AC_MSG_NOTICE([Detecting options for shared libraries]) diff --git a/gl/Makefile.am b/gl/Makefile.am index c895b5e..c42a54f 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -8,8 +8,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Invoked as: gnulib-tool --import -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool --lgpl memmove +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl memmove AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies @@ -17,6 +16,7 @@ noinst_LTLIBRARIES = libgnu.la libgnu_la_SOURCES = libgnu_la_LIBADD = @LTLIBOBJS@ +noinst_HEADERS = EXTRA_DIST = BUILT_SOURCES = SUFFIXES = @@ -25,5 +25,11 @@ CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = +## begin gnulib module dummy + +libgnu_la_SOURCES += dummy.c + +## end gnulib module dummy + # Makefile.am ends here diff --git a/gl/dummy.c b/gl/dummy.c new file mode 100644 index 0000000..df147e4 --- /dev/null +++ b/gl/dummy.c @@ -0,0 +1,30 @@ +/* A dummy file, to prevent empty libraries from breaking builds. + Copyright (C) 2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. */ + +/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create + libraries without any object files. You might get an error like: + + > ar cru .libs/libgl.a + > ar: no archive members specified + + Compiling this file, and adding its object file to the library, will + prevent the library from being empty. */ + +/* This declaration is solely to ensure that after preprocessing + this file is never empty. */ +typedef int dummy; diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4 new file mode 100644 index 0000000..e02ff9a --- /dev/null +++ b/gl/m4/gnulib-cache.m4 @@ -0,0 +1,28 @@ +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the specification of how gnulib-tool is used. +# It acts as a cache: It is written and read by gnulib-tool. +# In projects using CVS, this file is meant to be stored in CVS, +# like the configure.ac and various Makefile.am files. + + +# Specification in the form of a command-line invocation: +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl memmove + +# Specification in the form of a few gnulib-tool.m4 macro invocations: +gl_MODULES([memmove]) +gl_AVOID([]) +gl_SOURCE_BASE([gl]) +gl_M4_BASE([gl/m4]) +gl_TESTS_BASE([tests]) +gl_LIB([libgnu]) +gl_LGPL +gl_LIBTOOL +gl_MACRO_PREFIX([gl]) diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 new file mode 100644 index 0000000..59ab233 --- /dev/null +++ b/gl/m4/gnulib-comp.m4 @@ -0,0 +1,39 @@ +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the compiled summary of the specification in +# gnulib-cache.m4. It lists the computed macro invocations that need +# to be invoked from configure.ac. +# In projects using CVS, this file can be treated like other built files. + + +# This macro should be invoked from ./configure.in, in the section +# "Checks for programs", right after AC_PROG_CC, and certainly before +# any checks for libraries, header files, types and library functions. +AC_DEFUN([gl_EARLY], +[ + AC_REQUIRE([AC_PROG_RANLIB]) +]) + +# This macro should be invoked from ./configure.in, in the section +# "Check for header files, types and library functions". +AC_DEFUN([gl_INIT], +[ + AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) + gl_FUNC_MEMMOVE +]) + +# This macro records the list of files which have been installed by +# gnulib-tool and may be removed by future gnulib-tool invocations. +AC_DEFUN([gl_FILE_LIST], [ + lib/dummy.c + lib/memmove.c + m4/memmove.m4 + m4/onceonly_2_57.m4 +]) diff --git a/gl/m4/gnulib-tool.m4 b/gl/m4/gnulib-tool.m4 new file mode 100644 index 0000000..ef59320 --- /dev/null +++ b/gl/m4/gnulib-tool.m4 @@ -0,0 +1,33 @@ +# gnulib-tool.m4 serial 1 +dnl Copyright (C) 2004-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl The following macros need not be invoked explicitly. +dnl Invoking them does nothing except to declare default arguments +dnl for "gnulib-tool --import". + +dnl Usage: gl_MODULES([module1 module2 ...]) +AC_DEFUN([gl_MODULES], []) + +dnl Usage: gl_AVOID([module1 module2 ...]) +AC_DEFUN([gl_AVOID], []) + +dnl Usage: gl_SOURCE_BASE([DIR]) +AC_DEFUN([gl_SOURCE_BASE], []) + +dnl Usage: gl_M4_BASE([DIR]) +AC_DEFUN([gl_M4_BASE], []) + +dnl Usage: gl_LIB([LIBNAME]) +AC_DEFUN([gl_LIB], []) + +dnl Usage: gl_LGPL +AC_DEFUN([gl_LGPL], []) + +dnl Usage: gl_LIBTOOL +AC_DEFUN([gl_LIBTOOL], []) + +dnl Usage: gl_MACRO_PREFIX([PREFIX]) +AC_DEFUN([gl_MACRO_PREFIX], []) diff --git a/gl/m4/gnulib.m4 b/gl/m4/gnulib.m4 deleted file mode 100644 index e66a4e1..0000000 --- a/gl/m4/gnulib.m4 +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2004 Free Software Foundation, Inc. -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# Generated by gnulib-tool. -# -# Invoked as: gnulib-tool --import -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool --lgpl memmove - -AC_DEFUN([gl_EARLY], -[ -]) - -AC_DEFUN([gl_INIT], -[ - gl_FUNC_MEMMOVE -]) - -dnl Usage: gl_MODULES(module1 module2 ...) -AC_DEFUN([gl_MODULES], []) - -dnl Usage: gl_AVOID(module1 module2 ...) -AC_DEFUN([gl_AVOID], []) - -dnl Usage: gl_SOURCE_BASE(DIR) -AC_DEFUN([gl_SOURCE_BASE], []) - -dnl Usage: gl_M4_BASE(DIR) -AC_DEFUN([gl_M4_BASE], []) - -dnl Usage: gl_LIB(LIBNAME) -AC_DEFUN([gl_LIB], []) - -dnl Usage: gl_LGPL -AC_DEFUN([gl_LGPL], []) - -# gnulib.m4 ends here diff --git a/gl/memmove.c b/gl/memmove.c index 79cc782..753c899 100644 --- a/gl/memmove.c +++ b/gl/memmove.c @@ -3,7 +3,7 @@ In the public domain. By David MacKenzie . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif -- 2.7.4