Mercurial > emacs

changeset 91463:7ea128029a41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.in: If admin/unidata/UnicodeData.txt is present, copy admin/unidata/Makefile.in to Makefile. configure: Regenerated.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 02 Feb 2008 15:49:10 +0000
parents 03f6b152da24
children 54f9fee16e00
files configure configure.in
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Feb 02 15:45:50 2008 +0000
+++ b/configure	Sat Feb 02 15:49:10 2008 +0000
@@ -12776,6 +12776,10 @@
     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 -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 @@
       -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 | \
--- a/configure.in	Sat Feb 02 15:45:50 2008 +0000
+++ b/configure.in	Sat Feb 02 15:49:10 2008 +0000
@@ -3192,6 +3192,8 @@
       -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 | \