projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log session timeout. Reenable ASSOC_UP.
[yaz-moved-to-github.git]
/
buildconf.sh
diff --git
a/buildconf.sh
b/buildconf.sh
index
ec44e4c
..
9671592
100755
(executable)
--- 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 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
$libtoolize --automake --force
$automake --add-missing
$autoconf
@@
-71,7
+77,11
@@
esac
if $enable_configure; then
if [ -n "$sh_cflags" ]; then
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
else
./configure $*
fi