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
Version 1.1.1
[pazpar2-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
a7a9942
..
4841ba6
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,34
+1,39
@@
## -*- Autoconf -*-
## -*- Autoconf -*-
+## This file is part of Pazpar2.
## Process this file with autoconf to produce a configure script.
# Autoconf and automake setup
## Process this file with autoconf to produce a configure script.
# Autoconf and automake setup
-AC_PREREQ(2.59)
-AC_INIT([pazpar2],[0.1],[pazpar2-help@indexdata.dk])
+AC_PREREQ(2.60)
+AC_INIT([pazpar2],[1.1.1],[pazpar2-help@indexdata.dk])
-AC_CONFIG_HEADERS(src/cconfig.h)
+AC_CONFIG_HEADERS(src/config.h)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.9])
AC_PROG_CC
AC_PROG_RANLIB
AC_LANG(C)
AC_PROG_CC
AC_PROG_RANLIB
AC_LANG(C)
-YAZ_INIT([static threads],[3.0.4])
+YAZ_INIT([static icu threads],[3.0.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_CHECK_ICU(3.6, [],
- AC_MSG_WARN([For ICU internationalizing support please install libicu36-dev or similar]))
+AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h])
+AC_CHECK_FUNCS([getaddrinfo])
-ln -sf ../../js/pz2.js www/example/pz2.js
-ln -sf ../../../js/pz2.js www/masterkey/js/pz2.js
+if test -d ${srcdir}/.git; then
+ sha=`git show --pretty=format:%H|head -1`
+else
+ sha=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'`
+fi
+AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1])
AC_CONFIG_FILES([
Doxyfile
AC_CONFIG_FILES([
Doxyfile
@@
-40,7
+45,7
@@
AC_CONFIG_FILES([
doc/local.ent
doc/common/Makefile
doc/common/print.dsl
doc/local.ent
doc/common/Makefile
doc/common/print.dsl
-
+ win/version.nsi
])
AC_OUTPUT
])
AC_OUTPUT
@@
-67,9
+72,6
@@
echo \
YAZ Include: ${YAZINC}
YAZ La Lib: ${YAZLALIB}
YAZ Lib: ${YAZLIB}
YAZ Include: ${YAZINC}
YAZ La Lib: ${YAZLALIB}
YAZ Lib: ${YAZLIB}
- ICU Version: ${ICU_VERSION}
- ICU Include: ${ICU_CPPFLAGS}
- ICU Lib: ${ICU_LIBS}
Bugreport: ${PACKAGE_BUGREPORT}
------------------------------------------------------------------------"
Bugreport: ${PACKAGE_BUGREPORT}
------------------------------------------------------------------------"