Run intltoolize after automake, since intltoolize wants mkinstalldirs now.

	* autogen.sh: Run intltoolize after automake, since intltoolize
	wants mkinstalldirs now. Should fix bugs #130309 and #130366.

svn path=/trunk/; revision=3434

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index e938001..4792a09 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-02  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+       * autogen.sh: Run intltoolize after automake, since intltoolize
+       wants mkinstalldirs now. Should fix bugs #130309 and #130366.
+
 2003-12-13  Malcolm Tredinnick <malcolm@commsecure.com.au>
 
        * autogen.sh: Change the use of head to be 'head -n -1', since

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 103c98f..f98bc3d 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -345,10 +345,6 @@ for configure_ac in $configure_files; do
                echo "no" | $GETTEXTIZE --force --copy || exit 1
           fi
        fi
-       if grep "^AC_PROG_INTLTOOL" $basename >/dev/null; then
-           printbold "Running $INTLTOOLIZE..."
-           $INTLTOOLIZE --force --automake || exit 1
-       fi
        if grep "^GTK_DOC_CHECK" $basename >/dev/null; then
            printbold "Running $GTKDOCIZE..."
            $GTKDOCIZE || exit 1
@@ -365,6 +361,13 @@ for configure_ac in $configure_files; do
        printbold "Running $AUTOMAKE..."
        $AUTOMAKE --gnu --add-missing || exit 1
 
+       # This must run after automake, since intltoolize wants mkinstalldirs
+       # to be available and that is only linked or copied by automake.
+       if grep "^AC_PROG_INTLTOOL" $basename >/dev/null; then
+           printbold "Running $INTLTOOLIZE..."
+           $INTLTOOLIZE --force --automake || exit 1
+       fi
+
        printbold "Running $AUTOCONF..."
        $AUTOCONF || exit 1