From b9e8337ac04be2e5fb43c9256aafdb1a4a9c8725 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 7 Aug 2012 13:43:12 +0200 Subject: [PATCH] Use m4/id-config.sh --- Makefile.am | 2 +- buildconf.sh | 75 ++-------------------------------------------------------- m4 | 2 +- 3 files changed, 4 insertions(+), 75 deletions(-) diff --git a/Makefile.am b/Makefile.am index ef13805..41c88be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign -EXTRA_DIST = Doxyfile.in IDMETA README LICENSE NEWS \ +EXTRA_DIST = Doxyfile.in IDMETA README LICENSE NEWS m4/id-config.sh \ m4/yazpp.m4 m4/yaz.m4 m4/boost.m4 \ buildconf.sh metaproxy.spec metaproxy-config.in diff --git a/buildconf.sh b/buildconf.sh index 0542a31..f6de5af 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -1,83 +1,12 @@ #!/bin/sh -automake=automake -aclocal=aclocal -autoconf=autoconf -libtoolize=libtoolize -autoheader=autoheader - -test -d autom4te.cache && rm -r autom4te.cache -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 [ -f /etc/debian_version ]; then - echo " sudo apt-get install automake1.9" - echo " sudo update-alternatives --config automake" - fi - exit 1 -fi +. m4/id-config.sh -set -x -$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 -fi - -enable_configure=false -enable_help=true -sh_flags="" -conf_flags="" -case $1 in - -d) - sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes" - sh_cxxflags="-g -Wall" - enable_configure=true - enable_help=false - shift - ;; - -c) - sh_cflags="" - sh_cxxflags="" - enable_configure=true - enable_help=false - shift - ;; -esac - -if $enable_configure; then - if [ -n "$sh_cflags" ]; then - CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure \ - --disable-shared --enable-static --with-pic $* - else - ./configure $* - fi -fi if $enable_help; then cat <