Merge r1412, r1415 from trunk:

* configure.in, autogen.sh: Support libtool 2.2.

Submitted by: Arfrever Frehtes Taifersar Arahesis

* autogen.sh: Use libtoolize --install where supported.


git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.28.x@1504 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845

2 files changed, 9 insertions, 4 deletions

diff --git a/autogen.sh b/autogen.sh
index 471327a..2643313 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-rm -f ltconfig ltmain.sh config.cache aclocal.m4
+rm -f ltconfig ltmain.sh config.cache aclocal.m4 config.guess config.sub
 # remove the autoconf cache
 rm -rf autom4te*.cache
 # create a .version file for configure.in
 if test ! -f .version; then
-   # Building from CVS rather than in a release
+   # Building from SVN rather than in a release
    echo 0.0.0-dev > .version
    # for the documentation:
    date +"%e %B %Y" | tr -d '\n' > doc/date.xml
@@ -12,7 +12,12 @@ if test ! -f .version; then
 fi
 set -e
 echo -n "libtoolize... "
-${LIBTOOLIZE:-libtoolize} --copy --force >/dev/null
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+if ${LIBTOOLIZE} --help | grep -- --install > /dev/null; then
+   ${LIBTOOLIZE} --copy --force --install >/dev/null;
+else
+   ${LIBTOOLIZE} --copy --force >/dev/null
+fi
 echo -n "aclocal... "
 ${ACLOCAL:-aclocal} -I macros
 echo -n "autoheader... "
diff --git a/configure.in b/configure.in
index e549a29..3664d55 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ dnl is not available.
 m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
 
 AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
+m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
 
 AC_EXEEXT