X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=90b32fbbab735ede9dccdb78a6bf5503d8354b7c;hb=d62dd318f3e93cf20e63388f8d3903f896bead2a;hp=b5a28c9d3cb7fb52c7cd34b64503dac884414276;hpb=913a80bace5d431131cfee20aa7e8e4c1f1136f7;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index b5a28c9..90b32fb 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.60)
-AC_INIT([metaproxy],[1.0.13],[metaproxy-help@indexdata.dk])
+AC_PREREQ([2.60])
+AC_INIT([metaproxy],[1.2.4],[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.9])
 
-# Checks for programs.
 AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
@@ -24,7 +22,7 @@ AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
 # Default language to use for tests (some tests may switch to C++)
-AC_LANG(C)
+AC_LANG([C])
 
 if test "$enable_shared" = "yes"; then
     AC_DEFINE([HAVE_DL_SUPPORT],[1],
@@ -32,52 +30,42 @@ if test "$enable_shared" = "yes"; then
 fi
 
 # Checks for libraries.
-AC_CHECK_LIB(dl,dlopen)
-AC_CHECK_LIB(m,main)
+AC_CHECK_LIB([dl],[dlopen])
+AC_CHECK_LIB([m],[main])
 
 AC_CHECK_FUNCS([localtime_r])
 
 ## YAZPP checks
-YAZPP_INIT([threads],[1.1.0])
+YAZPP_INIT([threads],[1.2.3])
 if test -z "$YAZPPLIB"; then
     AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
 YAZ_DOC
 CPPFLAGS="$YAZPPINC $CPPFLAGS"
 
-# check for Boost C++ development libs and headers
-
-AX_BOOST([1.33])
-if test "$ax_cv_boost_base" = "no"; then
-    AC_MSG_ERROR([install libboost-dev or similar])
-fi
-if test "$ax_cv_boost_thread" = "no"; then
-    AC_MSG_ERROR([install libboost-thread-dev or similar])
+ID_BOOST([thread test],[1.33])
+if test -z "${BOOST_THREAD_LIB}"; then
+    AC_MSG_ERROR([Boost thread development libraries required])
 fi
-if test "$ax_cv_boost_unit_test_framework" = "no"; then
-    AC_MSG_ERROR([install libboost-test-dev or similar])
+if test -z "${BOOST_TEST_LIB}"; then
+    AC_MSG_ERROR([Boost unit test framework libraries required])
 fi
-    
-
 
-# Checks for header files.
-##AC_HEADER_STDC
-##AC_HEADER_SYS_WAIT
-##AC_HEADER_TIME 
-AC_CHECK_HEADERS(sys/select.h sys/socket.h)
+AC_CHECK_HEADERS([sys/select.h sys/socket.h])
 
-# Checks for typedefs, structures, and compiler characteristics.
-##AC_TYPE_SIZE_T 
-##AC_CHECK_SIZEOF(int)
-##AC_CHECK_SIZEOF(long int)
-
-# 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
@@ -86,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