assorted build system updates

git-svn-id: file:///home/lennart/svn/public/libasyncns/trunk@28 cc0fb855-19ed-0310-866e-8c1d96e4abae

1 files changed, 24 insertions, 38 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index 5980660..524770a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,47 +1,33 @@
-#!/bin/bash
 # $Id$
 
 # This file is part of libasyncns.
 #
 # libasyncns is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
 #
 # libasyncns is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with libasyncns; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-run_versioned() {
-    local P
-    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
-
-    shift 2
-    "$P" "$@"
-}
-
-if [ "x$1" = "xam" ] ; then
-    set -ex
-    run_versioned automake 1.7 -a -c --foreign
-    ./config.status
-else 
-    set -ex
-
-    rm -rf autom4te.cache
-    rm -f config.cache
-
-    run_versioned aclocal 1.7
-    libtoolize -c --force
-    autoheader
-    run_versioned automake 1.7 -a -c --foreign
-    autoconf -Wall
-
-    CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"
-
-    make clean
-fi
+# You should have received a copy of the GNU Lesser General Public
+# License along with libasyncns; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+# USA
+
+FLAGS="--sysconfdir=/etc"
+
+case `uname -s` in
+    Darwin)
+    export LIBTOOLIZE=/opt/local/bin/glibtoolize
+    export PKG_CONFIG_PATH="/opt/local/lib/pkgconfig"
+    FLAGS="$FLAGS --prefix=/opt/local"
+    ;;
+    FreeBSD)
+    cp /usr/local/share/aclocal/libtool15.m4 common/
+    ;;
+esac
+
+CFLAGS="$CFLAGS -g -O0" exec ./autogen.sh $FLAGS "$@"