diff options
| author | Eli Zaretskii | 2008-02-02 15:49:46 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2008-02-02 15:49:46 +0000 |
| commit | 2ee27f27757302bf773ec17b6b6aae00ce751b41 (patch) | |
| tree | 35435c2a7c5aa754c039ad6c4cbf3b169fd6a1a3 /configure | |
| parent | 5889232dc5d22ddef46ba32aaa7db62a61002cc8 (diff) | |
| download | emacs-2ee27f27757302bf773ec17b6b6aae00ce751b41.tar.gz emacs-2ee27f27757302bf773ec17b6b6aae00ce751b41.zip | |
configure.in: If admin/unidata/UnicodeData.txt is present, copy
admin/unidata/Makefile.in to Makefile.
configure: Regenerated.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 14 insertions, 0 deletions
| @@ -12776,6 +12776,10 @@ _ACEOF | |||
| 12776 | fi | 12776 | fi |
| 12777 | fi | 12777 | fi |
| 12778 | fi | 12778 | fi |
| 12779 | if test "$HAVE_XFT" != "yes"; then | ||
| 12780 | HAVE_XFT=no | ||
| 12781 | fi | ||
| 12782 | |||
| 12779 | 12783 | ||
| 12780 | HAVE_FREETYPE=no | 12784 | HAVE_FREETYPE=no |
| 12781 | ### Use -lfreetype if available, unless `--with-freetype=no'. | 12785 | ### Use -lfreetype if available, unless `--with-freetype=no'. |
| @@ -23953,6 +23957,14 @@ echo " Does Emacs use -lpng? ${HAVE_PNG}" | |||
| 23953 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" | 23957 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" |
| 23954 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" | 23958 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" |
| 23955 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" | 23959 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" |
| 23960 | echo " Does Emacs use a font backend? ${USE_FONT_BACKEND}" | ||
| 23961 | |||
| 23962 | if test "${USE_FONT_BACKEND}" = "yes"; then | ||
| 23963 | echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" | ||
| 23964 | echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}" | ||
| 23965 | echo " Does Emacs use -lotf? ${HAVE_LIBOTF}" | ||
| 23966 | echo " Does Emacs use -lxft? ${HAVE_XFT}" | ||
| 23967 | fi | ||
| 23956 | echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" | 23968 | echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" |
| 23957 | echo | 23969 | echo |
| 23958 | 23970 | ||
| @@ -25278,6 +25290,8 @@ echo creating src/Makefile | |||
| 25278 | -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ | 25290 | -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ |
| 25279 | < Makefile.c > junk.c | 25291 | < Makefile.c > junk.c |
| 25280 | if test -f ${srcdir}/admin/unidata/UnicodeData.txt; then | 25292 | if test -f ${srcdir}/admin/unidata/UnicodeData.txt; then |
| 25293 | echo creating ${srcdir}/admin/unidata/Makefile | ||
| 25294 | cp ${srcdir}/admin/unidata/Makefile.in ${srcdir}/admin/unidata/Makefile | ||
| 25281 | CPPFLAGS="$CPPFLAGS -DHAVE_UNIDATA" | 25295 | CPPFLAGS="$CPPFLAGS -DHAVE_UNIDATA" |
| 25282 | fi | 25296 | fi |
| 25283 | $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ | 25297 | $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ |