From 5a7446d19e94ed92514322954f056993199b06a6 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 28 Mar 2006 20:00:15 +0000
Subject: [PATCH] Move to automake 1.8/1.9

---
 buildconf.sh |   14 ++++++++++--
 configure.ac |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |   65 -----------------------------------------------------
 3 files changed, 83 insertions(+), 67 deletions(-)
 create mode 100644 configure.ac
 delete mode 100644 configure.in

diff --git a/buildconf.sh b/buildconf.sh
index 63c014f..d7537b8 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,7 +1,17 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.8 2006-03-09 14:14:06 adam Exp $
+# $Id: buildconf.sh,v 1.9 2006-03-28 20:00:15 adam Exp $
+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
-aclocal -I .
+# I am tired of underquoted warnings for Tcl macros
+aclocal -I . 2>&1 | grep -v aclocal/tcl.m4
 libtoolize --automake --force 
 automake --add-missing 
 autoconf
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..d90691e
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,71 @@
+dnl yazproxy, Index Data 1994-2006
+dnl See the file LICENSE for details.
+dnl $Id: configure.ac,v 1.1 2006-03-28 20:00:15 adam Exp $
+AC_PREREQ(2.59)
+AC_INIT([yazproxy],[1.1.0],[adam@indexdata.dk])
+AC_CONFIG_SRCDIR(configure.ac)
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([1.8])
+
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_CXX
+AC_HEADER_STDC
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
+
+YAZPP_INIT(threads,1.0)
+if test -z "$YAZPPLIB"; then
+	AC_MSG_ERROR([YAZ++ development libraries missing])
+fi
+YAZ_DOC
+USEMARCON_INIT
+
+AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday)
+AC_CHECK_HEADERS(pwd.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h unistd.h)
+AC_CHECK_LIB(dl,dlopen)
+dnl
+dnl ----- libXSLT
+AC_SUBST(XSLT_LIBS)
+AC_SUBST(XSLT_CFLAGS)
+xsltdir=default
+AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libxslt in PREFIX]],xsltdir=$withval)
+if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
+	for d in /usr /usr/local; do
+		if test -x $d/bin/xslt-config; then
+			xsltdir=$d
+		fi
+	done
+fi
+if test "$xsltdir" != "no"; then
+	AC_MSG_CHECKING(for libXSLT)
+	if test -x $xsltdir/bin/xslt-config; then
+		XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
+		XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
+		XSLT_VER=`$xsltdir/bin/xslt-config --version`
+		AC_MSG_RESULT($XSLT_VER)
+		AC_DEFINE(HAVE_XSLT)
+	else
+		AC_MSG_RESULT(Not found)
+                if test "$xsltdir" = "default"; then
+                        AC_MSG_WARN([Libxslt development libraries not found.])
+                else
+                        AC_MSG_ERROR([libxslt development libraries not found.])                fi
+	fi
+fi
+
+AC_SUBST(YAZPROXY_SRC_ROOT)
+AC_SUBST(YAZPROXY_BUILD_ROOT)
+YAZPROXY_SRC_ROOT=`cd ${srcdir}; pwd`
+YAZPROXY_BUILD_ROOT=`pwd`
+AC_OUTPUT([
+	Makefile
+	src/Makefile
+	include/Makefile
+	include/yazproxy/Makefile
+	doc/Makefile
+	doc/yazproxy.xml
+	doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl
+        doc/tkl.xsl
+	etc/Makefile
+])
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 4336dad..0000000
--- a/configure.in
+++ /dev/null
@@ -1,65 +0,0 @@
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(yazproxy,1.1.0)
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-AC_HEADER_STDC
-AM_DISABLE_SHARED
-AM_PROG_LIBTOOL
-
-YAZPP_INIT(threads,1.0)
-if test -z "$YAZPPLIB"; then
-	AC_MSG_ERROR([YAZ++ development libraries missing])
-fi
-YAZ_DOC
-USEMARCON_INIT
-
-AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday)
-AC_CHECK_HEADERS(pwd.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h unistd.h)
-AC_CHECK_LIB(dl,dlopen)
-dnl
-dnl ----- libXSLT
-AC_SUBST(XSLT_LIBS)
-AC_SUBST(XSLT_CFLAGS)
-xsltdir=default
-AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libxslt in PREFIX]],xsltdir=$withval)
-if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
-	for d in /usr /usr/local; do
-		if test -x $d/bin/xslt-config; then
-			xsltdir=$d
-		fi
-	done
-fi
-if test "$xsltdir" != "no"; then
-	AC_MSG_CHECKING(for libXSLT)
-	if test -x $xsltdir/bin/xslt-config; then
-		XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
-		XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
-		XSLT_VER=`$xsltdir/bin/xslt-config --version`
-		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE(HAVE_XSLT)
-	else
-		AC_MSG_RESULT(Not found)
-                if test "$xsltdir" = "default"; then
-                        AC_MSG_WARN([Libxslt development libraries not found.])
-                else
-                        AC_MSG_ERROR([libxslt development libraries not found.])                fi
-	fi
-fi
-
-AC_SUBST(YAZPROXY_SRC_ROOT)
-AC_SUBST(YAZPROXY_BUILD_ROOT)
-YAZPROXY_SRC_ROOT=`cd ${srcdir}; pwd`
-YAZPROXY_BUILD_ROOT=`pwd`
-AC_OUTPUT([
-	Makefile
-	src/Makefile
-	include/Makefile
-	include/yazproxy/Makefile
-	doc/Makefile
-	doc/yazproxy.xml
-	doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl
-        doc/tkl.xsl
-	etc/Makefile
-])
-- 
1.7.10.4