libtoolize update

[Yann Droneaud]

Hi,

Here is a little patch for libtool.

It correct some examples 'configure.in'
 change AM_PROG_LIBTOOL to AC_PROG_LIBTOOL

It add support for specifying the name of configure script to libtoolize
 libtoolize [configure script]

examples:
 $ libtoolize configure.in # like default
 $ libtoolize configure.ac # new default name for autoconf 2.49c

Remove support for ltconfig in bootstrap

Change some message in libtoolize to print AC_PROG_LIBTOOL instead of obsolete
AM_PROG_LIBTOOL

--
Yann Droneaud <address@hidden>

Index: ChangeLog
===================================================================
RCS file: /home/cvs/libtool/ChangeLog,v
retrieving revision 1.849
diff -u -r1.849 ChangeLog
--- ChangeLog   2000/12/23 16:30:42     1.849
+++ ChangeLog   2001/01/03 20:46:04
@@ -1,3 +1,17 @@
+2000-12-28  Yann Droneaud  <address@hidden>
+       
+       * libltdl/configure.in: changed AM_PROG_LIBTOOL to AC_PROG_LIBTOOL
+       * demo/configure.in: likewise...
+       * depdemo/configure.in: likewise...
+       * cdemo/configure.in: likewise...
+       * mdemo/configure.in: likewise...
+
+       * bootstrap: remove support for ltconfig
+       for all examples, link acinclude.m4 instead of copying it
+
+       * libtoolize.in: can use a specified file instead of configure.in 
+       * doc/libtool.texi: added documentation about libtoolize arguments 
+       
 2000-12-23  Gary V. Vaughan  <address@hidden>
 
        From address@hidden:
Index: bootstrap
===================================================================
RCS file: /home/cvs/libtool/bootstrap,v
retrieving revision 1.15
diff -u -r1.15 bootstrap
--- bootstrap   2000/10/31 23:30:59     1.15
+++ bootstrap   2001/01/03 20:46:05
@@ -3,30 +3,36 @@
 # helps bootstrapping libtool, when checked out from CVS
 # requires GNU autoconf and GNU automake
 
-file=Makefile.in
-
 rm -f acinclude.m4
 ln -s libtool.m4 acinclude.m4
 # fake the libtool scripts
 touch ltmain.sh
-touch ltconfig
 touch libtoolize
 aclocal
 automake --gnu --add-missing --copy
 autoconf
+
+# bootstrap libltdl
+cd libltdl
+rm -f acinclude.m4 Makefile
+cat ../libtool.m4 > acinclude.m4
+cat ../ltdl.m4 >> acinclude.m4
+aclocal
+autoheader
+automake --gnits --add-missing
+autoconf
+cd ..
 
-for sub in libltdl demo depdemo mdemo cdemo; do
+for sub in demo depdemo mdemo cdemo; do
   cd $sub
   rm -f acinclude.m4 Makefile
-  cat ../libtool.m4 > acinclude.m4
-  test "$sub" = libltdl && cat ../ltdl.m4 >> acinclude.m4
+  ln -s ../acinclude.m4 acinclude.m4
   aclocal
-  test "$sub" = libltdl && autoheader
   automake --gnits --add-missing
   autoconf
   cd ..
 done
 
-rm -f ltmain.sh ltconfig libtoolize Makefile
+rm -f ltmain.sh libtoolize Makefile
 
 exit 0
Index: libtoolize.in
===================================================================
RCS file: /home/cvs/libtool/libtoolize.in,v
retrieving revision 1.13
diff -u -r1.13 libtoolize.in
--- libtoolize.in       2000/09/07 00:38:04     1.13
+++ libtoolize.in       2001/01/03 20:46:17
@@ -47,6 +47,9 @@
 cp="cp -f"
 mkdir="mkdir"
 
+configure_in_default=configure.in
+configure_in=
+
 # Global variables.
 automake=
 copy=
@@ -60,7 +63,7 @@
   case "$arg" in
   --help)
     cat <<EOF
-Usage: $progname [OPTION]...
+Usage: $progname [OPTION]... [CONFIGURE]
 
 Prepare a package to use libtool.
 
@@ -127,15 +130,23 @@
     ;;
 
   *)
-    echo "$progname: too many arguments" 1>&2
-    echo "$help" 1>&2
-    exit 1
+    if test -z "$configure_in" ; then
+      configure_in=$arg
+    else
+      echo "$progname: too many arguments" 1>&2
+      echo "$help" 1>&2
+      exit 1
+    fi
     ;;
   esac
 done
+
+if test -z "$configure_in" ; then
+ configure_in=$configure_in_default
+fi
 
-if test ! -f configure.in; then
-  echo "$progname: \`configure.in' does not exist" 1>&2
+if test ! -f $configure_in; then
+  echo "$progname: \`$configure_in' does not exist" 1>&2
   echo "$help" 1>&2
   exit 1
 fi
@@ -149,7 +160,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_in 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,12 +195,12 @@
 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_in >/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_in'."
   fi
 
-  if egrep '^AC_PROG_RANLIB' configure.in >/dev/null 2>&1; then
+  if egrep '^AC_PROG_RANLIB' $configure_in >/dev/null 2>&1; then
     echo "Using \`AC_PROG_RANLIB' is rendered obsolete by \`AM_PROG_LIBTOOL'"
   fi
 
@@ -226,7 +237,7 @@
     echo "You should $updatemsg."
   fi
 
-  if grep '^AC_LIB_LTDL' configure.in >/dev/null 2>&1; then
+  if grep '^AC_LIB_LTDL' $configure_in >/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
Index: cdemo/configure.in
===================================================================
RCS file: /home/cvs/libtool/cdemo/configure.in,v
retrieving revision 1.8
diff -u -r1.8 configure.in
--- cdemo/configure.in  1999/03/30 19:22:23     1.8
+++ cdemo/configure.in  2001/01/03 20:46:17
@@ -5,7 +5,7 @@
 
 AC_PROG_CC
 AC_EXEEXT
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 AC_CHECK_HEADERS(math.h)
Index: demo/configure.in
===================================================================
RCS file: /home/cvs/libtool/demo/configure.in,v
retrieving revision 1.17
diff -u -r1.17 configure.in
--- demo/configure.in   2000/09/21 00:10:41     1.17
+++ demo/configure.in   2001/01/03 20:46:17
@@ -7,7 +7,7 @@
 AC_C_CONST
 AC_EXEEXT
 AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 if ./libtool --features | grep '^enable static libraries$' > /dev/null 2>&1; 
then
Index: depdemo/configure.in
===================================================================
RCS file: /home/cvs/libtool/depdemo/configure.in,v
retrieving revision 1.11
diff -u -r1.11 configure.in
--- depdemo/configure.in        1999/03/30 19:22:29     1.11
+++ depdemo/configure.in        2001/01/03 20:46:17
@@ -5,7 +5,7 @@
 
 AC_PROG_CC
 AC_EXEEXT
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
Index: doc/libtool.texi
===================================================================
RCS file: /home/cvs/libtool/doc/libtool.texi,v
retrieving revision 1.112
diff -u -r1.112 libtool.texi
--- doc/libtool.texi    2000/12/23 16:30:43     1.112
+++ doc/libtool.texi    2001/01/03 20:46:33
@@ -1782,13 +1782,17 @@
 The @code{libtoolize} program has the following synopsis:
 
 @example
-libtoolize address@hidden@dots{}
+libtoolize address@hidden@dots{} address@hidden
 @end example
 
 @noindent
 and accepts the following options:
 
 @table @samp
+
address@hidden script
+Use the provided script instead of @file{configure.in}.
+
 @item --automake
 Work silently, and assume that Automake libtool support is used.
 
Index: libltdl/configure.in
===================================================================
RCS file: /home/cvs/libtool/libltdl/configure.in,v
retrieving revision 1.55
diff -u -r1.55 configure.in
--- libltdl/configure.in        2000/01/13 00:28:09     1.55
+++ libltdl/configure.in        2001/01/03 20:46:33
@@ -30,7 +30,7 @@
 AC_C_INLINE
 
 AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 AC_LIB_LTDL
Index: mdemo/configure.in
===================================================================
RCS file: /home/cvs/libtool/mdemo/configure.in,v
retrieving revision 1.24
diff -u -r1.24 configure.in
--- mdemo/configure.in  2000/09/04 05:10:30     1.24
+++ mdemo/configure.in  2001/01/03 20:46:33
@@ -13,7 +13,7 @@
 
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then