X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=68178198c878cfbb288588f8c2d4c3a71362e11c;hb=fb043ebfdefc3b4f7433f0ba2c7af47e145bfcc2;hp=0eb16214634cb24d1f59b7fddb7b335508727c4f;hpb=1d860e67a3a0d258f565f16448e49c8d0d702f27;p=pazpar2-moved-to-github.git diff --git a/configure.ac b/configure.ac index 0eb1621..6817819 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # Autoconf and automake setup AC_PREREQ(2.60) -AC_INIT([pazpar2],[1.1.0],[pazpar2-help@indexdata.dk]) +AC_INIT([pazpar2],[1.3.0],[pazpar2-help@indexdata.dk]) AC_CONFIG_HEADERS(src/config.h) @@ -19,14 +19,35 @@ AC_PROG_RANLIB AC_LANG(C) -YAZ_INIT([static icu threads],[3.0.39]) +AC_C_INLINE + +YAZ_INIT([static icu threads],[4.0.1]) if test -z "$YAZLIB"; then AC_MSG_ERROR([YAZ development libraries missing]) fi YAZ_DOC AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h]) +checkBoth=0 +AC_CHECK_FUNC([connect]) +if test "$ac_cv_func_connect" = "no"; then + AC_CHECK_LIB([socket],[main], LIBS="$LIBS -lsocket", checkBoth=1) +fi +if test "$checkBoth" = "1"; then + oldLibs=$LIBS + LIBS="$LIBS -lsocket -lnsl" + AC_CHECK_FUNC([accept], , [LIBS=$oldLibs]) +fi +AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])]) AC_CHECK_FUNCS([getaddrinfo]) + +if test -d ${srcdir}/.git; then + sha=`git show --pretty=format:%H|head -1` +else + sha=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'` +fi +AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1]) + AC_CONFIG_FILES([ Doxyfile Makefile