projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
42324bf
..
1d0f439
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,11
+1,13
@@
## -*- Autoconf -*-
## This file is part of Pazpar2.
## -*- Autoconf -*-
## This file is part of Pazpar2.
-## Copyright (C) 2006-2011 Index Data
+## Copyright (C) 2006-2012 Index Data
## Process this file with autoconf to produce a configure script.
# Autoconf and automake setup
AC_PREREQ(2.60)
## Process this file with autoconf to produce a configure script.
# Autoconf and automake setup
AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.5.6],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],
+m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']),
+[pazpar2-help@indexdata.dk])
AC_CONFIG_HEADERS(src/config.h)
AC_CONFIG_HEADERS(src/config.h)
@@
-22,12
+24,13
@@
AC_LANG(C)
AC_C_INLINE
AC_C_INLINE
-YAZ_INIT([static icu],[4.1.0])
+YAZ_INIT([static icu],[4.2.39])
if test -z "$YAZLIB"; then
AC_MSG_ERROR([YAZ development libraries missing])
fi
YAZ_DOC
if test -z "$YAZLIB"; then
AC_MSG_ERROR([YAZ development libraries missing])
fi
YAZ_DOC
+AC_SEARCH_LIBS([log],[m])
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])
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])
@@
-79,12
+82,8
@@
echo \
Linked libs: ${LIBS}
Host System Type: ${host}
Install path: ${prefix}
Linked libs: ${LIBS}
Host System Type: ${host}
Install path: ${prefix}
- Automake: ${AUTOMAKE}
- Archiver: ${AR}
- Ranlib: ${RANLIB}
YAZ Version: ${YAZVERSION}
YAZ Include: ${YAZINC}
YAZ Version: ${YAZVERSION}
YAZ Include: ${YAZINC}
- YAZ La Lib: ${YAZLALIB}
YAZ Lib: ${YAZLIB}
Bugreport: ${PACKAGE_BUGREPORT}
YAZ Lib: ${YAZLIB}
Bugreport: ${PACKAGE_BUGREPORT}