X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=6e6e322e9f513815d6f139fd8f8d07e30ed6d614;hp=9a92e766f658792196035dfb2846d05c59d23339;hb=db0eb0996fc35e065bbf995f34c86ba4cd9dfb0f;hpb=2d247ac3b6ac4a8422e3260c3891ee1374a41c0a

diff --git a/buildconf.sh b/buildconf.sh
index 9a92e76..6e6e322 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,64 +1,12 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.30 2006-05-22 12:11:45 mike Exp $
 
-automake=automake
-aclocal=aclocal
-autoconf=autoconf
-
-if [ "`uname -s`" = FreeBSD ]; then
-    # FreeBSD intalls the various auto* tools with version numbers
-    echo "Using special configuation for FreeBSD ..."
-    automake=automake19
-    aclocal="aclocal19 -I /usr/local/share/aclocal"
-    autoconf=autoconf259
+if [ -d .git ]; then
+    git submodule init
+    git submodule update
 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
+. m4/id-config.sh
 
-set -x
-# I am tired of underquoted warnings for Tcl macros
-$aclocal -I m4 2>&1 | grep -v "warning: underquoted definition"
-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_flags="-g -Wall -Wdeclaration-after-statement"
-	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
 
@@ -79,12 +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, bison, gcc, libtool,
-  docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,
-  libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev, any tcl
+When building from Git, you need these Debian packages:
+  autoconf automake libtool gcc bison tcl8.4
+  xsltproc docbook docbook-xml docbook-xsl
+  libxslt1-dev libgnutls-dev libreadline5-dev libwrap0-dev
+  pkg-config 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:
+  pkg_add -r autoconf268 automake111 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt
+  pkg_add -r icu4
+EOF
+    fi
 fi