Update version to 2.1.91

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index ed03f1afb8c33bc32edaaf2170a841107feed9db..1107374ef14e8e78b265b5834bffef6943ada042 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,32 +23,28 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
+AC_INIT(fonts.dtd)
+
 dnl ==========================================================================
 dnl                               Versioning              
 dnl ==========================================================================
 
-dnl The version number is also in fontconfig/fontconfig.h
-AC_INIT(ChangeLog,1.0.3,fontconfig@fontconfig.org)
-
-FONTCONFIG_HEADER=fontconfig/fontconfig.h
-FONTCONFIG_MAJOR=`awk '/^#define FC_MAJOR/ { print $3 }' $FONTCONFIG_HEADER`
-FONTCONFIG_MINOR=`awk '/^#define FC_MINOR/ { print $3 }' $FONTCONFIG_HEADER`
-FONTCONFIG_REVISION=`awk '/^#define FC_REVISION/ { print $3 }' $FONTCONFIG_HEADER`
-FONTCONFIG_VERSION="$FONTCONFIG_MAJOR.$FONTCONFIG_MINOR.$FONTCONFIG_REVISION"
-
-AC_SUBST(FONTCONFIG_MAJOR)
-AC_SUBST(FONTCONFIG_MINOR)
-AC_SUBST(FONTCONFIG_REVISION)
-AC_SUBST(FONTCONFIG_VERSION)
+dnl This is the package version number, not the shared library
+dnl version.  This same version number must appear in fontconfig/fontconfig.h
+dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
+dnl not possible to extract the version number here from fontconfig.h
+AM_INIT_AUTOMAKE(fontconfig, 2.1.91)
 
 dnl libtool versioning
 
-LT_VERSION_NUMBER="$FONTCONFIG_MAJOR:$FONTCONFIG_MINOR:$FONTCONFIG_REVISION"
-AC_SUBST(LT_VERSION_NUMBER)
+LT_CURRENT=1
+LT_REVISION=4
+LT_AGE=0
 
-dnl ==========================================================================
+LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+AC_SUBST(LT_VERSION_INFO)
 
-AM_INIT_AUTOMAKE(fontconfig, $FONTCONFIG_VERSION)
+dnl ==========================================================================
 
 AM_CONFIG_HEADER(config.h)
 
@@ -226,7 +222,7 @@ AC_ARG_WITH(x_fonts,           [  --with-x-fonts=DIR            Find X fonts in
 case "$x_fonts" in
 yes)
        FC_X_FONTS=""
-       for dir in /usr/X11R6/lib /usr/X11/lib /usr/lib/X11; do
+       for dir in /usr/X11R6/lib/X11 /usr/X11/lib/X11 /usr/lib/X11; do
                case x"$FC_X_FONTS" in
                x)
                        if test -d "$dir/fonts"; then
@@ -272,13 +268,13 @@ AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store
 
 case "$confdir" in
 no|yes)
-       confdir=/etc/fonts
+       confdir='${sysconfdir}'/fonts
        ;;
 *)
        ;;
 esac
 AC_SUBST(confdir)
-CONFDIR='${confdir}'
+CONFDIR=${confdir}
 AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR",[Font configuration directory])
 AC_SUBST(CONFDIR)
 
@@ -289,6 +285,22 @@ AC_SUBST(CONFDIR)
 ORTH_FILES=`cd fc-lang && echo *.orth`
 AC_SUBST(ORTH_FILES)
 
+#
+# Let people not build/install docs if they don't have docbook
+#
+
+AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
+
+AC_ARG_ENABLE(docs,           [  --disable-docs               Don't build and install documentation],,enable_docs=yes)
+
+if test "x$enable_docs" = xyes; then
+  if test "x$HASDOCBOOK" != xyes; then
+    enable_docs=no
+  fi
+fi
+
+AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes)
+
 #
 # Figure out where to install documentation
 #
@@ -311,6 +323,7 @@ src/Makefile
 fc-cache/Makefile
 fc-list/Makefile
 doc/Makefile
+test/Makefile
 fontconfig.spec
 fontconfig.pc
 fonts.conf