From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Date: Thu, 16 Dec 1999 10:42:07 +0000 (+0000)
Subject: * libltdl/configure.in (with_auxdir): Do not use it as the
X-Git-Tag: release-1-3d~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53ea12e82f2164df4920c6331283bc198bcfc641;p=thirdparty%2Flibtool.git

* libltdl/configure.in (with_auxdir): Do not use it as the
argument of AC_CONFIG_AUX_DIR, automake requires a literal here.
Use AC_CONFIG_AUX_DIRS/DIR_DEFAULT instead.
---

diff --git a/ChangeLog b/ChangeLog
index 7ce64f942..d4f62091e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-12-16  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
+	* libltdl/configure.in (with_auxdir): Do not use it as the
+	argument of AC_CONFIG_AUX_DIR, automake requires a literal here.
+	Use AC_CONFIG_AUX_DIRS/DIR_DEFAULT instead.
+
 	* libltdl/Makefile.am (ACLOCAL): Define with `-I .', as in
 	bootstrap.
 
diff --git a/libltdl/configure.in b/libltdl/configure.in
index 803dd9197..ef9a1b2b4 100644
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -1,10 +1,13 @@
 dnl Process this file with autoconf to create configure.
 
 AC_INIT(ltdl.c)
+
+dnl We shouldn't be using these internal macros of autoconf,
+dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
 AC_ARG_WITH(auxdir,
-[  --with-auxdir=DIR   path to autoconf auxiliary files],,
-[if test -f ../config.sub; then with_auxdir=..; else with_auxdir=../..; fi])
-AC_CONFIG_AUX_DIR($with_auxdir)
+[  --with-auxdir=DIR   path to autoconf auxiliary files],
+[AC_CONFIG_AUX_DIRS($with_auxdir)],
+[AC_CONFIG_AUX_DIR_DEFAULT])
 
 if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
   if test -f ${srcdir}/ltconfig && test -f ${srcdir}/ltmain.sh; then