X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=c25249f5fedca8f5f75ef99f75fe11436833ea44;hp=521d05f696130d0bf384fff6e16e246ccd9741bc;hb=2ee1aecfd1ccbf2cd68bf4e4f4e69b30cb0bfd2d;hpb=13a673b4f079ff0ba43b76cd07c1e34c3c932a2a diff --git a/configure.ac b/configure.ac index 521d05f..c25249f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl This file is part of the YAZ toolkit. -dnl Copyright (C) 1995-2008 Index Data +dnl Copyright (C) 1995-2010 Index Data AC_PREREQ([2.60]) -AC_INIT([yaz],[3.0.41],[yaz-help@indexdata.dk]) +AC_INIT([yaz],[4.0.3],[yaz-help@indexdata.dk]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.9]) @@ -333,8 +333,9 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then done LIBS=$OLIBS fi - CFLAGS=$OCFLAGS - PTHREAD_CFLAGS="$PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1" + LIBS="$LIBS $PTHREAD_LIBS" + CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1" + YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1" ]) fi @@ -367,7 +368,7 @@ fi dnl dnl -AC_CHECK_ICU([3.6],[ +AC_CHECK_ICU([3.4],[ if test "$xml_enabled" = "true"; then ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1" else @@ -394,8 +395,8 @@ 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);}'` AC_SUBST([WIN_FILEVERSION]) -YAZ_VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'` -AC_SUBST([YAZ_VERSION_HEX]) +VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'` +AC_SUBST([VERSION_HEX]) if test -d ${srcdir}/.git; then VERSION_SHA1=`git show --pretty=format:%H|head -1` else