X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=1be1a8bc244f0de4b5252bef427eaa232a43bd4f;hp=a14306095635b20b1b90a48076af803f55ade335;hb=e83e1a41848ba1e54e2ba23e58f84ce91ed05927;hpb=4c36250e9572cf234b1d43212c64fc438cabf2db diff --git a/configure.ac b/configure.ac index a143060..1be1a8b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,14 @@ dnl This file is part of the YAZ toolkit. -dnl Copyright (C) 1995-2010 Index Data +dnl Copyright (C) Index Data +dnl See the file LICENSE for details. AC_PREREQ([2.60]) -AC_INIT([yaz],[4.1.0],[yaz-help@indexdata.dk]) +AC_INIT([yaz], +m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), +[yaz-help@indexdata.dk]) +AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) -AM_INIT_AUTOMAKE([1.9]) +AM_INIT_AUTOMAKE([subdir-objects]) dnl AC_SUBST([READLINE_LIBS]) AC_SUBST([YAZ_CONF_CFLAGS]) @@ -19,7 +23,7 @@ AM_PROG_LIBTOOL AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE]) dnl YAZ_DOC -dnl +dnl dnl AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h sys/prctl.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[]) AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[ @@ -112,7 +116,7 @@ if test "$openssl" != "no"; then fi AC_MSG_CHECKING([for SSL]) if test "$sslver" != "no"; then - SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS" + AC_DEFINE([HAVE_OPENSSL_SSL_H],[1],[Define to 1 if OpenSSL is present]) AC_MSG_RESULT([$sslver]) else SSL_CFLAGS="" @@ -146,7 +150,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then fi AC_MSG_CHECKING([for GNU TLS]) if test "$gnutlsver" != "no"; then - SSL_CFLAGS="-DHAVE_GNUTLS_H=1 $SSL_CFLAGS" + AC_DEFINE([HAVE_GNUTLS_H],[1],[Define to 1 if GNUTLS is present]) AC_MSG_RESULT([$gnutlsver]) else SSL_CFLAGS="" @@ -174,13 +178,13 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then #include ],[ rl_attempted_completion_over = 0; - ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER])) + ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER],1,[Define to 1 if rl_attempted_completion_over is defined])) AC_TRY_LINK([ #include #include ],[ rl_completion_matches (0, 0); - ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES])]) + ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES],1,[Define to 1 if rl_completion_matches is defined])]) LIBS=$xLIBS fi dnl ------ iconv @@ -198,7 +202,7 @@ if test "$with_iconv" != "no"; then ],[ iconv_t t = iconv_open("", ""); ],[ - AC_DEFINE([HAVE_ICONV_H]) + AC_DEFINE([HAVE_ICONV_H],1,[Define to 1 if iconv.h is present]) AC_MSG_RESULT([yes]) ],[ LIBS="$LIBS -liconv" @@ -207,7 +211,7 @@ if test "$with_iconv" != "no"; then ],[ iconv_t t = iconv_open("", ""); ],[ - AC_DEFINE([HAVE_ICONV_H]) + AC_DEFINE([HAVE_ICONV_H],1) AC_MSG_RESULT([yes]) ],[ LIBS="$oldLIBS" @@ -278,8 +282,7 @@ extern int accept(int, struct sockaddr *, size_t t *); ]) ]) AC_MSG_RESULT([$ac_cv_check_socklen_t]) -AC_DEFINE_UNQUOTED([YAZ_SOCKLEN_T],[$ac_cv_check_socklen_t]) -AC_DEFINE([YAZ_USE_NEW_LOG]) +AC_DEFINE_UNQUOTED([YAZ_SOCKLEN_T],[$ac_cv_check_socklen_t],[socklen_t type]) dnl dnl ------ tcpd AC_ARG_ENABLE([tcpd],[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available]) @@ -307,7 +310,7 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then else TCPD_LIBS="-lwrap" AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TCPD_H]) + AC_DEFINE([HAVE_TCPD_H],1,[Define to 1 if tcp wrap library is present]) fi fi AC_SUBST([TCPD_LIBS]) @@ -321,8 +324,8 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then ACX_PTHREAD([ OCFLAGS=$CFLAGS CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - dnl unfortunately empty thread lib spec is problematic because - dnl 'yaz-config --cflags' is not always passed to linker in + dnl unfortunately empty thread lib spec is problematic because + dnl 'yaz-config --cflags' is not always passed to linker in dnl applications using YAZ (such as Zebra). if test "x$PTHREAD_LIBS" = "x"; then OLIBS=$LIBS @@ -336,7 +339,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then LIBS=$OLIBS fi LIBS="$LIBS $PTHREAD_LIBS" - CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1" + AC_DEFINE(YAZ_POSIX_THREADS,1,[Define to 1 if POSIX threads is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1" ]) fi @@ -346,21 +349,21 @@ AC_SUBST([XML2_CFLAGS]) xml_enabled=false YAZ_LIBXML2([ - AC_DEFINE(YAZ_HAVE_XML2) + AC_DEFINE(YAZ_HAVE_XML2,1,[Define to 1 if Libxml2 is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1" xml_enabled=true ]) if test "$xml_enabled" = "true"; then YAZ_LIBXSLT([ - AC_DEFINE(YAZ_HAVE_XSLT) + AC_DEFINE(YAZ_HAVE_XSLT,1,[Define to 1 if Libxslt is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1" ]) YAZ_LIBEXSLT([ - AC_DEFINE(YAZ_HAVE_EXSLT) + AC_DEFINE(YAZ_HAVE_EXSLT,1,[Define to 1 if EXSLT is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1" ]) - + fi YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS" @@ -369,7 +372,7 @@ if test "$XML2_LIBS"; then fi dnl -dnl +dnl AC_CHECK_ICU([3.4],[ if test "$xml_enabled" = "true"; then ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1" @@ -378,15 +381,6 @@ AC_CHECK_ICU([3.4],[ AC_MSG_WARN([ICU support disabled because XML support is unavailable]) fi ]) -dnl -dnl ------ Memory debugging -AC_ARG_ENABLE([memdebug],[ --enable-memdebug enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none]) -if test "$enable_memdebug" = "yes"; then - AC_DEFINE([TRACE_XMALLOC],[2]) -elif test "$enable_memdebug" = "no"; then - AC_DEFINE([TRACE_XMALLOC],[0]) -fi -dnl dnl ------ versioning dnl WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'` @@ -404,7 +398,6 @@ dnl ------ Makefiles dnl AC_OUTPUT([ Makefile -yaz.spec src/Makefile test/Makefile util/Makefile @@ -414,7 +407,7 @@ client/Makefile ztest/Makefile zoom/Makefile doc/Makefile -doc/local.ent +doc/local0.ent doc/common/Makefile doc/common/print.dsl etc/Makefile @@ -425,6 +418,8 @@ win/version.nsi include/yaz/yaz-version.h ],[ sed s%echo_source=yes%echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config + diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \ + || cp doc/local0.ent doc/local.ent ] )