X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=buildconf.sh;h=8c546d321df221c3f871f937e06d1a5a3c10a1f7;hb=128c9ed48b267a44d73919f662043bd034a20be6;hp=2e3437d2bae4c771421d8b088cbe19fb745f7efa;hpb=eddcbb272eb52f1baa5d7d0ed6ecbb720fc1e537;p=metaproxy-moved-to-github.git diff --git a/buildconf.sh b/buildconf.sh index 2e3437d..8c546d3 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -1,23 +1,48 @@ #!/bin/sh -# $Id: buildconf.sh,v 1.11 2006-05-27 08:07:08 adam Exp $ -if automake --version|head -1 |grep '1\.[4-7]'; then +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 configuration for FreeBSD ..." + automake=automake + aclocal="aclocal -I /usr/local/share/aclocal" + autoconf=autoconf + libtoolize=libtoolize + autoheader=autoheader +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 - echo " sudo apt-get install automake1.9" - echo " sudo update-alternatives --config automake" + if [ -f /etc/debian_version ]; then + echo " sudo apt-get install automake1.9" + echo " sudo update-alternatives --config automake" fi exit 1 fi set -x - -# I am tired of underquoted warnings for Tcl macros -aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4 -autoheader -libtoolize --automake --force -automake --add-missing -autoconf +$aclocal -I m4 +if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then + $autoheader +fi +$libtoolize --automake --force +$automake --add-missing +$autoconf set - if [ -f config.cache ]; then rm config.cache @@ -29,13 +54,15 @@ sh_flags="" conf_flags="" case $1 in -d) - sh_flags="-g -Wall" + 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 @@ -43,8 +70,9 @@ case $1 in esac if $enable_configure; then - if test -n "$sh_flags"; then - CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $* + if [ -n "$sh_cflags" ]; then + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure \ + --disable-shared --enable-static --with-pic $* else ./configure $* fi @@ -69,17 +97,29 @@ Build distribution tarball with Verify distribution tarball with make distcheck +EOF + if [ -f /etc/debian_version ]; then + cat <