From: Bruno Haible Date: Tue, 22 Mar 2005 15:52:56 +0000 (+0000) Subject: Change AC_CONFIG_AUX_DIR argument. X-Git-Tag: 0.14.x-branchpoint~19 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7bba3855cfd302515f2861969907ee0c58b6d48a;p=thirdparty%2Fgettext.git Change AC_CONFIG_AUX_DIR argument. --- diff --git a/ChangeLog b/ChangeLog index d28fd525b..e884ff6d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * m4: New directory, renamed from config/m4/. * build-aux: New directory, renamed from config/. + * configure.ac (AC_CONFIG_AUX_DIR): Use build-aux. * Makefile.am (EXTRA_DIST): Update. 2005-03-14 Bruno Haible diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog index f76e65feb..8d093bd78 100644 --- a/autoconf-lib-link/ChangeLog +++ b/autoconf-lib-link/ChangeLog @@ -1,5 +1,7 @@ 2005-03-22 Bruno Haible + * 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. diff --git a/autoconf-lib-link/configure.ac b/autoconf-lib-link/configure.ac index aad426e3f..61c6030d9 100644 --- a/autoconf-lib-link/configure.ac +++ b/autoconf-lib-link/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the autoconf-lib-link directory of GNU gettext -dnl Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. +dnl Copyright (C) 1995-1999, 2000-2003, 2005 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 @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) AC_INIT AC_CONFIG_SRCDIR(tests/rpath-1a) -AC_CONFIG_AUX_DIR(../config) +AC_CONFIG_AUX_DIR(../build-aux) . $srcdir/../version.sh AM_INIT_AUTOMAKE(autoconf-lib-link, $VERSION_NUMBER) diff --git a/autoconf-lib-link/tests/rpathlx/configure.ac b/autoconf-lib-link/tests/rpathlx/configure.ac index 73b180e7d..90d38fd68 100644 --- a/autoconf-lib-link/tests/rpathlx/configure.ac +++ b/autoconf-lib-link/tests/rpathlx/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of a program that links with librpathx. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathlx, 0) AC_PROG_CC AC_LIB_LINKFLAGS([rpathx]) diff --git a/autoconf-lib-link/tests/rpathly/configure.ac b/autoconf-lib-link/tests/rpathly/configure.ac index 53559f126..226457eb1 100644 --- a/autoconf-lib-link/tests/rpathly/configure.ac +++ b/autoconf-lib-link/tests/rpathly/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of a program that links with librpathy. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathly, 0) AC_PROG_CC AC_LIB_LINKFLAGS([rpathy]) diff --git a/autoconf-lib-link/tests/rpathlyx/configure.ac b/autoconf-lib-link/tests/rpathlyx/configure.ac index 6d685c52e..bc716eaf9 100644 --- a/autoconf-lib-link/tests/rpathlyx/configure.ac +++ b/autoconf-lib-link/tests/rpathlyx/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of a program that links with librpathy. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathlyx, 0) AC_PROG_CC AC_LIB_LINKFLAGS([rpathx]) diff --git a/autoconf-lib-link/tests/rpathlz/configure.ac b/autoconf-lib-link/tests/rpathlz/configure.ac index e9e896305..08943987a 100644 --- a/autoconf-lib-link/tests/rpathlz/configure.ac +++ b/autoconf-lib-link/tests/rpathlz/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of a program that links with librpathz. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathlz, 0) AC_PROG_CC AC_LIB_LINKFLAGS([rpathz]) diff --git a/autoconf-lib-link/tests/rpathlzyx/configure.ac b/autoconf-lib-link/tests/rpathlzyx/configure.ac index a1e5b3bd9..54c69a25b 100644 --- a/autoconf-lib-link/tests/rpathlzyx/configure.ac +++ b/autoconf-lib-link/tests/rpathlzyx/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of a program that links with librpathz. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathlzyx, 0) AC_PROG_CC AC_LIB_LINKFLAGS([rpathx]) diff --git a/autoconf-lib-link/tests/rpathx/configure.ac b/autoconf-lib-link/tests/rpathx/configure.ac index 4975c3188..5e8189ce0 100644 --- a/autoconf-lib-link/tests/rpathx/configure.ac +++ b/autoconf-lib-link/tests/rpathx/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of librpathx. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathx, 0) AC_PROG_CC AM_PROG_LIBTOOL diff --git a/autoconf-lib-link/tests/rpathy/configure.ac b/autoconf-lib-link/tests/rpathy/configure.ac index e415df09c..e19f51472 100644 --- a/autoconf-lib-link/tests/rpathy/configure.ac +++ b/autoconf-lib-link/tests/rpathy/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of librpathy that depends on librpathx. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathy, 0) AC_PROG_CC AM_PROG_LIBTOOL diff --git a/autoconf-lib-link/tests/rpathz/configure.ac b/autoconf-lib-link/tests/rpathz/configure.ac index 3dc8f0cdd..ab2aadbda 100644 --- a/autoconf-lib-link/tests/rpathz/configure.ac +++ b/autoconf-lib-link/tests/rpathz/configure.ac @@ -1,6 +1,6 @@ dnl Configuration of librpathz that depends on librpathx and librpathy. dnl -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 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 @@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_INIT(configure.ac) -AC_CONFIG_AUX_DIR(../../../config) +AC_CONFIG_AUX_DIR(../../../build-aux) AM_INIT_AUTOMAKE(gettext_rpathz, 0) AC_PROG_CC AM_PROG_LIBTOOL diff --git a/configure.ac b/configure.ac index df8eacbb3..251537274 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) AC_INIT AC_CONFIG_SRCDIR(gettext-tools/src/msgfmt.c) -AC_CONFIG_AUX_DIR(config) +AC_CONFIG_AUX_DIR(build-aux) . $srcdir/version.sh AM_INIT_AUTOMAKE(gettext, $VERSION_NUMBER) diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 7c4a513e1..a4c29d17e 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,5 +1,6 @@ 2005-03-22 Bruno Haible + * configure.ac (AC_CONFIG_AUX_DIR): Use ../build-aux. * Makefile.am (ACLOCAL_AMFLAGS): Replace config/m4 with m4. 2005-03-14 Bruno Haible diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 66a306314..49ee0a576 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) AC_INIT AC_CONFIG_SRCDIR(intl/dcigettext.c) -AC_CONFIG_AUX_DIR(../config) +AC_CONFIG_AUX_DIR(../build-aux) . $srcdir/../version.sh AM_INIT_AUTOMAKE(gettext-runtime, $VERSION_NUMBER) AM_CONFIG_HEADER(config.h) diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index ad3639159..14eb92036 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,5 +1,6 @@ 2005-03-22 Bruno Haible + * configure.ac (AC_CONFIG_AUX_DIR): Use ../../build-aux. * Makefile.am (ACLOCAL_AMFLAGS): Replace config/m4 with m4. 2005-03-14 Bruno Haible diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac index 3c91508ca..7e743b11c 100644 --- a/gettext-runtime/libasprintf/configure.ac +++ b/gettext-runtime/libasprintf/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the GNU libasprintf library -dnl Copyright (C) 2002-2004 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2005 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 @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) AC_INIT AC_CONFIG_SRCDIR(vasprintf.c) -AC_CONFIG_AUX_DIR(../../config) +AC_CONFIG_AUX_DIR(../../build-aux) AM_INIT_AUTOMAKE(libasprintf, 1.0) AM_CONFIG_HEADER(config.h) diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 4f2fc0063..3878318c7 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,5 +1,6 @@ 2005-03-22 Bruno Haible + * configure.ac (AC_CONFIG_AUX_DIR): Use ../build-aux. * Makefile.am (ACLOCAL_AMFLAGS): Replace config/m4 with m4. (gettextsrc_SCRIPTS): Replace config with build-aux. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 9a3536f54..b44a95e92 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) AC_INIT AC_CONFIG_SRCDIR(src/msgfmt.c) -AC_CONFIG_AUX_DIR(../config) +AC_CONFIG_AUX_DIR(../build-aux) . $srcdir/../version.sh AM_INIT_AUTOMAKE(gettext-tools, $VERSION_NUMBER) AM_CONFIG_HEADER(config.h)