X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=buildconf.sh;h=0542a3141d8057093009a19c1140aa7d326c8b4a;hb=b8550b672196ca7e6fe11a8cba7155beb8794286;hp=50bc1df9ba451e482a8439907827af68eb69bf92;hpb=202d60a6605b106724d4c655e920378f311da061;p=metaproxy-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index 50bc1df..0542a31 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.12 2006-10-13 09:53:51 adam Exp $
 
 automake=automake
 aclocal=aclocal
@@ -7,35 +6,47 @@ autoconf=autoconf
 libtoolize=libtoolize
 autoheader=autoheader
 
+test -d autom4te.cache && rm -r autom4te.cache
+test -d config || mkdir config
+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
+    automake=automake
+    aclocal="aclocal -I /usr/local/share/aclocal"
+    autoconf=autoconf
+    libtoolize=libtoolize
+    autoheader=autoheader
+fi
+
+if [ "`uname -s`" = Darwin ]; then
+    echo "Using special configuration for Darwin/MacOS ..."
+    libtoolize=glibtoolize
 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"
+    if [ -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
+$aclocal -I m4
+if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
+    $autoheader
+fi
 $libtoolize --automake --force 
 $automake --add-missing 
 $autoconf
 set -
 if [ -f config.cache ]; then
-    rm config.cache
+	rm config.cache
 fi
 
 enable_configure=false
@@ -44,32 +55,35 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-    sh_flags="-g -Wall"
-    enable_configure=true
-    enable_help=false
-    shift
-    ;;
+	sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
+	sh_cxxflags="-g -Wall"
+	enable_configure=true
+	enable_help=false
+	shift
+	;;
     -c)
-    sh_flags=""
-    enable_configure=true
-    enable_help=false
-    shift
-    ;;
+	sh_cflags=""
+	sh_cxxflags=""
+	enable_configure=true
+	enable_help=false
+	shift
+	;;
 esac
 
 if $enable_configure; then
-    if test -n "$sh_flags"; then
-	CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
+    if [ -n "$sh_cflags" ]; then
+	CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure \
+		--disable-shared --enable-static --with-pic $*
     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,22 +98,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,
-  libxslt1-dev, libyazpp-dev,
-  libboost-thread-dev, libboost-date-time-dev,
-  libboost-program-options-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
+
+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 autoconf262 automake110 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: