X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=c6a4e3921223193fa23a58a740a2aea36b5a311c;hp=fafe009783123d7e7e044f95f6a3cbdf8a0dd9a4;hb=HEAD;hpb=fa0660538cb250e7a9bc000a4f06d79d4c27d354

diff --git a/buildconf.sh b/buildconf.sh
index fafe009..c6a4e39 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,61 +1,12 @@
 #!/bin/sh
 
-test -d config || mkdir config
-if test .git; then
-    if test -d m4/.git -a -d doc/common/.git; then
-        :
-    else
-        git submodule init
-    fi
+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 aclocal/tcl.m4
-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"
-	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" CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
-    else
-	./configure $*
-    fi
-fi
 if $enable_help; then
     cat <<EOF
 
@@ -76,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, libtool, gcc, g++, libyaz-dev,
-  xsltproc, docbook, docbook-xml, docbook-xsl, make,
-  libssl-dev, libreadline5-dev, g++
+When building from Git, you need these Debian packages:
+  autoconf automake libtool g++ 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:
+  pkg_add -r autoconf268 automake111 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt
+  pkg_add -r icu4
+EOF
+    fi
 fi