* autoconf.in: Try to define the variables before using them.

* autom4te.in ($perllibdir): Use `$autom4te_perllibdir' as envvar
instead of `$perllibdir'.
* tests/atconfig.in ($autom4te_perllibdir): Export it.

diff --git a/ChangeLog b/ChangeLog
index e8161f7ca69d6386f798e55a5f82751a9c8aaa8e..87b4158a72c954187fd7ee23c795eb4ae4ca7f52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-25  Akim Demaille  <akim@epita.fr>
+
+       * autoconf.in: Try to define the variables before using them.
+       * autom4te.in ($perllibdir): Use `$autom4te_perllibdir' as envvar
+       instead of `$perllibdir'.
+       * tests/atconfig.in ($autom4te_perllibdir): Export it.
+
 2001-07-25  Akim Demaille  <akim@epita.fr>
 
        * autoconf.in (ac_LF_and_DOT): Remove, unused.

diff --git a/autoconf.in b/autoconf.in
index 5930dc82a28eb243a1a20a0f7a03ec325adc290b..b486f646201db971e3306206586cff1740b626c5 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -83,6 +83,18 @@ if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 
+# Variables.
+: ${autoconf_dir=${AC_MACRODIR=@datadir@}}
+debug=false
+dir=`echo "$0" | sed -e 's,[^\\/]*$,,'`
+# Trace Autoconf's initialization?
+initialization=false
+localdir=.
+outfile=
+# Exit status.
+status=0
+verbose=:
+
 # Find GNU m4.
 # Handle the case that m4 has moved since we were configured.
 # It may have been found originally in a build directory.
@@ -126,19 +138,6 @@ for autom4te in "$AUTOM4TE" \
 done
 
 
-# Variables.
-: ${autoconf_dir=${AC_MACRODIR=@datadir@}}
-test -z "$AC_ACLOCALDIR" &&
-  AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`
-debug=false
-# Trace Autoconf's initialization?
-initialization=false
-localdir=.
-outfile=
-# Exit status.
-status=0
-verbose=:
-
 # Parse command line.
 while test $# -gt 0 ; do
   optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \

diff --git a/autom4te.in b/autom4te.in
index 491e9f69f3483ac77708d023250393494b4d1479..2169f6d36ed016169b9618bbaaceb05cf7060b3b 100644 (file)
--- a/autom4te.in
+++ b/autom4te.in
@@ -38,7 +38,7 @@ BEGIN
 {
   my $prefix = "@prefix@";
   # FIXME: Import Struct into Autoconf.
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@";
+  my $perllibdir = $ENV{'autom4te_perllibdir'} || "@datadir@";
   unshift @INC, "$perllibdir";
 }
 

diff --git a/bin/autoconf.in b/bin/autoconf.in
index 5930dc82a28eb243a1a20a0f7a03ec325adc290b..b486f646201db971e3306206586cff1740b626c5 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -83,6 +83,18 @@ if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 
+# Variables.
+: ${autoconf_dir=${AC_MACRODIR=@datadir@}}
+debug=false
+dir=`echo "$0" | sed -e 's,[^\\/]*$,,'`
+# Trace Autoconf's initialization?
+initialization=false
+localdir=.
+outfile=
+# Exit status.
+status=0
+verbose=:
+
 # Find GNU m4.
 # Handle the case that m4 has moved since we were configured.
 # It may have been found originally in a build directory.
@@ -126,19 +138,6 @@ for autom4te in "$AUTOM4TE" \
 done
 
 
-# Variables.
-: ${autoconf_dir=${AC_MACRODIR=@datadir@}}
-test -z "$AC_ACLOCALDIR" &&
-  AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`
-debug=false
-# Trace Autoconf's initialization?
-initialization=false
-localdir=.
-outfile=
-# Exit status.
-status=0
-verbose=:
-
 # Parse command line.
 while test $# -gt 0 ; do
   optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 491e9f69f3483ac77708d023250393494b4d1479..2169f6d36ed016169b9618bbaaceb05cf7060b3b 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -38,7 +38,7 @@ BEGIN
 {
   my $prefix = "@prefix@";
   # FIXME: Import Struct into Autoconf.
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@";
+  my $perllibdir = $ENV{'autom4te_perllibdir'} || "@datadir@";
   unshift @INC, "$perllibdir";
 }
 

diff --git a/tests/atconfig.in b/tests/atconfig.in
index 9c5b7c88cd70d8b8802d7e4feeb6907dbba411ce..318706b7098c1f670e991f3d07f77e3237f5e470 100644 (file)
--- a/tests/atconfig.in
+++ b/tests/atconfig.in
@@ -65,3 +65,11 @@ PATH_SEPARATOR='@PATH_SEPARATOR@'
 
 # We need GNU m4.
 M4='@M4@'
+
+# Be sure to use the non installed Perl modules.
+# We need no special protection for the subtools (e.g., autoheader runs
+# autoconf which runs autom4te) because by themselves, they try to use
+# subtools from the same directory (i.e., foo/autoheader will run
+# foo/autoconf etc.).
+autom4te_perllibdir=$top_srcdir/lib
+export autom4te_perllibdir