Mercurial > hg > xemacs-beta

comparison configure.ac @ 4359:df1f1f49ef70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 24 Dec 2007 15:04:01 +0100
parents 50889296c05c
children 01970033faa6
comparison
equal deleted inserted replaced
4358:63c25d1cbecf 4359:df1f1f49ef70
664 [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) 664 [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
665 XE_MERGED_ARG([last-packages], 665 XE_MERGED_ARG([last-packages],
666 AS_HELP_STRING([--with-last-packages=DIR],[Specify location of last/legacy packages (instead of default location; same as --with-legacy-packages).]), 666 AS_HELP_STRING([--with-last-packages=DIR],[Specify location of last/legacy packages (instead of default location; same as --with-legacy-packages).]),
667 [AC_DEFINE(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)], []) 667 [AC_DEFINE(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
668 XE_MERGED_ARG([legacy-packages], 668 XE_MERGED_ARG([legacy-packages],
669 AS_HELP_STRING([--with-legacy-packages=DIR],[Specify location of late/legacy packages (instead of default location; same as --with-last-packages).]), 669 AS_HELP_STRING([--with-legacy-packages=DIR],[Specify location of last/legacy packages (instead of default location; same as --with-last-packages).]),
670 [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) 670 [AC_DEFINE(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
671 XE_MERGED_ARG([package-path], 671 XE_MERGED_ARG([package-path],
672 AS_HELP_STRING([--with-package-path=PATH],[Search path for package directories.]), 672 AS_HELP_STRING([--with-package-path=PATH],[Search path for package directories.]),
673 [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) 673 [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], [])
674 XE_MERGED_ARG([infopath], 674 XE_MERGED_ARG([infopath],
675 AS_HELP_STRING([--with-infopath=PATH],[Location of info directories]), 675 AS_HELP_STRING([--with-infopath=PATH],[Location of info directories]),
3530 [XE_DIE(["Unable to find libXrender for --with-xft"])]) 3530 [XE_DIE(["Unable to find libXrender for --with-xft"])])
3531 AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x), 3531 AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x),
3532 [XE_DIE(["Unable to find libfontconfig for --with-xft"])]) 3532 [XE_DIE(["Unable to find libfontconfig for --with-xft"])])
3533 AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x), 3533 AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x),
3534 [XE_DIE(["Unable to find libXft for --with-xft"])]) 3534 [XE_DIE(["Unable to find libXft for --with-xft"])])
3535
3536 AC_CHECK_FUNCS(FcConfigGetRescanInterval)
3537 AC_CHECK_FUNCS(FcConfigSetRescanInterval)
3535 dnl #### detect fontconfig properly!!!! 3538 dnl #### detect fontconfig properly!!!!
3536 with_fontconfig=yes 3539 with_fontconfig=yes
3537 AC_DEFINE(HAVE_FONTCONFIG) 3540 AC_DEFINE(HAVE_FONTCONFIG)
3538 AC_DEFINE(USE_XFT) 3541 AC_DEFINE(USE_XFT)
3539 dnl Due to interactions with other libraries, must postpone AC_DEFINE 3542 dnl Due to interactions with other libraries, must postpone AC_DEFINE