X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=163dbb9cb34c4322122d727cfdd22fe51803c609;hb=d908bd814ae464d896adf1b280b897bfaac290bb;hp=ed7d32690dc85fc82e02391246f0d976499686da;hpb=87eaa7d54db2a9d85964888682d6a2d3376a42c8;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index ed7d326..163dbb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,19 +2,17 @@
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
-AC_PREREQ(2.59)
-AC_INIT([metaproxy],[1.0.6], [adam@indexdata.dk])
+AC_PREREQ([2.60])
+AC_INIT([metaproxy],[1.3.0],[metaproxy-help@indexdata.dk])
 
-AC_CONFIG_HEADERS(src/config.hpp)
+AC_CONFIG_HEADERS([src/config.hpp])
 
 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.9])
 
-# Checks for programs.
 AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
@@ -23,93 +21,79 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
-# Use C++ compilers only for tests
-AC_LANG(C++)
+# Default language to use for tests (some tests may switch to C++)
+AC_LANG([C])
 
 if test "$enable_shared" = "yes"; then
-   	AC_DEFINE([HAVE_DL_SUPPORT],[1],
-                [Define to 1 if you have shared module support])
+    AC_DEFINE([HAVE_DL_SUPPORT],[1],
+	[Define to 1 if you have shared module support])
 fi
 
 # Checks for libraries.
-AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB([dl],[dlopen])
+AC_CHECK_LIB([m],[main])
 
-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)])
-])
-
-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_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])
-])
+AC_CHECK_FUNCS([localtime_r])
 
 ## YAZPP checks
-YAZPP_INIT(threads,1.0.1)
+YAZPP_INIT([threads],[1.2.6])
 if test -z "$YAZPPLIB"; then
-	AC_MSG_ERROR([YAZ++ development libraries missing])
+    AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
 YAZ_DOC
+CPPFLAGS="$YAZPPINC $CPPFLAGS"
 
-# 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)
+ID_BOOST([thread test regex],[1.33])
+if test -z "${BOOST_THREAD_LIB}"; then
+    AC_MSG_ERROR([Boost thread development libraries required])
+fi
+if test -z "${BOOST_TEST_LIB}"; then
+    AC_MSG_ERROR([Boost unit test framework libraries required])
+fi
+if test -z "${BOOST_REGEX_LIB}"; then
+    AC_MSG_ERROR([Boost regex development libraries required])
+fi
 
-# Checks for typedefs, structures, and compiler characteristics.
-##AC_TYPE_SIZE_T 
-##AC_CHECK_SIZEOF(int)
-##AC_CHECK_SIZEOF(long int)
+xml_avail=false
+xslt_avail=false
+YAZ_LIBXML2([xml_avail=true])
+if $xml_avail; then
+    YAZ_LIBXSLT([xslt_avail=true])
+else
+    AC_MSG_ERROR([Libxml2 development files not found])
+fi
+if $xslt_avail; then
+    :
+else
+    AC_MSG_ERROR([Libxslt development files not found])
+fi
 
+AC_CHECK_HEADERS([sys/select.h sys/socket.h])
 
-# Checks for library functions.
+if test -d ${srcdir}/.git; then
+    SHA1=`git show --pretty=format:%H|head -1`
+else
+    SHA1=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'`
+fi
+AC_DEFINE_UNQUOTED([VERSION_SHA1], "$SHA1", [SHA-1 from Git])
 
 AC_CONFIG_FILES([
+	metaproxy-config
         Doxyfile
 	Makefile
+	include/Makefile include/metaproxy/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
+],[
+        sed s%echo_source=yes%echo_source=no%g < metaproxy-config > src/metaproxy-config && chmod +x metaproxy-config src/metaproxy-config
+
 ])
 
 AC_OUTPUT
@@ -135,6 +119,10 @@ echo \
   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_THREAD_LIB}               
   YAZPP Version:              ${YAZPPVERSION}
   YAZPP Include:              ${YAZPPINC}
   YAZPP La Lib:               ${YAZPPLALIB}
@@ -142,3 +130,8 @@ echo \
   Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"
+dnl Local Variables:
+dnl mode:shell-script
+dnl sh-indentation: 2
+dnl sh-basic-offset: 4
+dnl End: