oops -- X fonts referenced from the wrong place

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index a12340536d8413041854b10976664d2d34418426..7702bb5ce65dd760069fb4d54b316e289fdab1cc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,23 +23,24 @@ 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)
+dnl This is the package version number, not the shared library version number
+dnl The shared library version lives in fontconfig/fontconfig.h
+AM_INIT_AUTOMAKE(fontconfig, 2.1.90)
 
 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 libtool versioning
 
@@ -48,8 +49,6 @@ AC_SUBST(LT_VERSION_NUMBER)
 
 dnl ==========================================================================
 
-AM_INIT_AUTOMAKE(fontconfig, $FONTCONFIG_VERSION)
-
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -226,7 +225,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 +271,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)
 
@@ -327,6 +326,7 @@ src/Makefile
 fc-cache/Makefile
 fc-list/Makefile
 doc/Makefile
+test/Makefile
 fontconfig.spec
 fontconfig.pc
 fonts.conf