X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=24c0745538f8d482d02212c49ab1109efa90db9f;hb=dd6954fd5ae7c0bd90df8869f2351a72ee363440;hp=712fb1a64aa3526620a91d11ea8d46453e755af7;hpb=f5f8aad928682d3e8239000fe9e8377b9166308e;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 712fb1a..24c0745 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.9],[metaproxy-help@indexdata.dk])
+AC_PREREQ([2.60])
+AC_INIT([metaproxy],[1.2.1],[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,73 +21,51 @@ 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])
 
-
-# check for Boost C++ development libs and headers
-AX_BOOST_BASE(1.32)
-AX_BOOST_DATE_TIME(1.32)
-AX_BOOST_PROGRAM_OPTIONS(1.32)
-AX_BOOST_THREAD(1.32)
-AX_BOOST_UNIT_TEST_FRAMEWORK(1.32)
-
-LD_FLAGS="$LD_FLAGS $BOOST_LDFLAGS" 
-#AM_LDLFAGS="$AM_LDLFAGS\
-LIBS="$LIBS\
-$BOOST_DATE_TIME_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB"; 
-
-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
-    
+AC_CHECK_FUNCS([localtime_r])
 
 ## YAZPP checks
-YAZPP_INIT(threads,1.0.2)
+YAZPP_INIT([threads],[1.2.3])
 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)
-
-# Checks for typedefs, structures, and compiler characteristics.
-##AC_TYPE_SIZE_T 
-##AC_CHECK_SIZEOF(int)
-##AC_CHECK_SIZEOF(long int)
+ID_BOOST([thread test],[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
 
+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
@@ -98,6 +74,9 @@ AC_CONFIG_FILES([
         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
@@ -123,6 +102,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}
@@ -130,3 +113,8 @@ echo \
   Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"
+dnl Local Variables:
+dnl mode:shell-script
+dnl sh-indentation: 2
+dnl sh-basic-offset: 4
+dnl End: