X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=buildconf.sh;h=2eea595e0a3c3668d56804452ca67ff719cd65e1;hb=abe840d8d4a289b0cf6221a3e1bc11e640e6c708;hp=2a68146556d3054eb91df28249275c57260fd5a3;hpb=03e2fc2fbd11931ca4183c3f1fb678f09eb5403e;p=metaproxy-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index 2a68146..2eea595 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,75 +1,18 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.14 2008-02-27 11:08:48 adam Exp $
 
-automake=automake
-aclocal=aclocal
-autoconf=autoconf
-libtoolize=libtoolize
-autoheader=autoheader
-
-if [ "`uname -s`" = FreeBSD ]; then
-    # FreeBSD intalls the various auto* tools with version numbers
-    echo "Using special configuration for FreeBSD ..."
-    automake=automake19
-    aclocal="aclocal19 -I /usr/local/share/aclocal"
-    autoconf=autoconf259
-    libtoolize=libtoolize15
-    autoheader=autoheader259
-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"
-    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
-set -
-if [ -f config.cache ]; then
-    rm config.cache
+if [ -d .git ]; then
+    git submodule init
+    git submodule update
 fi
 
-enable_configure=false
-enable_help=true
-sh_flags=""
-conf_flags=""
-case $1 in
-    -d)
-    sh_flags="-g -Wall"
-    enable_configure=true
-    enable_help=false
-    shift
-    ;;
-    -c)
-    sh_flags=""
-    enable_configure=true
-    enable_help=false
-    shift
-    ;;
-esac
+. m4/id-config.sh
 
-if $enable_configure; then
-    if test -n "$sh_flags"; then
-	CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
-    else
-	./configure $*
-    fi
-fi
 if $enable_help; then
     cat <<EOF
-    
+
 Build the Makefiles with the configure command.
   ./configure [--someoption=somevalue ...]
-  
+
 For help on options or configuring run
   ./configure --help
 
@@ -84,21 +27,29 @@ Build distribution tarball with
 Verify distribution tarball with
   make distcheck
 
+EOF
+    if [ -f /etc/debian_version ]; then
+        cat <<EOF
 Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
-When building from a CVS checkout, you need these Debian tools:
-  autoconf, automake, libtool, gcc, g++, make,
-  xsltproc, docbook, docbook-xml, docbook-xsl, trang,
-  libxslt1-dev, libyazpp-dev,
-  libboost-thread-dev, libboost-test-dev
-and for the image-processing needed to build the documentation:
-  inkscape
+When building from Git, you need these Debian packages:
+  autoconf automake libtool g++
+  xsltproc docbook docbook-xml docbook-xsl inkscape
+  libxslt1-dev libgnutls-dev libreadline5-dev libicu-dev
+  libboost-dev libboost-thread-dev libboost-test-dev
+  libboost-regex-dev libboost-system-dev
+
+And if you want to make a Debian package: dpkg-dev fakeroot debhelper
+(Then run "dpkg-buildpackage -rfakeroot" in this directory.)
 
 EOF
+    fi
+    if [ "`uname -s`" = FreeBSD ]; then
+        cat <<EOF
+  pkg_add -r autoconf268 automake111 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt boost-all
+  pkg_add -r icu4
+EOF
+    fi
 fi
-# Local Variables:
-# mode:shell-script
-# sh-indentation: 2
-# sh-basic-offset: 4
-# End: