X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=08cf459e57a0069e69b3a4320d3bb89cf6f5b4a6;hb=80a824573ac8ed4e8c6f24dbcecd2a49c8b4ffaa;hp=49f0715731b8d9bd2d5c074782236a8b028e1b98;hpb=fd4ca2e7b291dbebe1b7d7348323f311579cd555;p=pazpar2-moved-to-github.git diff --git a/configure.ac b/configure.ac index 49f0715..08cf459 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # Autoconf and automake setup AC_PREREQ(2.60) -AC_INIT([pazpar2],[1.1.1],[pazpar2-help@indexdata.dk]) +AC_INIT([pazpar2],[1.5.0],[pazpar2-help@indexdata.dk]) AC_CONFIG_HEADERS(src/config.h) @@ -19,13 +19,26 @@ AC_PROG_RANLIB AC_LANG(C) -YAZ_INIT([static icu threads],[3.0.39]) +AC_C_INLINE + +YAZ_INIT([static icu],[4.1.0]) 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 glob.h]) +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 @@ -38,6 +51,7 @@ AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1]) AC_CONFIG_FILES([ Doxyfile Makefile + pazpar2.spec src/Makefile test/Makefile js/Makefile