Update for version 2.2.99

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index d28c7bf598ad8f3a299df316bc94faac5e37eafb..22d8bc6dc44d28b3ad650f53ffbf6655622c639b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl 
 dnl  $Id$
 dnl 
-dnl  Copyright © 2003 Keith Packard
+dnl  Copyright © 2003 Keith Packard
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
 dnl  documentation for any purpose is hereby granted without fee, provided that
@@ -33,7 +33,7 @@ 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.2.96)
+AM_INIT_AUTOMAKE(fontconfig, 2.2.99)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
@@ -88,6 +88,50 @@ AC_SUBST(WARN_CFLAGS)
 
 dnl ==========================================================================
 
+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
+dnl ==========================================================================
+
+# Setup for compiling build tools (fc-glyphname, etc)
+AC_MSG_CHECKING([for a C compiler for build tools])
+if test $cross_compiling = yes; then
+  AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+else
+  CC_FOR_BUILD=$CC
+fi
+AC_MSG_RESULT([$CC_FOR_BUILD])
+AC_SUBST(CC_FOR_BUILD)
+
+AC_MSG_CHECKING([for suffix of executable build tools])
+if test $cross_compiling = yes; then
+  cat >conftest.c <<\_______EOF
+int
+main ()
+{
+  exit (0);
+}
+_______EOF
+  for i in .exe ""; do
+    compile="$CC_FOR_BUILD conftest.c -o conftest$i"
+    if AC_TRY_EVAL(compile); then
+      if (./conftest) 2>&AC_FD_CC; then
+       EXEEXT_FOR_BUILD=$i
+       break
+      fi
+    fi
+  done
+  rm -f conftest*
+  if test "${EXEEXT_FOR_BUILD+set}" != set; then
+    AC_MSG_ERROR([Cannot determine suffix of executable build tools])
+  fi
+else
+  EXEEXT_FOR_BUILD=$EXEEXT
+fi
+AC_MSG_RESULT([$EXEEXT_FOR_BUILD])
+AC_SUBST(EXEEXT_FOR_BUILD)
+
+dnl ==========================================================================
+
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -158,7 +202,16 @@ no)
        ;;
 *)
        case "$expat_includes" in
-       yes|no)
+       yes)
+               case "$expat" in
+               yes)
+                       ;;
+               *)
+                       EXPAT_CFLAGS="-I$expat/include"
+                       ;;
+               esac
+               ;;
+       no)
                EXPAT_CFLAGS=""
                ;;
        *)
@@ -281,19 +334,16 @@ yes)
        for dir in /usr/X11R6/lib/X11 /usr/X11/lib/X11 /usr/lib/X11; do
                case x"$FC_ADD_FONTS" in
                x)
-                       if test -d "$dir/fonts"; then
-                               for sub in "$dir"/fonts/*; do
-                                       if ls "$sub" | grep -q -i '\.pf\|\.tt\|\.ot'; then
-                                               case x$FC_ADD_FONTS in
-                                               x)
-                                                       FC_ADD_FONTS="$sub"
-                                                       ;;
-                                               *)
-                                                       FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
-                                                       ;;
-                                               esac
-                                       fi
-                               done
+                       sub="$dir/fonts"
+                       if test -d "$sub"; then
+                               case x$FC_ADD_FONTS in
+                               x)
+                                       FC_ADD_FONTS="$sub"
+                                       ;;
+                               *)
+                                       FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
+                                       ;;
+                               esac
                        fi
                        ;;
                esac
@@ -414,6 +464,7 @@ Makefile
 fontconfig/Makefile
 fc-lang/Makefile
 fc-glyphname/Makefile
+fc-case/Makefile
 src/Makefile
 src/fontconfig.def
 fc-cache/Makefile