diff options
32 files changed, 60 insertions, 2788 deletions
diff --git a/Admin/release-steps b/Admin/release-steps index 243e6b9..94b08af 100644 --- a/Admin/release-steps +++ b/Admin/release-steps @@ -50,7 +50,6 @@ Tasks not to forget before release: - Update NEWS - autoconf-lib-link/NEWS gettext-runtime/libasprintf/NEWS gettext-runtime/NEWS @@ -1,3 +1,16 @@ +2010-04-02 Bruno Haible <bruno@clisp.org> + + Remove autoconf-lib-link directory, obsoleted by gnulib. + * Makefile.am (SUBDIRS): Remove autoconf-lib-link. + ($(srcdir)/configure): Don't depend on autoconf-lib-link/configure.ac. + (distcheck-hook): Remove checks of lib-*.m4 and config.rpath. + * autogen.sh (GNULIB_MODULES_RUNTIME_FOR_SRC): Add havelib. + Remove configuration of autoconf-lib-link subdirectory. Remove + "-I ../autoconf-lib-link/m4" option to aclocal. Don't copy + config.rpath. + * configure.ac (AC_CONFIG_SUBDIRS): Remove autoconf-lib-link. + Don't recurse into autoconf-lib-link. + 2010-03-30 Bruno Haible <bruno@clisp.org> * README.woe32: Update for Cygwin 1.7.x. diff --git a/Makefile.am b/Makefile.am index ac2fbba..2cf5f39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the toplevel directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc. +## Copyright (C) 1995-1999, 2000-2010 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL = build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link +SUBDIRS = gnulib-local gettext-runtime gettext-tools EXTRA_DIST = \ version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \ @@ -29,7 +29,7 @@ EXTRA_DIST = \ m4/libtool.m4 # Additional dependencies for configure, due to the use of autoconf --trace. -$(srcdir)/configure: $(srcdir)/autoconf-lib-link/configure.ac $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-tools/configure.ac +$(srcdir)/configure: $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-tools/configure.ac # Verify that some files are the same. distcheck-hook: @@ -89,10 +89,6 @@ distcheck-hook: cmp -s gettext-runtime/intl/vasnprintf.c gettext-runtime/libasprintf/vasnprintf.c cmp -s gettext-runtime/intl/xsize.h gettext-runtime/libasprintf/xsize.h test "`sed 1,18d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/xsize.h | md5sum`" - cmp -s autoconf-lib-link/m4/lib-ld.m4 gettext-tools/gnulib-m4/lib-ld.m4 - cmp -s autoconf-lib-link/m4/lib-link.m4 gettext-tools/gnulib-m4/lib-link.m4 - cmp -s autoconf-lib-link/m4/lib-prefix.m4 gettext-tools/gnulib-m4/lib-prefix.m4 - cmp -s autoconf-lib-link/config.rpath build-aux/config.rpath cmp -s gettext-runtime/man/help2man gettext-tools/man/help2man cmp -s gettext-runtime/man/x-to-1.in gettext-tools/man/x-to-1.in cmp -s gettext-runtime/libasprintf/texi2html gettext-tools/doc/texi2html diff --git a/autoconf-lib-link/.gitignore b/autoconf-lib-link/.gitignore deleted file mode 100644 index 147c611..0000000 --- a/autoconf-lib-link/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Files generated by the autotools: -/Makefile.in -/aclocal.m4 -/configure - diff --git a/autoconf-lib-link/AUTHORS b/autoconf-lib-link/AUTHORS deleted file mode 100644 index 31b3bc9..0000000 --- a/autoconf-lib-link/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Bruno Haible wrote these autoconf macros. diff --git a/autoconf-lib-link/COPYING b/autoconf-lib-link/COPYING deleted file mode 100644 index 5b8319d..0000000 --- a/autoconf-lib-link/COPYING +++ /dev/null @@ -1 +0,0 @@ -This subpackage is under the GPL, see file COPYING in the toplevel directory. diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog deleted file mode 100644 index 57ae61f..0000000 --- a/autoconf-lib-link/ChangeLog +++ /dev/null @@ -1,308 +0,0 @@ -2010-04-02 Bruno Haible <bruno@clisp.org> - - Move unit tests to gnulib. - * tests: Remove subdirectory. - * Makefile.am (SUBDIRS): Remove tests. - (all-local, build-aux-dir, build-aux/*): Remove targets. - (DISTCLEANFILES): Remove augmentation. - (distclean-local): Remove target. - (CONFIGURES_RPATH*, SUBCONFIGURES): Remove variables. - ($(srcdir)/tests/rpath*/*, subconfigures): Remove targets. - * configure.ac: Remove checks for tests/rpathcfg and tests/rpath*. - (AC_CONFIG_FILES): Drop postprocessing of Makefile. Drop - tests/Makefile. - -2009-05-23 Bruno Haible <bruno@clisp.org> - - * configure.ac (AM_INIT_AUTOMAKE): Add 'silent-rules' option. - -2009-05-23 Bruno Haible <bruno@clisp.org> - - * configure.ac: Invoke gl_INIT_PACKAGE. Use the preferred form of - AM_INIT_AUTOMAKE. - -2009-05-21 Bruno Haible <bruno@clisp.org> - - * tests/Makefile.am (AUTOMAKE_OPTIONS): Add 1.11 and color-tests. - -2009-01-14 Bruno Haible <bruno@clisp.org> - - * configure.ac: More consistent m4 quoting. - -2008-09-07 Bruno Haible <bruno@clisp.org> - - * config.rpath: Update according to libtool-2.2.6. - -2008-01-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - - * config.rpath: Support AIX 6.1 and higher. - -2008-04-20 Bruno Haible <bruno@clisp.org> - - * configure.ac: Use LT_INIT instead of AC_PROG_LIBTOOL. - -2007-11-07 Bruno Haible <bruno@clisp.org> - - * gettext-0.17 released. - -2007-06-27 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.24. - -2006-12-24 Bruno Haible <bruno@clisp.org> - - Improve support for OpenBSD. - * config.rpath (libname_spec): Export. - (library_names_spec): New variable. Export. - -2006-10-27 Bruno Haible <bruno@clisp.org> - - Work around automake-1.10 annoyance. - * Makefile.am (ACLOCAL): New macro. - (tests/*/aclocal.m4): Use fixaclocal. - -2006-11-27 Bruno Haible <bruno@clisp.org> - - * gettext-0.16.1 released. - -2006-10-26 Bruno Haible <bruno@clisp.org> - - * gettext-0.16 released. - -2006-07-21 Bruno Haible <bruno@clisp.org> - - * gettext-0.15 released. - -2006-06-23 Bruno Haible <bruno@clisp.org> - - Biarch support. - * configure.ac: Invoke AC_LIB_PREPARE_MULTILIB. Set LIBDIRSTEM. - * tests/Makefile.am (TESTS_ENVIRONMENT): Set LIBDIRSTEM. - * tests/rpath-1: Pass --libdir to all configure invocations. - * tests/rpath-2_a: Likewise. - * tests/rpath-2_b: Likewise. - * tests/rpath-3_a: Likewise. - * tests/rpath-3_b: Likewise. - * tests/rpathcfg.sh: Likewise. - -2006-05-15 Bruno Haible <bruno@clisp.org> - - * config.rpath: Improve support for Sun C 5.9 on Linux, based on - libtool patch by Ralf Wildenhues. - -2006-05-05 Bruno Haible <bruno@clisp.org> - - * config.rpath: Add support for Sun C 5.9 on Linux. - -2006-04-17 Bruno Haible <bruno@clisp.org> - - * Makefile.am (all-local): Remove dependency on build-aux/mkinstalldirs. - (build-aux/mkinstalldirs): Remove rule. - (DISTCLEANFILES): Remove build-aux/mkinstalldirs. - * tests/rpathlx/Makefile.am (mkinstalldirs): Remove variable. - * tests/rpathly/Makefile.am (mkinstalldirs): Remove variable. - * tests/rpathlyx/Makefile.am (mkinstalldirs): Remove variable. - * tests/rpathlz/Makefile.am (mkinstalldirs): Remove variable. - * tests/rpathlzyx/Makefile.am (mkinstalldirs): Remove variable. - * tests/rpathx/Makefile.am (mkinstalldirs): Remove variable. - * tests/rpathy/Makefile.am (mkinstalldirs): Remove variable. - * tests/rpathz/Makefile.am (mkinstalldirs): Remove variable. - -2005-12-27 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.22. - -2005-11-23 Bruno Haible <bruno@clisp.org> - - Cygwin portability. - * configure.ac: Invoke gl_WOE32_DLL. - -2005-09-18 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.20. - -2005-09-18 Bruno Haible <bruno@clisp.org> - - * config.rpath: Complete upgrade to libtool-1.5.16. - -2005-05-01 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.16. - -2006-06-21 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.6 released. - -2006-06-21 Bruno Haible <bruno@clisp.org> - - * tests/Makefile.am (TESTS): Remove those tests that fail on x86_64. - -2005-05-23 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.5 released. - -2005-04-11 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.4 released. - -2005-04-11 Bruno Haible <bruno@clisp.org> - - * tests/rpath-1, tests/rpath-2_a, tests/rpath-2_b, tests/rpath-3_a: - * tests/rpath-3_b, tests/rpathcfg.sh: Use build-aux instead of config. - -2005-03-22 Bruno Haible <bruno@clisp.org> - - * configure.ac (AC_CONFIG_AUX_DIR): Use ../build-aux. - * tests/rpath*/configure.ac (AC_CONFIG_AUX_DIR): Use ../../../build-aux. - * Makefile.am: Replace config/m4 with m4 and config/ with build-aux/. - (build-aux-dir): Renamed from config-dir. - -2005-03-14 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.3 released. - -2005-02-24 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.2 released. - -2005-02-07 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.12: support for Portland Group - compiler, support for DragonFly BSD, relaxed copyright permissions. - -2005-02-07 Bruno Haible <bruno@clisp.org> - - * config.rpath: Use 'sed' with ranges only in C locale. Needed because - in the et_EE locale, the letters T U V W C Y come after Z. - Reported by Mike Frysinger <vapier@gentoo.org>. - -2005-01-09 Bruno Haible <bruno@clisp.org> - - Adaptation to automake-1.9. - * Makefile.am (tests/rpath*/aclocal.m4): Turn the m4 directories - into absolute pathnames, so that aclocal-1.9 includes the files - literally into the created aclocal.m4 file, instead of putting - m4_include(...) statements that don't work after the directory has - been copied to a different location. - -2005-01-05 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.10. - -2004-11-11 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.8 and libtool-1.5.10. - -2004-11-11 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.6. - -2004-10-30 James Youngman <jay@gnu.org> - - * config.rpath: Modify comment to be consistent with the code. - -2004-02-22 Bruno Haible <bruno@clisp.org> - - * config.rpath: Add support for Comeau C++ on Linux. - Patch by Prof. Roberto Bagnara <bagnara@cs.unipr.it>. - -2004-02-21 Bruno Haible <bruno@clisp.org> - - * config.rpath: Upgrade to libtool-1.5.2. - -2004-01-29 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.1 released. - -2004-01-28 Bruno Haible <bruno@clisp.org> - - * gettext-0.14 released. - -2003-12-12 Bruno Haible <bruno@clisp.org> - - Assume automake-1.8. - * Makefile.am (html): Remove rule. - (distclean-local): Renamed from distclean-am. - * tests/Makefile.am (distclean-local): Renamed from distclean-am. - -2003-12-17 Bruno Haible <bruno@clisp.org> - - * gettext-0.13.1 released. - -2003-11-30 Bruno Haible <bruno@clisp.org> - - * gettext-0.13 released. - -2003-10-31 Bruno Haible <bruno@clisp.org> - - * configure.ac: Remove argument of FIX_MAKEFILE_DISTRIB. - -2003-06-17 Paul Eggert <eggert@twinsun.com> - - * config.rpath: Use grep instead of egrep, since POSIX 1003.1-2001 no - longer requires egrep. - -2003-05-22 Bruno Haible <bruno@clisp.org> - - * gettext-0.12.1 released. - -2003-05-20 Bruno Haible <bruno@clisp.org> - - * Makefile.am (config-dir): New target. - (config/config.guess, config/config.sub, config/install-sh, - config/ltmain.sh, config/mkinstalldirs, config/missing, - config/config.rpath): Depend on it. - (distclean-am): Remove config-dir as well. - Reported by Frédéric L. W. Meunier <0@pervalidus.tk>. - -2003-05-17 Bruno Haible <bruno@clisp.org> - - * gettext-0.12 released. - -2003-05-02 Bruno Haible <bruno@clisp.org> - - * config.rpath: Document limitation on IRIX. - -2003-04-24 Bruno Haible <bruno@clisp.org> - - * config.rpath: Update to libtool-1.5. Small changes for AIX, HP-UX, - Irix, Linux, MacOS X, Windows. - -2003-04-24 Bruno Haible <bruno@clisp.org> - - * config.rpath: Don't set sys_lib_search_path_spec and - sys_lib_dlsearch_path_spec. - -2003-02-28 Bruno Haible <bruno@clisp.org> - - Support for relocatable installation. - * INSTALL: Document --enable-relocatable and --with-libintl-prefix. - -2003-02-22 Bruno Haible <bruno@clisp.org> - - * Makefile.am (ps, pdf): Remove rules, redundant with automake 1.7.2. - -2003-02-12 Bruno Haible <bruno@clisp.org> - - Extracted from gettext package. - * configure.ac: New file. - * Makefile.am: New file. - * AUTHORS, COPYING, INSTALL, NEWS, README: New files. - * m4/Makefile.am: New file. - * tests/Makefile.am: New file. - * tests/rpath-1: Move temporary directories down under tstdir. - Rename global_top_srcdir to global_top_auxdir. - * tests/rpath-2_a: Likewise. - * tests/rpath-2_b: Likewise. - * tests/rpath-3_a: Likewise. - * tests/rpath-3_b: Likewise. - * tests/rpath-2???: Use $srcdir instead of $top_srcdir/tests. - * tests/rpath-3???: Likewise. - * tests/rpathcfg.sh: Move temporary directories down under tstdir. - Use $srcdir instead of $top_srcdir/tests. - * tests/rpath*/Makefile.am: Use global_top_auxdir instead of - global_top_srcdir. - * tests/rpath*/configure.ac: Use AC_CONFIG_AUX_DIR instead of - AC_CONFIG_AUX_DIRS; the latter is undocumented and doesn't work - with automake-1.7.2. - diff --git a/autoconf-lib-link/INSTALL b/autoconf-lib-link/INSTALL deleted file mode 100644 index cc6a29e..0000000 --- a/autoconf-lib-link/INSTALL +++ /dev/null @@ -1,307 +0,0 @@ -These are generic installation instructions. - -Prerequisites -============= - - This package depends on a few other packages. They are listed in -the file `DEPENDENCIES'. It is recommended to install the listed -packages before installing this package. - -Basic Installation -================== - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.ac' is used to create `configure' by a program -called `autoconf'. You only need `configure.ac' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables as arguments. You can do it like this: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple '-arch' options to the -compiler but only a single '-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases. You -may have to build one architecture at a time and combine the results -using the 'lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Enabling Relocatability -======================= - - It has been a pain for many users of GNU packages for a long time -that packages are not relocatable. It means a user cannot copy a -program, installed by another user on the same machine, to his home -directory, and have it work correctly (including i18n). So many users -need to go through `configure; make; make install' with all its -dependencies, options, and hurdles. - - Red Hat, Debian, and similar package systems solve the "ease of -installation" problem, but they hardwire path names, usually to `/usr' -or `/usr/local'. This means that users need root privileges to install -a binary package, and prevents installing two different versions of the -same binary package. - - A relocatable program can be moved or copied to a different location -on the filesystem. It is possible to make symlinks to the installed -and moved programs, and invoke them through the symlink. It is possible -to do the same thing with a hard link _only_ if the hard link file is -in the same directory as the real program. - - To configure a program to be relocatable, add `--enable-relocatable' -to the `configure' command line. - - On some OSes the executables remember the location of shared -libraries and prefer them over any other search path. Therefore, such -an executable will look for its shared libraries first in the original -installation directory and only then in the current installation -directory. Thus, for reliability, it is best to also give a `--prefix' -option pointing to a directory that does not exist now and which never -will be created, e.g. `--prefix=/nonexistent'. You may use -`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into -that directory. - - We do not recommend using a prefix writable by unprivileged users -(e.g. `/tmp/inst$$') because such a directory can be recreated by an -unprivileged user after the original directory has been removed. We -also do not recommend prefixes that might be behind an automounter -(e.g. `$HOME/inst$$') because of the performance impact of directory -searching. - - Here's a sample installation run that takes into account all these -recommendations: - - ./configure --enable-relocatable --prefix=/nonexistent - make - make install DESTDIR=/tmp/inst$$ - - Installation with `--enable-relocatable' will not work for setuid or -setgid executables, because such executables search only system library -paths for security reasons. Also, installation with -`--enable-relocatable' might not work on OpenBSD, when the package -contains shared libraries and libtool versions 1.5.xx are used. - - The runtime penalty and size penalty are negligible on GNU/Linux -(just one system call more when an executable is launched), and small on -other systems (the wrapper program just sets an environment variable -and executes the real program). - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - For packages that use the GNU libiconv library, you can use the -`configure' option `--with-libiconv-prefix' to specify the prefix you -used while installing GNU libiconv. This option is not necessary if -that other prefix is the same as the one now specified through --prefix. - - For packages that use the GNU libintl library, you can use the -`configure' option `--with-libintl-prefix' to specify the prefix you -used while installing GNU gettext-runtime. This option is not necessary if -that other prefix is the same as the one now specified through --prefix. - -Particular Systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC -is not installed, it is recommended to use the following options in order -to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On AIX 3, the C include files by default don't define some necessary -prototype declarations. If GNU CC is not installed, it is recommended to -use the following options: - - ./configure CC="xlc -D_ALL_SOURCE" - - On Haiku, software installed for all users goes in /boot/common, not -/usr/local. It is recommended to use the following options: - - ./configure --prefix=/boot/common - - On BeOS, user installed software goes in /boot/home/config, not -/usr/local. It is recommended to use the following options: - - ./configure --prefix=/boot/home/config - -Specifying the System Type -========================== - - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: - CPU-COMPANY-SYSTEM - -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. - - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Operation Controls -================== - - `configure' recognizes the following options to control how it -operates. - -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - -`--help' - Print a summary of the options to `configure', and exit. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`configure' also accepts some other, not widely useful, options. - diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am deleted file mode 100644 index af97033..0000000 --- a/autoconf-lib-link/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## Makefile for the autoconf-lib-link directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2003, 2005-2006, 2010 Free Software Foundation, Inc. -## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, 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 General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see <http://www.gnu.org/licenses/>. - -## Process this file with automake to produce Makefile.in. - -AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies -ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -I ../m4 -EXTRA_DIST = -DISTCLEANFILES = - -SUBDIRS = m4 - -EXTRA_DIST += config.rpath - - -# We want to maintain only one copy of config.rpath. The one in this directory -# is the source. - -all-local: $(srcdir)/../build-aux/config.rpath - -$(srcdir)/../build-aux/config.rpath: $(srcdir)/config.rpath - cp $(srcdir)/config.rpath $(srcdir)/../build-aux/config.rpath diff --git a/autoconf-lib-link/NEWS b/autoconf-lib-link/NEWS deleted file mode 100644 index e69de29..0000000 --- a/autoconf-lib-link/NEWS +++ /dev/null diff --git a/autoconf-lib-link/README b/autoconf-lib-link/README deleted file mode 100644 index ca04d46..0000000 --- a/autoconf-lib-link/README +++ /dev/null @@ -1 +0,0 @@ -This subpackage defines autoconf macros for linking with shared libraries. diff --git a/autoconf-lib-link/config.rpath b/autoconf-lib-link/config.rpath deleted file mode 100755 index 85c2f20..0000000 --- a/autoconf-lib-link/config.rpath +++ /dev/null @@ -1,672 +0,0 @@ -#! /bin/sh -# Output a system dependent set of variables, describing how to set the -# run time search path of shared libraries in an executable. -# -# Copyright 1996-2008 Free Software Foundation, Inc. -# Taken from GNU libtool, 2001 -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -# should be set by the caller. -# -# The set of defined variables is at the end of this script. - -# Known limitations: -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -# than 256 bytes, otherwise the compiler driver will dump core. The only -# known workaround is to choose shorter directory names for the build -# directory and/or the installation directory. - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -shrext=.so - -host="$1" -host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -# Code taken from libtool.m4's _LT_CC_BASENAME. - -for cc_temp in $CC""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` - -# Code taken from libtool.m4's _LT_COMPILER_PIC. - -wl= -if test "$GCC" = yes; then - wl='-Wl,' -else - case "$host_os" in - aix*) - wl='-Wl,' - ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' - ;; - irix5* | irix6* | nonstopux*) - wl='-Wl,' - ;; - newsos6) - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - ecc*) - wl='-Wl,' - ;; - icc* | ifort*) - wl='-Wl,' - ;; - lf95*) - wl='-Wl,' - ;; - pgcc | pgf77 | pgf90) - wl='-Wl,' - ;; - ccc*) - wl='-Wl,' - ;; - como) - wl='-lopt=' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - wl='-Wl,' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - wl='-Wl,' - ;; - rdos*) - ;; - solaris*) - wl='-Wl,' - ;; - sunos4*) - wl='-Qoption ld ' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - wl='-Wl,' - ;; - sysv4*MP*) - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - wl='-Wl,' - ;; - unicos*) - wl='-Wl,' - ;; - uts4*) - ;; - esac -fi - -# Code taken from libtool.m4's _LT_LINKER_SHLIBS. - -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no - -case "$host_os" in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - case "$host_os" in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32* | cegcc*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - netbsd*) - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - hardcode_direct=yes - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - hardcode_libdir_flag_spec= - fi -else - case "$host_os" in - aix3*) - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - fi - hardcode_direct=yes - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - fi - # Begin _LT_AC_SYS_LIBPATH_AIX. - echo 'int main () { return 0; }' > conftest.c - ${CC} ${LDFLAGS} conftest.c -o conftest - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - fi - if test -z "$aix_libpath"; then - aix_libpath="/usr/lib:/lib" - fi - rm -f conftest.c conftest - # End _LT_AC_SYS_LIBPATH_AIX. - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - else - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - fi - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - libext=lib - ;; - darwin* | rhapsody*) - hardcode_direct=no - if test "$GCC" = yes ; then - : - else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - freebsd1*) - ld_shlibs=no - ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; - freebsd* | dragonfly*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - hpux9*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - hpux10*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - ;; - *) - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - netbsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - newsos6) - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - osf3*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) - if test "$GCC" = yes; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - # Both cc and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - solaris*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - sunos4*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - sysv4) - case $host_vendor in - sni) - hardcode_direct=yes # is this really true??? - ;; - siemens) - hardcode_direct=no - ;; - motorola) - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - ;; - sysv4.3*) - ;; - sysv4*MP*) - if test -d /usr/nec; then - ld_shlibs=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - ;; - sysv5* | sco3.2v5* | sco5v6*) - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - *) - ld_shlibs=no - ;; - esac -fi - -# Check dynamic linker characteristics -# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. -# Unlike libtool.m4, here we don't care about _all_ names of the library, but -# only about the one the linker finds when passed -lNAME. This is the last -# element of library_names_spec in libtool.m4, or possibly two of them if the -# linker has special search rules. -library_names_spec= # the last element of library_names_spec in libtool.m4 -libname_spec='lib$name' -case "$host_os" in - aix3*) - library_names_spec='$libname.a' - ;; - aix[4-9]*) - library_names_spec='$libname$shrext' - ;; - amigaos*) - library_names_spec='$libname.a' - ;; - beos*) - library_names_spec='$libname$shrext' - ;; - bsdi[45]*) - library_names_spec='$libname$shrext' - ;; - cygwin* | mingw* | pw32* | cegcc*) - shrext=.dll - library_names_spec='$libname.dll.a $libname.lib' - ;; - darwin* | rhapsody*) - shrext=.dylib - library_names_spec='$libname$shrext' - ;; - dgux*) - library_names_spec='$libname$shrext' - ;; - freebsd1*) - ;; - freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac - ;; - gnu*) - library_names_spec='$libname$shrext' - ;; - hpux9* | hpux10* | hpux11*) - case $host_cpu in - ia64*) - shrext=.so - ;; - hppa*64*) - shrext=.sl - ;; - *) - shrext=.sl - ;; - esac - library_names_spec='$libname$shrext' - ;; - interix[3-9]*) - library_names_spec='$libname$shrext' - ;; - irix5* | irix6* | nonstopux*) - library_names_spec='$libname$shrext' - case "$host_os" in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; - *) libsuff= shlibsuff= ;; - esac - ;; - esac - ;; - linux*oldld* | linux*aout* | linux*coff*) - ;; - linux* | k*bsd*-gnu) - library_names_spec='$libname$shrext' - ;; - knetbsd*-gnu) - library_names_spec='$libname$shrext' - ;; - netbsd*) - library_names_spec='$libname$shrext' - ;; - newsos6) - library_names_spec='$libname$shrext' - ;; - nto-qnx*) - library_names_spec='$libname$shrext' - ;; - openbsd*) - library_names_spec='$libname$shrext$versuffix' - ;; - os2*) - libname_spec='$name' - shrext=.dll - library_names_spec='$libname.a' - ;; - osf3* | osf4* | osf5*) - library_names_spec='$libname$shrext' - ;; - rdos*) - ;; - solaris*) - library_names_spec='$libname$shrext' - ;; - sunos4*) - library_names_spec='$libname$shrext$versuffix' - ;; - sysv4 | sysv4.3*) - library_names_spec='$libname$shrext' - ;; - sysv4*MP*) - library_names_spec='$libname$shrext' - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - library_names_spec='$libname$shrext' - ;; - uts4*) - library_names_spec='$libname$shrext' - ;; -esac - -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` - -LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF - -# How to pass a linker flag through the compiler. -wl="$escaped_wl" - -# Static library suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally "so"). -shlibext="$shlibext" - -# Format of library name prefix. -libname_spec="$escaped_libname_spec" - -# Library names that the linker finds when passed -lNAME. -library_names_spec="$escaped_library_names_spec" - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="$hardcode_libdir_separator" - -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -# resulting binary. -hardcode_direct="$hardcode_direct" - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L="$hardcode_minus_L" - -EOF diff --git a/autoconf-lib-link/configure.ac b/autoconf-lib-link/configure.ac deleted file mode 100644 index 0f1da67..0000000 --- a/autoconf-lib-link/configure.ac +++ /dev/null @@ -1,59 +0,0 @@ -dnl Configuration for the autoconf-lib-link directory of GNU gettext -dnl Copyright (C) 1995-1999, 2000-2003, 2005-2006, 2008-2010 Free Software Foundation, Inc. -dnl -dnl This program is free software: you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 3 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program. If not, see <http://www.gnu.org/licenses/>. - -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.57]) -AC_INIT -AC_CONFIG_SRCDIR([m4/lib-link.m4]) -AC_CONFIG_AUX_DIR([../build-aux]) -. $srcdir/../version.sh -gl_INIT_PACKAGE([autoconf-lib-link], [$VERSION_NUMBER]) -AM_INIT_AUTOMAKE([silent-rules]) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL - -dnl Check for host type. -AC_CANONICAL_HOST - -dnl Checks for UNIX variants that set DEFS, - -dnl Checks for compiler output filename suffixes. -AC_OBJEXT -AC_EXEEXT - -dnl Check for build configuration. -gl_WOE32_DLL -LT_INIT([win32-dll]) - -dnl Checks for libraries. - -dnl Checks for header files. - -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl Checks for library functions. - -aclocaldir='${datadir}/aclocal' -AC_SUBST([aclocaldir]) - -AC_CONFIG_FILES([Makefile]) - -AC_CONFIG_FILES([m4/Makefile]) - -AC_OUTPUT diff --git a/autoconf-lib-link/m4/.gitignore b/autoconf-lib-link/m4/.gitignore deleted file mode 100644 index 0b3f7ef..0000000 --- a/autoconf-lib-link/m4/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Files generated by the autotools: -/Makefile.in - diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog deleted file mode 100644 index 705f8c9..0000000 --- a/autoconf-lib-link/m4/ChangeLog +++ /dev/null @@ -1,218 +0,0 @@ -2009-12-10 Bruno Haible <bruno@clisp.org> - - * *.m4: Untabify. - -2009-06-24 Bruno Haible <bruno@clisp.org> - - * lib-link.m4 (AC_LIB_HAVE_LINKFLAGS): Fix description of - HAVE_LIB${NAME} macro. - Reported by Sam Steingold <sds@gnu.org>. - -2009-06-21 Bruno Haible <bruno@clisp.org> - - Make two consecutive identical invocations of AC_LIB_HAVE_LINKFLAGS - work. - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Reset HAVE_LIB${NAME} together - with LIB${NAME}, LTLIB${NAME}. - Reported by Sam Steingold <sds@gnu.org>. - -2009-04-26 Bruno Haible <bruno@clisp.org> - - Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32". - * lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): Ignore paths that end in - "../" or "..". - -2009-04-26 Bruno Haible <bruno@clisp.org> - - * lib-link.m4 (AC_LIB_HAVE_LINKFLAGS): Accept a fifth argument. - -2009-01-14 Jim Meyering <meyering@redhat.com> - - * lib-link.m4: More consistent m4 quoting. - * lib-ld.m4: Likewise. - -2008-12-30 Bruno Haible <bruno@clisp.org> - - * lib-prefix.m4 (AC_LIB_LINKFLAGS_BODY): Don't overwrite - LIB${NAME}_PREFIX when considering the dependencies of lib${name}. - Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>. - -2008-08-31 Bruno Haible <bruno@clisp.org> - - Assume Solaris specific bi-arch conventions on Solaris systems. - * lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): On Solaris in 64-bit mode, - set acl_libdirstem to lib/64. Also set acl_libdirstem2. - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): If acl_libdirstem does not work, - try acl_libdirstem2 as fallback. Otherwise treat acl_libdirstem2 like - acl_libdirstem. - (AC_LIB_LINKFLAGS_FROM_LIBS): Treat acl_libdirstem2 like - acl_libdirstem. - Reported by Ben Taylor <bentaylor.solx86@gmail.com>. - -2008-03-11 Bruno Haible <bruno@clisp.org> - - Extend AC_LIB_LINKFLAGS to the situation of several libraries provided - by a single package. - * lib-link.m4 (AC_LIB_FROMPACKAGE): New macro. - (AC_LIB_LINKFLAGS_BODY): Use the information stored by - AC_LIB_FROMPACKAGE. Use AC_ARG_WITH instead of AC_LIB_ARG_WITH. - Reported by Sam Steingold <sds@gnu.org>. - -2008-03-11 Bruno Haible <bruno@clisp.org> - - Avoid conflicts between local macro definitions. - * lib-link.m4 (AC_LIB_LINKFLAGS, AC_LIB_HAVE_LINKFLAGS, - AC_LIB_LINKFLAGS_BODY): Use pushdef/popdef instead of define/undefine. - -2007-11-07 Bruno Haible <bruno@clisp.org> - - * gettext-0.17 released. - -2007-01-08 Bruno Haible <bruno@clisp.org> - - Avoid variable names that conflict with those from libtool. - * lib-link.m4 (AC_LIB_RPATH, AC_LIB_LINKFLAGS_BODY, - AC_LIB_LINKFLAGS_FROM_LIBS): Rename libext to acl_libext, - shlibext to acl_shlibext, libname_spec to acl_libname_spec, - library_names_spec to acl_library_names_spec, hardcode_* to - acl_hardcode_*. - Reported by Ralf Wildenhues. - -2007-01-08 Bruno Haible <bruno@clisp.org> - - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Simplify the sorting command. - -2006-12-24 Bruno Haible <bruno@clisp.org> - - Improve support for OpenBSD. - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Extract libname_spec and - library_names_spec from the config.rpath output. Locate shared library - through the name pattern in library_names_spec. - -2006-11-12 Bruno Haible <bruno@clisp.org> - - * lib-link.m4 (AC_LIB_LINKFLAGS, AC_LIB_HAVE_LINKFLAGS, - AC_LIB_LINKFLAGS_BODY): Also set a LIB${NAME}_PREFIX variable. Needed - for GNOME libraries, for which the include files are installed in - subdirectories of $prefix/include. - -2006-11-12 Bruno Haible <bruno@clisp.org> - - * lib-link.m4: Require at least autoconf-2.54. - (AC_LIB_LINKFLAGS_BODY) [autoconf < 2.61]: Turn dots into the library - name to underscores for the --with option. - -2006-11-27 Bruno Haible <bruno@clisp.org> - - * gettext-0.16.1 released. - -2006-10-26 Bruno Haible <bruno@clisp.org> - - * gettext-0.16 released. - -2006-09-03 Bruno Haible <bruno@clisp.org> - - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Locate mingw shared libraries - correctly. - -2006-07-21 Bruno Haible <bruno@clisp.org> - - * gettext-0.15 released. - -2006-03-25 Bruno Haible <bruno@clisp.org> - - * lib-link.m4 (AC_LIB_LINKFLAGS_FROM_LIBS): New macro. - -2005-08-27 Bruno Haible <bruno@clisp.org> - - Support for lib vs. lib64 distinction on biarch platforms. - * lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): New macro. - (AC_LIB_PREFIX): Require it. Use $acl_libdirstem instead of 'lib'. - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Likewise. - -2006-06-21 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.6 released. - -2005-05-23 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.5 released. - -2005-04-11 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.4 released. - -2005-03-14 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.3 released. - -2005-03-05 Bruno Haible <bruno@clisp.org> - - * lib-link.m4: Require autoconf >= 2.50. - (AC_LIB_RPATH): Use AC_REQUIRE_AUX_FILE conditionally. - -2005-02-24 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.2 released. - -2005-01-19 Bruno Haible <bruno@clisp.org> - - * lib-ld.m4, lib-link.m4, lib-prefix.m4: Use an all-permissive - copyright notice, recommended by RMS. - -2004-07-13 Robert Millan <robertmh@gnu.org> - - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Same /usr/local/include handling - on Hurd and on GNU/k*BSD as on Linux. - * lib-prefix.m4 (AC_LIB_PREFIX): Likewise. - -2004-01-29 Bruno Haible <bruno@clisp.org> - - * gettext-0.14.1 released. - -2004-01-28 Bruno Haible <bruno@clisp.org> - - * gettext-0.14 released. - -2003-12-17 Bruno Haible <bruno@clisp.org> - - * gettext-0.13.1 released. - -2003-11-30 Bruno Haible <bruno@clisp.org> - - * gettext-0.13 released. - -2003-07-01 Bruno Haible <bruno@clisp.org> - - * lib-prefix.m4 (AC_LIB_ARG_WITH): Avoid "duplicated macro" error from - aclocal-1.4-p4. - Reported by Luke Schierer <lschiere@rackspace.com> and - Michael C. Toren <mct@toren.net>. - -2003-06-17 Paul Eggert <eggert@twinsun.com> - - * lib-ld.m4 (AC_LIB_PROG_LD_GNU, AC_LIB_PROG_LD): Don't use egrep, for - portability to POSIX 1003.1-2001. Backported from libtool-1.5. - -2003-05-22 Bruno Haible <bruno@clisp.org> - - * gettext-0.12.1 released. - -2003-05-17 Bruno Haible <bruno@clisp.org> - - * gettext-0.12 released. - -2003-04-24 Bruno Haible <bruno@clisp.org> - - * lib-link.m4 (AC_LIB_RPATH): Don't set sys_lib_search_path_spec and - sys_lib_dlsearch_path_spec. - -2003-02-16 Bruno Haible <bruno@clisp.org> - - Workaround autoconf >= 2.52 breakage. - * lib-prefix.m4 (AC_LIB_ARG_WITH): New macro. - (AC_LIB_PREFIX): Use it instead of AC_ARG_WITH. - * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Likewise. - - -See ../../gettext-tools/m4/ChangeLog.0 for earlier changes. diff --git a/autoconf-lib-link/m4/Makefile.am b/autoconf-lib-link/m4/Makefile.am deleted file mode 100644 index 7102e38..0000000 --- a/autoconf-lib-link/m4/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*- - -# Files installed for use by aclocal. - -aclocaldir = @aclocaldir@ -aclocal_DATA = \ - lib-ld.m4 \ - lib-link.m4 \ - lib-prefix.m4 - -# Generate this list with -# find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012' -EXTRA_DIST = README \ -lib-ld.m4 \ -lib-link.m4 \ -lib-prefix.m4 diff --git a/autoconf-lib-link/m4/README b/autoconf-lib-link/m4/README deleted file mode 100644 index ac32e28..0000000 --- a/autoconf-lib-link/m4/README +++ /dev/null @@ -1,4 +0,0 @@ -These files are used by a program called aclocal (part of the GNU automake -package). aclocal uses these files to create aclocal.m4 which is in turn -used by autoconf to create the configure script at the the top level in -this distribution. diff --git a/autoconf-lib-link/m4/lib-ld.m4 b/autoconf-lib-link/m4/lib-ld.m4 deleted file mode 100644 index ebb3052..0000000 --- a/autoconf-lib-link/m4/lib-ld.m4 +++ /dev/null @@ -1,110 +0,0 @@ -# lib-ld.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2009-2010 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 Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; -*) - acl_cv_prog_gnu_ld=no ;; -esac]) -with_gnu_ld=$acl_cv_prog_gnu_ld -]) - -dnl From libtool-1.4. Sets the variable LD. -AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH([gnu-ld], -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL([acl_cv_path_LD], -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT([$LD]) -else - AC_MSG_RESULT([no]) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4 deleted file mode 100644 index 90e1ac9..0000000 --- a/autoconf-lib-link/m4/lib-link.m4 +++ /dev/null @@ -1,764 +0,0 @@ -# lib-link.m4 serial 20 (gettext-0.18) -dnl Copyright (C) 2001-2010 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 From Bruno Haible. - -AC_PREREQ([2.54]) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - popdef([NAME]) - popdef([Name]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. The missing-message -dnl defaults to 'no' and may contain additional hints for the user. -dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} -dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], - [ac_cv_lib[]Name=yes], - [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - LIB[]NAME[]_PREFIX= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - popdef([NAME]) - popdef([Name]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl acl_libext, -dnl acl_shlibext, -dnl acl_hardcode_libdir_flag_spec, -dnl acl_hardcode_libdir_separator, -dnl acl_hardcode_direct, -dnl acl_hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE([rpath], - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_FROMPACKAGE(name, package) -dnl declares that libname comes from the given package. The configure file -dnl will then not have a --with-libname-prefix option but a -dnl --with-package-prefix option. Several libraries can come from the same -dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar -dnl macro call that searches for libname. -AC_DEFUN([AC_LIB_FROMPACKAGE], -[ - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - define([acl_frompackage_]NAME, [$2]) - popdef([NAME]) - pushdef([PACK],[$2]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) - popdef([PACKUP]) - popdef([PACK]) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) - dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_ARG_WITH(P_A_C_K[-prefix], -[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then - additional_libdir="$withval/$acl_libdirstem2" - fi - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - LIB[]NAME[]_PREFIX= - dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been - dnl computed. So it has to be reset here. - HAVE_LIB[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - dnl The same code as in the loop below: - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no \ - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$acl_hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - */$acl_libdirstem2 | */$acl_libdirstem2/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi - popdef([P_A_C_K]) - popdef([PACKLIBS]) - popdef([PACKUP]) - popdef([PACK]) - popdef([NAME]) -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -dnl For those cases where a variable contains several -L and -l options -dnl referring to unknown libraries and directories, this macro determines the -dnl necessary additional linker options for the runtime path. -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -dnl otherwise linking without libtool is assumed. -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -[ - AC_REQUIRE([AC_LIB_RPATH]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - $1= - if test "$enable_rpath" != no; then - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode directories into the resulting - dnl binary. - rpathdirs= - next= - for opt in $2; do - if test -n "$next"; then - dir="$next" - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= - else - case $opt in - -L) next=yes ;; - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= ;; - *) next= ;; - esac - fi - done - if test "X$rpathdirs" != "X"; then - if test -n ""$3""; then - dnl libtool is used for linking. Use -R options. - for dir in $rpathdirs; do - $1="${$1}${$1:+ }-R$dir" - done - else - dnl The linker is used for linking directly. - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user - dnl must pass all path elements in one option. - alldirs= - for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="$flag" - else - dnl The -rpath options are cumulative. - for dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="${$1}${$1:+ }$flag" - done - fi - fi - fi - fi - fi - AC_SUBST([$1]) -]) diff --git a/autoconf-lib-link/m4/lib-prefix.m4 b/autoconf-lib-link/m4/lib-prefix.m4 deleted file mode 100644 index 1601cea..0000000 --- a/autoconf-lib-link/m4/lib-prefix.m4 +++ /dev/null @@ -1,224 +0,0 @@ -# lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2010 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 From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_PREPARE_MULTILIB creates -dnl - a variable acl_libdirstem, containing the basename of the libdir, either -dnl "lib" or "lib64" or "lib/64", -dnl - a variable acl_libdirstem2, as a secondary possible value for -dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or -dnl "lib/amd64". -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. - dnl On glibc systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine - dnl the compiler's default mode by looking at the compiler's library search - dnl path. If at least one of its elements ends in /lib64 or points to a - dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. - dnl Otherwise we use the default, namely "lib". - dnl On Solaris systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or - dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. - AC_REQUIRE([AC_CANONICAL_HOST]) - acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment - dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>. - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the - dnl symlink is missing, so we set acl_libdirstem2 too. - AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], - [AC_EGREP_CPP([sixtyfour bits], [ -#ifdef _LP64 -sixtyfour bits -#endif - ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) - ]) - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -]) @@ -16,7 +16,7 @@ # - the makeinfo program from the texinfo package, # - perl. -# Copyright (C) 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 2003-2010 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -83,6 +83,7 @@ if ! $skip_gnulib; then error getopt-gnu gettext-h + havelib memmove progname propername @@ -301,16 +302,6 @@ else done fi -(cd autoconf-lib-link - ../build-aux/fixaclocal aclocal -I m4 -I ../m4 - autoconf - automake --add-missing --copy - # Rebuilding the autoconfiguration of the tests is only rarely needed. - if ! $quick; then - ./configure && make subconfigures && make distclean - fi -) - (cd gettext-runtime/libasprintf ../../build-aux/fixaclocal aclocal -I ../../m4 -I ../m4 -I gnulib-m4 autoconf @@ -319,7 +310,7 @@ fi ) (cd gettext-runtime - ../build-aux/fixaclocal aclocal -I m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 + ../build-aux/fixaclocal aclocal -I m4 -I ../m4 -I gnulib-m4 autoconf autoheader && touch config.h.in automake --add-missing --copy @@ -346,7 +337,7 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS ) (cd gettext-tools - ../build-aux/fixaclocal aclocal -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 + ../build-aux/fixaclocal aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 autoconf autoheader && touch config.h.in test -d intl || mkdir intl @@ -366,5 +357,3 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS build-aux/fixaclocal aclocal -I m4 autoconf automake - -cp -p autoconf-lib-link/config.rpath build-aux/config.rpath diff --git a/configure.ac b/configure.ac index cd16f6f..7c8d2c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the toplevel directory of GNU gettext -dnl Copyright (C) 1995-1999, 2000-2003, 2005-2006, 2009 Free Software Foundation, Inc. +dnl Copyright (C) 1995-1999, 2000-2003, 2005-2006, 2009-2010 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for library functions. -AC_CONFIG_SUBDIRS([autoconf-lib-link gettext-runtime gettext-tools]) +AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools]) dnl Ensure that "configure --help" lists all the command line options that dnl are usable with the subdir configures. Really AC_CONFIG_SUBDIRS should @@ -47,7 +47,7 @@ AC_CANONICAL_HOST dnl Optional Features: AC_ARG_ENABLE calls dnl Optional Packages: AC_ARG_WITH calls dnl Some influential environment variables: AC_ARG_VAR calls -esyscmd([{ cd autoconf-lib-link && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f build-aux/ac-help.sed ]) +esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f build-aux/ac-help.sed ]) AC_CONFIG_FILES([Makefile]) diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index b86cb54..3e7357c 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,8 @@ +2010-04-02 Bruno Haible <bruno@clisp.org> + + * Makefile.am (ACLOCAL_AMFLAGS): Remove "-I ../autoconf-lib-link/m4" + option. + 2009-12-26 Bruno Haible <bruno@clisp.org> * NEWS: Mention the use of the thread-specific locale on MacOS X. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 6ba0bbf..2a1427a 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc. +## Copyright (C) 1995-1999, 2000-2006, 2010 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 +ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnulib-m4 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@ diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 536fe51..2054d56 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,9 @@ +2010-04-02 Bruno Haible <bruno@clisp.org> + + * Makefile.am (ACLOCAL_AMFLAGS): Remove "-I ../autoconf-lib-link/m4" + option. + (gettextsrc_SCRIPTS): Update. + 2009-12-26 Bruno Haible <bruno@clisp.org> * configure.ac: Don't define USE_IN_GETTEXT_TESTS. Test for uselocale. diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 87de0ba..194f5d0 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc. +## Copyright (C) 1995-1999, 2000-2007, 2010 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 +ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples @@ -29,7 +29,7 @@ MOSTLYCLEANFILES = core *.stackdump # Files installed for use by gettextize. gettextsrcdir = $(datadir)/gettext -gettextsrc_SCRIPTS = ../autoconf-lib-link/config.rpath +gettextsrc_SCRIPTS = ../build-aux/config.rpath # Files installed for the examples. diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index 4afbf4f..7f9a481 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,7 @@ +2010-04-02 Bruno Haible <bruno@clisp.org> + + * FAQ.html (building_rpath_check): Remove section. + 2010-03-31 Guido Flohr <guido@imperia.net> More explanations about how xgettext handles Perl syntax ambiguities. diff --git a/gettext-tools/doc/FAQ.html b/gettext-tools/doc/FAQ.html index f0a1380..c93c185 100644 --- a/gettext-tools/doc/FAQ.html +++ b/gettext-tools/doc/FAQ.html @@ -21,10 +21,6 @@ releases.</a></li> <li><a href="#building_solaris_libasprintf">On Solaris, I get a build error “text relocations remain” in the <span style="font-family: monospace;">libasprintf</span> subdirectory</a></li> - <li><a href="#building_rpath_check">During “make check”, some tests -named <span style="font-family: monospace;">rpath-<span - style="font-style: italic;">Nxyz</span></span> -fail: “ld: fatal error ... -lrpathz”</a></li> <li><a href="#building_install">“make install” fails</a></li> </ul> <h3>Problems integrating GNU gettext</h3> @@ -145,23 +141,6 @@ libtool (or more precisely, the version of libtool that was available at the time the gettext release waas made) doesn't support linking C++ libraries with some versions of GCC. As a workaround, you can configure gettext with the option <span style="font-family: monospace;">--disable-libasprintf</span>.<br> -<h4><a name="building_rpath_check"></a>During “make check”, some tests -named <span style="font-family: monospace;">rpath-<span - style="font-style: italic;">Nxyz</span></span> -fail: “ld: fatal error ... -lrpathz”</h4> -If only a few among the many rpath tests fail, you can probably ignore -the problem. The rpath tests are sensitive to incomplete shared library -support in the system, and to bugs in libtool that creates the shared -libraries. Some known failures are listed in <span - style="font-family: monospace;">autoconf-lib-link/tests/rpath.README</span>.<br> -<br> -To ignore the problem, just proceed with<br> -<br> -<div style="margin-left: 40px;"><code>cd gettext-tools</code><br> -<code>make check</code><br> -<code>cd ..</code><br> -</div> -<br> <h4><a name="building_install"></a>“make install” fails</h4> “<span style="font-family: monospace;">make install DESTDIR=<span style="font-style: italic;">/some/tempdir</span></span>” can fail with diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog index b612d13..01af133 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,8 @@ +2010-04-02 Bruno Haible <bruno@clisp.org> + + * hello-c++-wxwidgets/autogen.sh: Update origin of lib-*.m4 and + config.rpath files. + 2010-03-09 Bruno Haible <bruno@clisp.org> * po/ast.po: Update. diff --git a/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh b/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh index 6504cef..5413640 100755 --- a/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh +++ b/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh @@ -26,10 +26,10 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/autoconf-lib-link/m4}/lib-ld.m4 m4/lib-ld.m4 -cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/autoconf-lib-link/m4}/lib-link.m4 m4/lib-link.m4 -cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/autoconf-lib-link/m4}/lib-prefix.m4 m4/lib-prefix.m4 -cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/autoconf-lib-link}/config.rpath config.rpath +cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/gnulib-m4}/lib-ld.m4 m4/lib-ld.m4 +cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/gnulib-m4}/lib-link.m4 m4/lib-link.m4 +cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/gnulib-m4}/lib-prefix.m4 m4/lib-prefix.m4 +cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/build-aux}/config.rpath config.rpath cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin aclocal -I m4 diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index 8671d61..3aad110 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,8 @@ +2010-04-02 Bruno Haible <bruno@clisp.org> + + * Makefile.am (aclocal_DATA): Take lib-*.m4 from the + gettext-runtime/gnulib-m4/ directory. + 2009-12-25 Bruno Haible <bruno@clisp.org> * Makefile.am (aclocal_DATA): Add fcntl-o.m4. Remove fcntl_h.m4. diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 0f26f95..a7cb7e2 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -4,9 +4,9 @@ aclocaldir = @aclocaldir@ aclocal_DATA = \ - ../../autoconf-lib-link/m4/lib-ld.m4 \ - ../../autoconf-lib-link/m4/lib-link.m4 \ - ../../autoconf-lib-link/m4/lib-prefix.m4 \ + ../../gettext-runtime/gnulib-m4/lib-ld.m4 \ + ../../gettext-runtime/gnulib-m4/lib-link.m4 \ + ../../gettext-runtime/gnulib-m4/lib-prefix.m4 \ ../../gettext-runtime/m4/codeset.m4 \ ../../gettext-runtime/m4/fcntl-o.m4 \ ../../gettext-runtime/m4/gettext.m4 \ |