AC_CONFIG_AUX_DIR_DEFAULTS overrides AC_CONFIG_AUX_DIR. Ouch.

Reported by Paul Martinolich.
* acgeneral.m4 (AC_PROVIDE): Don't forget to `m4_provide'!!!
Tss, novice...
* tests/base.at (AC_REQUIRE & AC_PROVIDE): New test.

diff --git a/ChangeLog b/ChangeLog
index 8384682742b475584d183f3f85250a78f6ee41e4..98c7a226c6de041db9811419536fce43fbddd26a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-03  Akim Demaille  <akim@epita.fr>
+
+       AC_CONFIG_AUX_DIR_DEFAULTS overrides AC_CONFIG_AUX_DIR.  Ouch.
+       Reported by Paul Martinolich.
+
+       * acgeneral.m4 (AC_PROVIDE): Don't forget to `m4_provide'!!!
+       Tss, novice...
+       * tests/base.at (AC_REQUIRE & AC_PROVIDE): New test.
+
 2000-11-03  Akim Demaille  <akim@epita.fr>
 
        * m4sugar.m4 (m4_location): When using its value, don't use

diff --git a/acgeneral.m4 b/acgeneral.m4
index 7ae5b45d651b2001e505cc7d758ec2ded3d62ada..eadea64b2280eb14c953e9383f0c2e76382a51e6 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -264,10 +264,11 @@ m4_define([AC_EXPAND_ONCE],
 
 # AC_PROVIDE(MACRO-NAME)
 # ----------------------
-# Ideally we should use `AC_PROVIDE($1)', but unfortunately many third
-# party macros know that we use `AC_PROVIDE_$1' and they depend on it.
+# Ideally we should just use `m4_provide($1)', but unfortunately many
+# third party macros know that we use `AC_PROVIDE_$1' and they depend
+# on it.
 m4_define([AC_PROVIDE],
-[m4_define([AC_PROVIDE_$1])])
+[m4_define([AC_PROVIDE_$1])m4_provide([$1])])
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 7ae5b45d651b2001e505cc7d758ec2ded3d62ada..eadea64b2280eb14c953e9383f0c2e76382a51e6 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -264,10 +264,11 @@ m4_define([AC_EXPAND_ONCE],
 
 # AC_PROVIDE(MACRO-NAME)
 # ----------------------
-# Ideally we should use `AC_PROVIDE($1)', but unfortunately many third
-# party macros know that we use `AC_PROVIDE_$1' and they depend on it.
+# Ideally we should just use `m4_provide($1)', but unfortunately many
+# third party macros know that we use `AC_PROVIDE_$1' and they depend
+# on it.
 m4_define([AC_PROVIDE],
-[m4_define([AC_PROVIDE_$1])])
+[m4_define([AC_PROVIDE_$1])m4_provide([$1])])
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

diff --git a/tests/base.at b/tests/base.at
index b0211558e19a6e104a1afbe69b7dc338211e5c9b..86c7eff4c4c8b195d4c2a33e0784c5bc4a9f9522 100644 (file)
--- a/tests/base.at
+++ b/tests/base.at
@@ -7,13 +7,13 @@ Autoconf base layer.
 EOF
 
 
-## ------------ ##
-## AC_REQUIRE.  ##
-## ------------ ##
+## ------------------------------- ##
+## AC_REQUIRE: topological sort..  ##
+## ------------------------------- ##
 
 # Check that dependencies are always properly honored.
 
-AT_SETUP(AC_REQUIRE: topological sort)
+AT_SETUP([AC_REQUIRE: topological sort])
 
 AT_DATA(configure.in,
 [[define([REQUIRE_AND_CHECK],
@@ -54,7 +54,7 @@ AT_CLEANUP(configure)
 ## AC_REQUIRE and AC_DEFUN_ONCE: Require, expand.  ##
 ## ----------------------------------------------- ##
 
-AT_SETUP(AC_REQUIRE & AC_DEFUN_ONCE: Require, expand)
+AT_SETUP([AC_REQUIRE & AC_DEFUN_ONCE: Require, expand])
 
 AT_DATA([configure.in],
 [[AC_DEFUN([TEST],
@@ -97,7 +97,7 @@ AT_CLEANUP(configure)
 ## AC_REQUIRE and AC_DEFUN_ONCE: Expand, require.  ##
 ## ----------------------------------------------- ##
 
-AT_SETUP(AC_REQUIRE & AC_DEFUN_ONCE: Expand, require)
+AT_SETUP([AC_REQUIRE & AC_DEFUN_ONCE: Expand, require])
 
 AT_DATA([configure.in],
 [[AC_DEFUN([TEST],
@@ -122,6 +122,7 @@ case $multi_test:$single_test in
   ..:. ) AS_EXIT(0);;
   ..:* ) AC_MSG_ERROR([DEFUN_ONCE is broken]);;
   *:.  ) AC_MSG_ERROR([DEFUN is broken (Wow, congrats!)]);;
+     * ) AC_MSG_ERROR([received `$multi_test:$single_test']);;
 esac
 ]])
 
@@ -132,3 +133,34 @@ AT_CHECK([./configure], 0)
 
 
 AT_CLEANUP(configure)
+
+
+
+## ------------------------- ##
+## AC_REQUIRE & AC_PROVIDE.  ##
+## ------------------------- ##
+
+AT_SETUP([AC_REQUIRE & AC_PROVIDE])
+
+AT_DATA([configure.in],
+[[AC_DEFUN([TEST],
+[AC_REQUIRE([INNER_TEST])])
+
+AC_DEFUN([INNER_TEST],
+[inner_test=".$inner_test"])
+
+AC_PLAIN_SCRIPT
+AC_PROVIDE([INNER_TEST])
+TEST
+
+case $inner_test in
+  "" ) AS_EXIT(0);;
+  *  ) AC_MSG_ERROR([received `$inner_test']);;
+esac
+]])
+
+AT_CHECK([autoconf --autoconf-dir .. -l $at_srcdir], 0)
+AT_CHECK([./configure], 0)
+
+
+AT_CLEANUP(configure)