X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=96715929c6ced752d67261d0c76b6f106b20e994;hp=e20925fc1db62564f57dbd7d503facc0e5389199;hb=1aac63eecd76d5d060da84037a355c153d747ca7;hpb=243dcdc032523016724ee50765a8a58e9d808209 diff --git a/buildconf.sh b/buildconf.sh index e20925f..9671592 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -1,22 +1,34 @@ #!/bin/sh -# $Id: buildconf.sh,v 1.31 2006-05-22 15:15:26 mike Exp $ automake=automake aclocal=aclocal autoconf=autoconf +libtoolize=libtoolize +autoheader=autoheader +test -d config || mkdir config +if [ -d .git ]; then + git submodule init + git submodule update +fi if [ "`uname -s`" = FreeBSD ]; then # FreeBSD intalls the various auto* tools with version numbers - echo "Using special configuation for FreeBSD ..." + echo "Using special configuration for FreeBSD ..." automake=automake19 aclocal="aclocal19 -I /usr/local/share/aclocal" autoconf=autoconf259 - echo "Remember to use gmake (GNU make) instead of vanilla make" + libtoolize=libtoolize15 + autoheader=autoheader259 +fi + +if [ "`uname -s`" = Darwin ]; then + echo "Using special configuration for Darwin/MacOS ..." + libtoolize=glibtoolize fi if $automake --version|head -1 |grep '1\.[4-7]'; then echo "automake 1.4-1.7 is active. You should use automake 1.8 or later" - if test -f /etc/debian_version; then + if [ -f /etc/debian_version ]; then echo " sudo apt-get install automake1.9" echo " sudo update-alternatives --config automake" fi @@ -24,9 +36,17 @@ if $automake --version|head -1 |grep '1\.[4-7]'; then fi set -x -# I am tired of underquoted warnings for Tcl macros -$aclocal -I m4 2>&1 | grep -v "warning: underquoted definition" -libtoolize --automake --force +$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 set - @@ -40,13 +60,15 @@ sh_flags="" conf_flags="" case $1 in -d) - sh_flags="-g -Wall -Wdeclaration-after-statement" + sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes" + sh_cxxflags="-g -Wall" enable_configure=true enable_help=false shift ;; -c) - sh_flags="" + sh_cflags="" + sh_cxxflags="" enable_configure=true enable_help=false shift @@ -54,8 +76,12 @@ case $1 in esac if $enable_configure; then - if test -n "$sh_flags"; then - CFLAGS="$sh_flags" ./configure $* + if [ -n "$sh_cflags" ]; then + 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 @@ -80,12 +106,30 @@ Build distribution tarball with Verify distribution tarball with make distcheck +EOF + if [ -f /etc/debian_version ]; then + cat <