From 0beb73da1dd548c6980a39c6696ec2f4c4bd4d8a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 1 May 2009 11:02:30 +0200 Subject: [PATCH] buildconf.sh uses only Libtool flags when present --- buildconf.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/buildconf.sh b/buildconf.sh index 1850bae..9671592 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -40,6 +40,12 @@ $aclocal -I m4 if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then $autoheader fi +if grep AM_PROG_LIBTOOL configure.ac >/dev/null; then + has_libtool=true +else + has_libtool=false +fi + $libtoolize --automake --force $automake --add-missing $autoconf @@ -71,7 +77,11 @@ esac if $enable_configure; then if [ -n "$sh_cflags" ]; then - CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* + if $has_libtool; then + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* + else + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $* + fi else ./configure $* fi @@ -106,7 +116,7 @@ When building from Git, you need these Debian packages: autoconf, automake, libtool, gcc, bison, any tcl, xsltproc, docbook, docbook-xml, docbook-xsl, libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev, - libpcap0.8-dev + libpcap0.8-dev, pkg-config Also perhaps: libgnutls-dev libicu-dev -- 1.7.10.4