X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=bba803dbd795f4ff4501475db947a59085dd51b4;hb=efe16756b891974b3cd72e8de8ed5bdbdb5ba980;hp=9d5223d9615d63950a2b1b5eebdecbc2da1f8cee;hpb=872baf038ffe10f670ba45082c6911201e2ac4cb;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 9d5223d..bba803d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,17 +2,17 @@
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
-AC_PREREQ(2.57)
-AC_INIT(yp2, 0.0.3, adam@indexdata.dk)
+AC_PREREQ(2.59)
+AC_INIT([metaproxy],[1.0.9],[metaproxy-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.hpp)
 
-AC_CONFIG_SRCDIR(configure.ac) 
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_SRCDIR([configure.ac]) 
+AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_SYSTEM
 ##AC_PREFIX_DEFAULT(`pwd`/install) 
 
-AM_INIT_AUTOMAKE(1.8)
+AM_INIT_AUTOMAKE([1.8])
 
 # Checks for programs.
 AC_PROG_CXX
@@ -34,96 +34,39 @@ fi
 # Checks for libraries.
 AC_CHECK_LIB(dl,dlopen)
 
-AC_CHECK_LIB(boost_thread, main, [],[
-	AC_MSG_NOTICE([boost thread library not found.])
-	AC_MSG_ERROR([Install libboost-thread-dev (or similar)])
-])
 
-AC_CHECK_LIB(boost_date_time, main, [],[
-	AC_MSG_NOTICE([boost date_time library not found.])
-	AC_MSG_ERROR([Install libboost-date-time-dev (or similar)])
-])
+# check for Boost C++ development libs and headers
 
-AC_CHECK_LIB(boost_program_options, main, [],[
-	AC_MSG_NOTICE([boost program options library not found.])
-	AC_MSG_ERROR([Install libboost-program-options-dev (or similar)])
-])
-
-AC_CHECK_LIB(boost_regex, main, [],[
-	AC_MSG_NOTICE([boost regex library not found.])
-	AC_MSG_ERROR([Install libboost-regex-dev (or similar)])
-])
-
-AC_CHECK_HEADER(boost/test/auto_unit_test.hpp,,[
-	AC_MSG_NOTICE([boost test unit header not found.])
-	AC_MSG_ERROR([Install libboost-test-dev (or similar)])
-])
-
-AC_MSG_CHECKING([whether boost_unit_test_framework works])
-OLIBS=$LIBS
-LIBS="$LIBS -lboost_unit_test_framework"
-AC_TRY_LINK([
-#define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp> 
-BOOST_AUTO_UNIT_TEST( test )
-{
- BOOST_CHECK(true);
-}
-],[],
-[
-	AC_MSG_RESULT([yes])
-	LIBS=$OLIBS
-],
-[
-	AC_MSG_RESULT([no])
-	AC_MSG_NOTICE([Boost unit test framework does not appear to work])
-	AC_MSG_ERROR([Consult config.log for details])
-])
+AX_BOOST([1.32])
+if test "$ax_cv_boost_base" = "no"; then
+   AC_MSG_ERROR([install libboost-dev or similar])
+fi
+if test "$ax_cv_boost_date_time" = "no"; then
+   AC_MSG_ERROR([install libboost-date-time-dev or similar])
+fi
+if test "$ax_cv_boost_program_options" = "no"; then
+   AC_MSG_ERROR([install libboost-program-options-dev or similar])
+fi
+if test "$ax_cv_boost_thread" = "no"; then
+   AC_MSG_ERROR([install libboost-thread-dev or similar])
+fi
+if test "$ax_cv_boost_unit_test_framework" = "no"; then
+   AC_MSG_ERROR([install libboost-test-dev or similar])
+fi
+    
 
 ## YAZPP checks
-YAZPP_INIT(threads,1.0)
+YAZPP_INIT(threads,1.0.2)
 if test -z "$YAZPPLIB"; then
 	AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
-##YAZ_DOC
-
-## libxslt checks
-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],[1],
-                [Define to 1 if you have libxslt installed])
-	else
-		AC_MSG_RESULT(Not found)
-		AC_MSG_ERROR([libxslt required.])
-	fi
-fi
-
+YAZ_DOC
 
 # Checks for header files.
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
 AC_CHECK_HEADERS(sys/select.h sys/socket.h iostream list vector stdexcept)
-AC_CHECK_HEADERS(boost/thread/mutex.hpp \ 
-                 boost/date_time/posix_time/posix_time.hpp \
-                 boost/regex.hpp \
-                 boost/test/auto_unit_test.hpp)
 
 # Checks for typedefs, structures, and compiler characteristics.
 ##AC_TYPE_SIZE_T 
@@ -138,6 +81,14 @@ AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
 	src/Jamfile
+	xml/Makefile
+	xml/schema/Makefile
+	xml/xslt/Makefile
+	doc/Makefile
+	doc/local.ent
+        doc/common/Makefile
+	doc/common/print.dsl
+	etc/Makefile
 ])
 
 AC_OUTPUT
@@ -145,11 +96,14 @@ AC_OUTPUT
 
 # postamble
 
+
 echo \
 "------------------------------------------------------------------------
-Configuration:
 
+  Package:                    ${PACKAGE}
+  Version:                    ${VERSION}
   Source code location:       ${srcdir}
+  CPP Preprocessor:           ${CPP}
   CPP Preprocessor flags:     ${CPPFLAGS}
   CXX Compiler:               ${CXX}
   CXX Compiler flags:         ${CXXFLAGS}
@@ -158,5 +112,16 @@ Configuration:
   Host System Type:           ${host}
   Install path:               ${prefix}
   Automake:                   ${AUTOMAKE}
+  Archiver:                   ${AR}
+  Ranlib:                     ${RANLIB}
+  Boost Version:              ${BOOST_VERSION}               
+  Boost Include:              ${BOOST_CPPFLAGS}               
+  Boost linker flags:         ${BOOST_LDFLAGS}               
+  Boost Libs:                 ${BOOST_DATE_TIME_LIB} ${BOOST_PROGRAM_OPTIONS_LIB} ${BOOST_THREAD_LIB}               
+  YAZPP Version:              ${YAZPPVERSION}
+  YAZPP Include:              ${YAZPPINC}
+  YAZPP La Lib:               ${YAZPPLALIB}
+  YAZPP Lib:                  ${YAZPPLIB}
+  Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"