X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=buildconf.sh;h=841e336e0a64210b765bee73626b8d57b74465fb;hb=64dccf5757a22cedd3c21ca834e3e02f39dd0504;hp=a6c4a32f740b7039aa762dd02215adf911d93138;hpb=b4e80d145253134b44614896ba7f0b1975d22afa;p=pazpar2-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index a6c4a32..841e336 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,83 +1,18 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.4 2007-04-10 08:11:18 adam Exp $
 
-automake=automake
-aclocal=aclocal
-autoconf=autoconf
-libtoolize=libtoolize
-autoheader=autoheader
-
-test -d config || mkdir config
-if test -d m4/.git -a -d doc/common/.git; then
-    :
-else
+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=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
+. m4/id-config.sh
 
-# I am tired of underquoted warnings for Tcl macros
-$aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
-$autoheader
-$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_flags="-g -Wall -Wdeclaration-after-statement"
-    sh_flags="-g -Wall"
-    enable_configure=true
-    enable_help=false
-    shift
-    ;;
-    -c)
-    sh_flags=""
-    enable_configure=true
-    enable_help=false
-    shift
-    ;;
-esac
-
-if $enable_configure; then
-    if test -n "$sh_flags"; then
-	CFLAGS="$sh_flags" ./configure $*
-    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
 
@@ -92,16 +27,27 @@ 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:
-  libyaz-dev
+When building from Git, you need these Debian packages:
+  autoconf automake libtool gcc tcl8.4
+  xsltproc docbook docbook-xml docbook-xsl
+  libxslt1-dev libgnutls-dev libreadline5-dev libicu-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
+When building from a Git, you need these FreeBSD Ports:
+  autoconf259, automake19, libtool15, bison, tcl84,
+  docbook-xsl, libxml2, libxslt, g++-4.0, make
 EOF
+    fi
 fi
-# Local Variables:
-# mode:shell-script
-# sh-indentation: 2
-# sh-basic-offset: 4
-# End: