[PATCH] Really call libtoolize in autogen.sh

Miloslav Trmac <mitr-VIXq6x/[email protected]> Sun, 18 Jul 2004 17:16:10 +0200
Newsgroups gmane.comp.gnome.apps.multisync.devel
Message-ID <[email protected]> 
Hello,
autogen.sh check for AM_PROG_LIBTOOL, but configure.in use AC_PROG_LIBTOOL.
The attached patch fixes that.
	Mirek
multisync-0.82-autogen.patch (text/plain, 5.5 KB) 
--- multisync/autogen.sh.lt	2004-07-18 16:00:15.606159232 +0200
+++ multisync/autogen.sh	2004-07-18 16:00:15.667149960 +0200
@@ -48,7 +48,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -128,7 +128,7 @@
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
--- multisync/plugins/backup_plugin/autogen.sh.lt	2004-07-18 16:00:15.669149656 +0200
+++ multisync/plugins/backup_plugin/autogen.sh	2004-07-18 16:00:15.673149048 +0200
@@ -48,7 +48,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -128,7 +128,7 @@
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
--- multisync/plugins/evolution_sync/autogen.sh.lt	2004-07-18 16:00:15.675148744 +0200
+++ multisync/plugins/evolution_sync/autogen.sh	2004-07-18 16:00:15.679148136 +0200
@@ -48,7 +48,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -128,7 +128,7 @@
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
--- multisync/plugins/opie_sync/macros/autogen.sh.lt	2004-07-18 16:00:15.685147224 +0200
+++ multisync/plugins/opie_sync/macros/autogen.sh	2004-07-18 16:00:15.690146464 +0200
@@ -27,7 +27,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed to compile Gnome."
@@ -152,7 +152,7 @@
         echo "Running xml-i18n-toolize... Ignore non-fatal messages."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
--- multisync/plugins/evolution2_sync/autogen.sh.lt	2004-07-18 16:00:15.692146160 +0200
+++ multisync/plugins/evolution2_sync/autogen.sh	2004-07-18 16:00:15.696145552 +0200
@@ -48,7 +48,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -128,7 +128,7 @@
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
--- multisync/plugins/irmc_sync/autogen.sh.lt	2004-07-18 16:00:15.698145248 +0200
+++ multisync/plugins/irmc_sync/autogen.sh	2004-07-18 16:00:15.702144640 +0200
@@ -48,7 +48,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -128,7 +128,7 @@
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
--- multisync/plugins/syncml_plugin/autogen.sh.lt	2004-07-18 16:00:15.705144184 +0200
+++ multisync/plugins/syncml_plugin/autogen.sh	2004-07-18 16:00:15.709143576 +0200
@@ -48,7 +48,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -128,7 +128,7 @@
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy