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
Update test_sort results
[pazpar2-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
80ef5e8
..
f37b77c
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-2013 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.6.3],[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,10
+24,15
@@
AC_LANG(C)
AC_C_INLINE
AC_C_INLINE
-YAZ_INIT([static icu],[4.2.16])
+YAZ_INIT([static icu],[4.2.40])
if test -z "$YAZLIB"; then
AC_MSG_ERROR([YAZ development libraries missing])
fi
if test -z "$YAZLIB"; then
AC_MSG_ERROR([YAZ development libraries missing])
fi
+case $YAZINC in
+ *YAZ_HAVE_XSLT=1*) ;;
+ *) AC_MSG_ERROR([YAZ not compiled with Libxslt support]) ;;
+esac
+
YAZ_DOC
AC_SEARCH_LIBS([log],[m])
YAZ_DOC
AC_SEARCH_LIBS([log],[m])
@@
-50,22
+57,22
@@
else
fi
AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1])
fi
AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1])
-AC_CONFIG_FILES([
+AC_OUTPUT([
Doxyfile
Makefile
src/Makefile
test/Makefile
js/Makefile
doc/Makefile
Doxyfile
Makefile
src/Makefile
test/Makefile
js/Makefile
doc/Makefile
- doc/local.ent
+ doc/local0.ent
doc/common/Makefile
doc/common/print.dsl
win/version.nsi
doc/common/Makefile
doc/common/print.dsl
win/version.nsi
+],[
+ diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \
+ || cp doc/local0.ent doc/local.ent
])
])
-AC_OUTPUT
-
-
echo \
"------------------------------------------------------------------------
echo \
"------------------------------------------------------------------------