projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use AC_CHECK_TYPES for 'long long' rather then AC_CHECK_SIZEOF. AC_CHECK_SIZEOF
[idzebra-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
9f10d9f
..
01f7347
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,8
+1,8
@@
-dnl Zebra, Index Data ApS, 1995-2006
-dnl $Id: configure.ac,v 1.40 2006-11-27 14:27:12 adam Exp $
+dnl Zebra, Index Data ApS, 1995-2007
+dnl $Id: configure.ac,v 1.61 2007-08-28 17:57:46 adam Exp $
dnl
AC_PREREQ(2.59)
dnl
AC_PREREQ(2.59)
-AC_INIT([idzebra],[2.0.5],[zebra-help@indexdata.dk])
+AC_INIT([idzebra],[2.0.15],[zebra-help@indexdata.dk])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([1.8])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([1.8])
@@
-23,25
+23,18
@@
dnl ------ Checking programs
AC_PROG_CC
AC_PROG_CPP
AM_PROG_LIBTOOL
AC_PROG_CC
AC_PROG_CPP
AM_PROG_LIBTOOL
+AC_DEFINE_UNQUOTED(HOST_TRIPLET,"${host}")
dnl
dnl ------ headers
dnl
dnl ------ headers
-AC_CHECK_HEADERS(sys/resource.h sys/times.h sys/time.h sys/wait.h sys/utsname.h unistd.h)
+AC_CHECK_HEADERS([sys/resource.h sys/time.h sys/wait.h sys/utsname.h unistd.h])
dnl ------ crypt
dnl ------ crypt
-AC_CHECK_LIB(crypt, crypt)
+AC_CHECK_LIB([crypt],[crypt])
if test "$ac_cv_lib_crypt_crypt" = "yes"; then
AC_CHECK_HEADERS(crypt.h)
fi
dnl
if test "$ac_cv_lib_crypt_crypt" = "yes"; then
AC_CHECK_HEADERS(crypt.h)
fi
dnl
-dnl ------ threads
-AC_ARG_ENABLE(threads, [ --disable-threads disable threads],[enable_threads=$enableval],[enable_threads=yes])
-if test "$enable_threads" = "yes"; then
- yazflag=threads
-else
- yazflag=""
-fi
-dnl
dnl ------ YAZ
dnl ------ YAZ
-YAZ_INIT($yazflag,2.1.40)
+YAZ_INIT([server],[3.0.3])
if test "$YAZVERSION" = "NONE"; then
AC_MSG_ERROR([YAZ development libraries required])
fi
if test "$YAZVERSION" = "NONE"; then
AC_MSG_ERROR([YAZ development libraries required])
fi
@@
-107,7
+100,7
@@
else
fi
dnl
dnl ------ various functions
fi
dnl
dnl ------ various functions
-AC_CHECK_FUNCS(mkstemp)
+AC_CHECK_FUNCS(mkstemp atoll)
dnl
dnl ------ GNU Readline
READLINE_SHARED_LIBADD=""
dnl
dnl ------ GNU Readline
READLINE_SHARED_LIBADD=""
@@
-246,10
+239,14
@@
if test "$bits" = "64"; then
else
AC_MSG_RESULT(no)
fi
else
AC_MSG_RESULT(no)
fi
-AC_CHECK_SIZEOF([off_t])
-AC_CHECK_SIZEOF([long long])
-ZEBRA_CFLAGS="-DZEBRA_ZINT=${ac_cv_sizeof_long_long}"
-AC_DEFINE_UNQUOTED(ZEBRA_ZINT,${ac_cv_sizeof_long_long})
+AC_CHECK_TYPES([long long])
+if test "${ac_cv_type_long_long}" = "yes"; then
+ ZINT_VALUE=1
+else
+ ZINT_VALUE=0
+fi
+ZEBRA_CFLAGS="-DZEBRA_ZINT=${ZINT_VALUE}"
+AC_DEFINE_UNQUOTED(ZEBRA_ZINT,${ZINT_VALUE})
dnl ------ Modules
AC_SUBST(SHARED_MODULE_LA)
SHARED_MODULE_LA=""
dnl ------ Modules
AC_SUBST(SHARED_MODULE_LA)
SHARED_MODULE_LA=""
@@
-293,7
+290,6
@@
AC_DEFINE(IDZEBRA_STATIC_GRS_SGML)
ZEBRA_MODULE(text,shared, [ --enable-mod-text Text filter])
ZEBRA_MODULE(grs-regx,shared,[ --enable-mod-grs-regx REGX/TCL filter])
ZEBRA_MODULE(grs-marc,shared,[ --enable-mod-grs-marc MARC filter])
ZEBRA_MODULE(text,shared, [ --enable-mod-text Text filter])
ZEBRA_MODULE(grs-regx,shared,[ --enable-mod-grs-regx REGX/TCL filter])
ZEBRA_MODULE(grs-marc,shared,[ --enable-mod-grs-marc MARC filter])
-ZEBRA_MODULE(safari,shared, [ --enable-mod-safari Safari filter (DBC)])
if test "$ac_cv_header_expat_h" = "yes"; then
def="shared"
else
if test "$ac_cv_header_expat_h" = "yes"; then
def="shared"
else
@@
-322,8
+318,10
@@
AC_PREPROC_IFELSE(
[def="shared"],
[def="disabled"])
CPPFLAGS=$oldCPPFLAGS
[def="shared"],
[def="disabled"])
CPPFLAGS=$oldCPPFLAGS
+ZEBRA_MODULE(dom,[$def], [ --enable-mod-dom XML/XSLT filter (Requires libxslt)])
+ZEBRA_MODULE(alvis,[$def], [ --enable-mod-alvis ALVIS filter (Requires libxslt)])
+ZEBRA_MODULE(safari,shared,[ --enable-mod-safari Safari filter (DBC)])
-ZEBRA_MODULE(alvis,[$def], [ --enable-mod-alvis ALVIS filter (Requires libxslt)])
dnl ------ ANSI C Header files
AC_STDC_HEADERS
if test "$ac_cv_header_stdc" = "no"; then
dnl ------ ANSI C Header files
AC_STDC_HEADERS
if test "$ac_cv_header_stdc" = "no"; then