From: Edward M. Lee <tailbert@yahoo.com>
Date: Fri, 30 Mar 2001 22:35:20 +0000 (+0000)
Subject: * libtoolize.in: Check configure.ac and prefer configure.ac to
X-Git-Tag: multi-language-merge-point~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a9fb63606b492d80cf90d8dc24c9a5460b7a740;p=thirdparty%2Flibtool.git

* libtoolize.in: Check configure.ac and prefer configure.ac to
configure.in.
---

diff --git a/ChangeLog b/ChangeLog
index af8c22381..49313f6d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-29  Edward M. Lee  <tailbert@yahoo.com>
+
+	* libtoolize.in: Check configure.ac and prefer configure.ac to
+	configure.in.
+	
 2001-03-22  Laurynas Biveinis  <lauras@softhome.net>
 
 	* ltcf-c.sh: Clear ac_cv_prog_cc_pic for DJGPP.  Do not add
diff --git a/libtoolize.in b/libtoolize.in
index 59024eadd..9be955dc5 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -53,6 +53,7 @@ copy=
 force=
 ltdl=
 ltdl_tar=
+configure_ac=
 status=0
 
 for arg
@@ -134,8 +135,12 @@ EOF
   esac
 done
 
-if test ! -f configure.in; then
-  echo "$progname: \`configure.in' does not exist" 1>&2
+if test -f configure.ac; then
+  configure_ac=configure.ac
+elif test -f configure.in; then
+  configure_ac=configure.in
+else
+  echo "$progname: \`configure.ac' does not exist" 1>&2
   echo "$help" 1>&2
   exit 1
 fi
@@ -148,18 +153,18 @@ if test -z "$files"; then
 fi
 files='config.guess config.sub ltconfig ltmain.sh ltcf-c.sh'
 
-#Add C++ support if configure.in uses AC_LIBTOOL_CXX or AC_PROG_CXX.
-if egrep '^[ ]*AC_(PROG|LIBTOOL)_CXX' configure.in > /dev/null 2>&1; then
+#Add C++ support if $configure_ac uses AC_LIBTOOL_CXX or AC_PROG_CXX.
+if egrep '^[ ]*AC_(PROG|LIBTOOL)_CXX' $configure_ac > /dev/null 2>&1; then
   files="$files ltcf-cxx.sh"
 fi
 
-#Add GCJ support if configure.in uses AC_LIBTOOL_GCJ or A[CM]_PROG_GCJ.
-if egrep '^[ ]*A([CM]_PROG|C_LIBTOOL)_GCJ' configure.in > /dev/null 2>&1; then
+#Add GCJ support if $configure_ac uses AC_LIBTOOL_GCJ or A[CM]_PROG_GCJ.
+if egrep '^[ ]*A([CM]_PROG|C_LIBTOOL)_GCJ' $configure_ac > /dev/null 2>&1; then
   files="$files ltcf-gcj.sh"
 fi
 
 auxdir=.
-auxdirline=`egrep '^AC_CONFIG_AUX_DIR' configure.in 2>/dev/null`
+auxdirline=`egrep '^AC_CONFIG_AUX_DIR' $configure_ac 2>/dev/null`
 if test -n "$auxdirline"; then
   # Handle explicit AC_CONFIG_AUX_DIR settings.
   auxdir=`echo "$auxdirline" | sed 's/^AC_CONFIG_AUX_DIR(\([^)]*\)).*$/\1/'`
@@ -194,12 +199,12 @@ else
 fi
 
 if test -z "$automake"; then
-  if egrep '^A[MC]_PROG_LIBTOOL' configure.in >/dev/null 2>&1; then :
+  if egrep '^A[MC]_PROG_LIBTOOL' $configure_ac >/dev/null 2>&1; then :
   else
-    echo "Remember to add \`AM_PROG_LIBTOOL' to \`configure.in'."
+    echo "Remember to add \`AM_PROG_LIBTOOL' to \`$configure_ac'."
   fi
 
-  if egrep '^AC_PROG_RANLIB' configure.in >/dev/null 2>&1; then
+  if egrep '^AC_PROG_RANLIB' $configure_ac >/dev/null 2>&1; then
     echo "Using \`AC_PROG_RANLIB' is rendered obsolete by \`AM_PROG_LIBTOOL'"
   fi
 
@@ -236,7 +241,7 @@ if test -z "$automake"; then
     echo "You should $updatemsg."
   fi
 
-  if grep '^AC_LIB_LTDL' configure.in >/dev/null 2>&1; then
+  if grep '^AC_LIB_LTDL' $configure_ac >/dev/null 2>&1; then
     if grep 'generated automatically by aclocal' aclocal.m4 >/dev/null 2>&1; then
       updatemsg="update your \`aclocal.m4' by running aclocal"
     else