X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=ed7d32690dc85fc82e02391246f0d976499686da;hb=d3d22455030e61bf74a2da3e93226c5d92ba2d36;hp=b611303df9efabd1a1c08a83d2cd2858e81dcb56;hpb=74420da6f0c5cffc13ac62d7d845fade996e7c0f;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index b611303..ed7d326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,18 +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.1, marc@indexdata.dk)
-AM_CONFIG_HEADER(src/config.hpp)
+AC_PREREQ(2.59)
+AC_INIT([metaproxy],[1.0.6], [adam@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
-
+AM_INIT_AUTOMAKE([1.8])
 
 # Checks for programs.
 AC_PROG_CXX
@@ -27,19 +26,41 @@ AM_PROG_LIBTOOL
 # Use C++ compilers only for tests
 AC_LANG(C++)
 
+if test "$enable_shared" = "yes"; then
+   	AC_DEFINE([HAVE_DL_SUPPORT],[1],
+                [Define to 1 if you have shared module support])
+fi
+
 # Checks for libraries.
-##AC_CHECK_LIB(ibrary, main)
+AC_CHECK_LIB(dl,dlopen)
+
 AC_CHECK_LIB(boost_thread, main, [],[
-	AC_MSG_ERROR([boost thread library not found. Install libboost-thread-dev (or similar)])
+	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)])
+])
+
+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_MSG_CHECKING([for boost_unit_test_framework presence])
+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_TEST_CASE( test )
+BOOST_AUTO_UNIT_TEST( test )
 {
  BOOST_CHECK(true);
 }
@@ -50,53 +71,26 @@ BOOST_AUTO_TEST_CASE( test )
 ],
 [
 	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([Install libboost-test-dev (or similar)])
+	AC_MSG_NOTICE([Boost unit test framework does not appear to work])
+	AC_MSG_ERROR([Consult config.log for details])
 ])
 
 ## YAZPP checks
-YAZPP_INIT(threads,1.0)
+YAZPP_INIT(threads,1.0.1)
 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)
-                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
-
+YAZ_DOC
 
 # Checks for header files.
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(iostream list vector stdexcept)
-AC_CHECK_HEADERS(boost/thread/mutex.hpp boost/test/auto_unit_test.hpp)
+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 
@@ -110,6 +104,12 @@ AC_CONFIG_FILES([
         Doxyfile
 	Makefile
 	src/Makefile
+	src/Jamfile
+	doc/Makefile
+	doc/local.ent
+        doc/common/Makefile
+	doc/common/print.dsl
+	etc/Makefile
 ])
 
 AC_OUTPUT
@@ -117,11 +117,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}
@@ -130,5 +133,12 @@ Configuration:
   Host System Type:           ${host}
   Install path:               ${prefix}
   Automake:                   ${AUTOMAKE}
+  Archiver:                   ${AR}
+  Ranlib:                     ${RANLIB}
+  YAZPP Version:              ${YAZPPVERSION}
+  YAZPP Include:              ${YAZPPINC}
+  YAZPP La Lib:               ${YAZPPLALIB}
+  YAZPP Lib:                  ${YAZPPLIB}
+  Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"