libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] libtoolize fix for configure.ac/document.


From: edward
Subject: [PATCH] libtoolize fix for configure.ac/document.
Date: Wed, 14 Mar 2001 09:41:27 -0500

ChangeLog:

2001-03-14  Edward M. Lee  <address@hidden>

 * libtoolize.in: check configure.ac; prefer configure.ac to
 configure.in; change recommendation from AM_PROG_LIBTOOL to
 AC_PROG_LIBTOOL.

Patch:

--- libtoolize.in~ Wed Sep  6 20:38:04 2000
+++ libtoolize.in Wed Mar 14 09:39:37 2001
@@ -54,6 +54,7 @@
 ltdl=
 ltdl_tar=
 status=0
+configure_ac=

 for arg
 do
@@ -134,8 +135,12 @@
   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
@@ -149,7 +154,7 @@
 files='config.guess config.sub ltmain.sh'

 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/'`
@@ -184,13 +189,13 @@
 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 \`AC_PROG_LIBTOOL' to \`$configure_ac'."
   fi

-  if egrep '^AC_PROG_RANLIB' configure.in >/dev/null 2>&1; then
-    echo "Using \`AC_PROG_RANLIB' is rendered obsolete by
\`AM_PROG_LIBTOOL'"
+  if egrep '^AC_PROG_RANLIB' $configure_ac >/dev/null 2>&1; then
+    echo "Using \`AC_PROG_RANLIB' is rendered obsolete by
\`AC_PROG_LIBTOOL'"
   fi

   if grep 'generated automatically by aclocal' aclocal.m4 >/dev/null 2>&1;
then
@@ -226,7 +231,7 @@
     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





reply via email to

[Prev in Thread] Current Thread [Next in Thread]