configure.in: If admin/unidata/UnicodeData.txt is present, copy

admin/unidata/Makefile.in to Makefile.
configure: Regenerated.

diff --git a/ChangeLog b/ChangeLog
index 001b657cdc283d748ed0a7739a6dbea79284cb2b..09fd6e49d9747bca9fe9b1923bcb46fba02afe70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.in: If admin/unidata/UnicodeData.txt is present, copy
+       admin/unidata/Makefile.in to Makefile.
+       * configure: Regenerated.
+
 2008-02-01  Miles Bader  <miles@gnu.org>
 
        * configure.in: Use OPTION_DEFAULT_ON for [freetype], [xft],

diff --git a/configure b/configure
index 5811e9c331292b978b64b74d811a71f3b765dfbc..9708c4e44a501cdf503240986f962c26b74363a8 100755 (executable)
--- a/configure
+++ b/configure
@@ -12776,6 +12776,10 @@ _ACEOF
     fi
   fi
 fi
+if test "$HAVE_XFT" != "yes"; then
+   HAVE_XFT=no
+fi
+
 
 HAVE_FREETYPE=no
 ### Use -lfreetype if available, unless `--with-freetype=no'.
@@ -23953,6 +23957,14 @@ echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
 echo "  Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}"
 echo "  Does Emacs use -lgpm?                                   ${HAVE_GPM}"
 echo "  Does Emacs use -ldbus?                                  ${HAVE_DBUS}"
+echo "  Does Emacs use a font backend?                          ${USE_FONT_BACKEND}"
+
+if test "${USE_FONT_BACKEND}" = "yes"; then
+  echo "  Does Emacs use -lfreetype?                              ${HAVE_FREETYPE}"
+  echo "  Does Emacs use -lm17n-flt?                              ${HAVE_M17N_FLT}"
+  echo "  Does Emacs use -lotf?                                   ${HAVE_LIBOTF}"
+  echo "  Does Emacs use -lxft?                                   ${HAVE_XFT}"
+fi
 echo "  Does Emacs use X toolkit scroll bars?                   ${USE_TOOLKIT_SCROLL_BARS}"
 echo
 
@@ -25278,6 +25290,8 @@ echo creating src/Makefile
       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
       < Makefile.c > junk.c
   if test -f ${srcdir}/admin/unidata/UnicodeData.txt; then
+    echo creating ${srcdir}/admin/unidata/Makefile
+    cp ${srcdir}/admin/unidata/Makefile.in ${srcdir}/admin/unidata/Makefile
     CPPFLAGS="$CPPFLAGS -DHAVE_UNIDATA"
   fi
   $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \

diff --git a/configure.in b/configure.in
index 9476b5fb931af9784d545b0ac480beed4b724f8c..c0e5a77dd36425da65340620d6b21af3239902e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3192,6 +3192,8 @@ echo creating src/Makefile
       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
       < Makefile.c > junk.c
   if test -f ${srcdir}/admin/unidata/UnicodeData.txt; then
+    echo creating ${srcdir}/admin/unidata/Makefile
+    cp ${srcdir}/admin/unidata/Makefile.in ${srcdir}/admin/unidata/Makefile
     CPPFLAGS="$CPPFLAGS -DHAVE_UNIDATA"
   fi
   $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \