X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/1b27574370124043691a26a86a555a256dae49e0..e6fa807c5ae9f8c5aecc7b99b03fbe54c4085dd5:/configure diff --git a/configure b/configure index f17c0971a3..5483058410 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.61 for emacs 23.0.50. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -412,10 +412,10 @@ else fi test \$exitcode = 0") || { - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message } @@ -570,11 +570,11 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='emacs' +PACKAGE_TARNAME='emacs' +PACKAGE_VERSION='23.0.50' +PACKAGE_STRING='emacs 23.0.50' +PACKAGE_BUGREPORT='' ac_unique_file="src/lisp.h" ac_config_libobj_dir=src @@ -692,8 +692,18 @@ RSVG_CFLAGS RSVG_LIBS GTK_CFLAGS GTK_LIBS +DBUS_CFLAGS +DBUS_LIBS XFT_CFLAGS XFT_LIBS +FREETYPE_CFLAGS +FREETYPE_LIBS +FONTCONFIG_CFLAGS +FONTCONFIG_LIBS +LIBOTF_CFLAGS +LIBOTF_LIBS +M17N_FLT_CFLAGS +M17N_FLT_LIBS ALLOCA liblockfile LIBOBJS @@ -774,7 +784,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1238,7 +1248,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures emacs 23.0.50 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1286,7 +1296,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root [DATAROOTDIR/doc/emacs] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1311,7 +1321,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of emacs 23.0.50:";; + esac cat <<\_ACEOF Optional Features: @@ -1320,6 +1332,8 @@ Optional Features: --enable-carbon-app[=DIR] specify install directory for Emacs.app on Mac OS X [DIR=/Application] + --disable-font-backend don't compile font-backend support + --enable-sync-input compile code with sync-input --enable-asserts compile code with asserts enabled --enable-maintainer-mode enable make rules and dependencies not useful (and @@ -1332,7 +1346,6 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --without-gcc don't use GCC to compile Emacs if GCC is found --without-pop don't support POP mail retrieval with movemail --with-kerberos support Kerberos-authenticated POP --with-kerberos5 support Kerberos version 5 authenticated POP @@ -1340,20 +1353,27 @@ Optional Packages: --without-sound don't compile with sound support --with-x-toolkit=KIT use an X toolkit (KIT one of: yes, lucid, athena, motif, gtk, no) - --with-xpm use -lXpm for displaying XPM images - --with-jpeg use -ljpeg for displaying JPEG images - --with-tiff use -ltiff for displaying TIFF images - --with-gif use -lgif (or -lungif) for displaying GIF images - --with-png use -lpng for displaying PNG images - --with-gpm use -lgpm for mouse support on a GNU/Linux console - --with-rsvg use -lrsvg-2 for displaying SVG images - --with-gtk use GTK (same as --with-x-toolkit=gtk) - --with-pkg-config-prog Path to pkg-config for finding GTK and librsvg + --without-xpm don't compile with XPM image support + --without-jpeg don't compile with JPEG image support + --without-tiff don't compile with TIFF image support + --without-gif don't compile with GIF image support + --without-png don't compile with PNG image support + --without-rsvg don't compile with SVG image support + --without-freetype don't use Freetype for local font support + --without-xft don't use XFT for anti aliased fonts + --without-libotf don't use libotf for OpenType font support + --without-m17n-flt don't use m17n-flt for text shaping --without-toolkit-scroll-bars don't use Motif or Xaw3d scroll bars --without-xaw3d don't use Xaw3d --without-xim don't use X11 XIM - --without-carbon don't use Carbon GUI on Mac OS X + --with-carbon use Carbon GUI on Mac OS X. This is unsupported! + --without-gpm don't use -lgpm for mouse support on a GNU/Linux + console + --without-dbus don't compile with D-Bus support + + --with-pkg-config-prog=PATH + Path to pkg-config for finding GTK and librsvg --with-x use the X Window System Some influential environment variables: @@ -1430,7 +1450,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +emacs configure 23.0.50 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1444,7 +1464,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by emacs $as_me 23.0.50, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1780,6 +1800,14 @@ fi + + + + + + + + @@ -1795,6 +1823,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers src/config.h:src/config.in" + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -1822,24 +1851,16 @@ gameuser=games -# Check whether --with-gcc was given. -if test "${with_gcc+set}" = set; then - withval=$with_gcc; -fi - - # Check whether --with-pop was given. if test "${with_pop+set}" = set; then - withval=$with_pop; if test "$withval" = yes; then - cat >>confdefs.h <<\_ACEOF -#define MAIL_USE_POP 1 -_ACEOF - -else : -fi + withval=$with_pop; else - cat >>confdefs.h <<\_ACEOF + with_pop=yes +fi + +if test "$with_pop" = yes; then + cat >>confdefs.h <<\_ACEOF #define MAIL_USE_POP 1 _ACEOF @@ -1847,24 +1868,31 @@ fi - # Check whether --with-kerberos was given. if test "${with_kerberos+set}" = set; then - withval=$with_kerberos; if test "$withval" = yes; then + withval=$with_kerberos; +else + with_kerberos=no +fi + +if test "$with_kerberos" = yes; then cat >>confdefs.h <<\_ACEOF #define KERBEROS 1 _ACEOF fi -fi - # Check whether --with-kerberos5 was given. if test "${with_kerberos5+set}" = set; then - withval=$with_kerberos5; if test "${with_kerberos5+set}" = set; then - if test "${with_kerberos+set}" != set; then + withval=$with_kerberos5; +else + with_kerberos5=no +fi + +if test "${with_kerberos5}" = yes; then + if test "${with_kerberos}" != yes; then with_kerberos=yes cat >>confdefs.h <<\_ACEOF #define KERBEROS 1 @@ -1877,26 +1905,29 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi -fi - # Check whether --with-hesiod was given. if test "${with_hesiod+set}" = set; then - withval=$with_hesiod; if test "$withval" = yes; then + withval=$with_hesiod; +else + with_hesiod=no +fi + +if test "$with_hesiod" = yes; then cat >>confdefs.h <<\_ACEOF #define HESIOD 1 _ACEOF fi -fi - # Check whether --with-sound was given. if test "${with_sound+set}" = set; then withval=$with_sound; +else + with_sound=yes fi @@ -1929,80 +1960,167 @@ fi # Check whether --with-xpm was given. if test "${with_xpm+set}" = set; then withval=$with_xpm; +else + with_xpm=yes fi # Check whether --with-jpeg was given. if test "${with_jpeg+set}" = set; then withval=$with_jpeg; +else + with_jpeg=yes fi # Check whether --with-tiff was given. if test "${with_tiff+set}" = set; then withval=$with_tiff; +else + with_tiff=yes fi # Check whether --with-gif was given. if test "${with_gif+set}" = set; then withval=$with_gif; +else + with_gif=yes fi # Check whether --with-png was given. if test "${with_png+set}" = set; then withval=$with_png; -fi - - -# Check whether --with-gpm was given. -if test "${with_gpm+set}" = set; then - withval=$with_gpm; +else + with_png=yes fi # Check whether --with-rsvg was given. if test "${with_rsvg+set}" = set; then withval=$with_rsvg; +else + with_rsvg=yes fi -# Check whether --with-gtk was given. -if test "${with_gtk+set}" = set; then - withval=$with_gtk; + +# Check whether --with-freetype was given. +if test "${with_freetype+set}" = set; then + withval=$with_freetype; +else + with_freetype=yes fi -# Check whether --with-pkg-config-prog was given. -if test "${with_pkg_config_prog+set}" = set; then - withval=$with_pkg_config_prog; +# Check whether --with-xft was given. +if test "${with_xft+set}" = set; then + withval=$with_xft; +else + with_xft=yes +fi + + +# Check whether --with-libotf was given. +if test "${with_libotf+set}" = set; then + withval=$with_libotf; +else + with_libotf=yes +fi + + +# Check whether --with-m17n-flt was given. +if test "${with_m17n_flt+set}" = set; then + withval=$with_m17n_flt; +else + with_m17n_flt=yes fi + # Check whether --with-toolkit-scroll-bars was given. if test "${with_toolkit_scroll_bars+set}" = set; then withval=$with_toolkit_scroll_bars; +else + with_toolkit_scroll_bars=yes fi # Check whether --with-xaw3d was given. if test "${with_xaw3d+set}" = set; then withval=$with_xaw3d; +else + with_xaw3d=yes fi # Check whether --with-xim was given. if test "${with_xim+set}" = set; then withval=$with_xim; +else + with_xim=yes fi # Check whether --with-carbon was given. if test "${with_carbon+set}" = set; then withval=$with_carbon; +else + with_carbon=no +fi + + + +# Check whether --with-gpm was given. +if test "${with_gpm+set}" = set; then + withval=$with_gpm; +else + with_gpm=yes +fi + + +# Check whether --with-dbus was given. +if test "${with_dbus+set}" = set; then + withval=$with_dbus; +else + with_dbus=yes +fi + + + +# Check whether --with-gtk was given. +if test "${with_gtk+set}" = set; then + withval=$with_gtk; { { echo "$as_me:$LINENO: error: --with-gtk has been removed. Use --with-x-toolkit to +specify a toolkit." >&5 +echo "$as_me: error: --with-gtk has been removed. Use --with-x-toolkit to +specify a toolkit." >&2;} + { (exit 1); exit 1; }; } +fi + + + +# Check whether --with-gcc was given. +if test "${with_gcc+set}" = set; then + withval=$with_gcc; { { echo "$as_me:$LINENO: error: --with-gcc has been removed. Set the \`CC' environment + variable to specify a compiler." >&5 +echo "$as_me: error: --with-gcc has been removed. Set the \`CC' environment + variable to specify a compiler." >&2;} + { (exit 1); exit 1; }; } +fi + + + +# Check whether --with-pkg-config-prog was given. +if test "${with_pkg_config_prog+set}" = set; then + withval=$with_pkg_config_prog; fi +if test "X${with_pkg_config_prog}" != X; then + if test "${with_pkg_config_prog}" != yes; then + PKG_CONFIG="${with_pkg_config_prog}" + fi +fi # Check whether --enable-carbon-app was given. if test "${enable_carbon_app+set}" = set; then @@ -2010,6 +2128,23 @@ if test "${enable_carbon_app+set}" = set; then fi +## Enabled by default. +# Check whether --enable-font-backend was given. +if test "${enable_font_backend+set}" = set; then + enableval=$enable_font_backend; USE_FONT_BACKEND=$enableval +else + USE_FONT_BACKEND=yes +fi + + +# Check whether --enable-sync-input was given. +if test "${enable_sync_input+set}" = set; then + enableval=$enable_sync_input; USE_SYNC_INPUT=$enableval +else + USE_SYNC_INPUT=yes +fi + + # Check whether --enable-asserts was given. if test "${enable_asserts+set}" = set; then enableval=$enable_asserts; USE_XASSERTS=$enableval @@ -2215,8 +2350,8 @@ configuration=${host_alias-${build_alias-$host}} ### based on the machine portion of the configuration name, and an s- ### file based on the operating system portion. However, it turns out ### that each m/*.h file is pretty manufacturer-specific - for -### example, apollo.h, hp9000s300.h, mega68k, news.h, and tad68k are -### all 68000 machines; mips.h, pmax.h, and news-risc are all MIPS +### example hp9000s300.h is a 68000 machine; +### mips.h, pmax.h are all MIPS ### machines. So we basically have to have a special case for each ### configuration name. ### @@ -2238,6 +2373,7 @@ case "${canonical}" in opsys=freebsd case "${canonical}" in alpha*-*-freebsd*) machine=alpha ;; + arm*-*-freebsd*) machine=arm ;; ia64-*-freebsd*) machine=ia64 ;; sparc64-*-freebsd*) machine=sparc ;; powerpc-*-freebsd*) machine=macppc ;; @@ -2279,14 +2415,12 @@ _ACEOF mips-*-netbsd*) machine=pmax ;; mipsel-*-netbsd*) machine=pmax ;; mipseb-*-netbsd*) machine=pmax ;; - ns32k-*-netbsd*) machine=ns32000 ;; powerpc-*-netbsd*) machine=macppc ;; sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; arm-*-netbsd*) machine=arm ;; x86_64-*-netbsd*) machine=amdx86-64 ;; hppa-*-netbsd*) machine=hp800 ;; - shle-*-netbsd*) machine=sh3el ;; esac ;; @@ -2299,10 +2433,7 @@ _ACEOF hppa-*-openbsd*) machine=hp9000s300 ;; i386-*-openbsd*) machine=intel386 ;; m68k-*-openbsd*) machine=hp9000s300 ;; - m88k-*-openbsd*) machine=aviion ;; - mips64-*-openbsd*) machine=mips64 ;; powerpc-*-openbsd*) machine=macppc ;; - sh-*-openbsd*) machine=sh3el ;; sparc*-*-openbsd*) machine=sparc ;; vax-*-openbsd*) machine=vax ;; x86_64-*-openbsd*) machine=amdx86-64 ;; @@ -2318,16 +2449,6 @@ _ACEOF esac ;; - ## Acorn RISCiX: - arm-acorn-riscix1.1* ) - machine=acorn opsys=riscix1-1 - ;; - arm-acorn-riscix1.2* | arm-acorn-riscix ) - ## This name is riscix12 instead of riscix1.2 - ## to avoid a file name conflict on MSDOS. - machine=acorn opsys=riscix12 - ;; - ## BSDI ports *-*-bsdi* ) opsys=bsdi @@ -2345,36 +2466,6 @@ _ACEOF esac ;; - ## Alliant machines - ## Strictly speaking, we need the version of the alliant operating - ## system to choose the right machine file, but currently the - ## configuration name doesn't tell us enough to choose the right - ## one; we need to give alliants their own operating system name to - ## do this right. When someone cares, they can help us. - fx80-alliant-* ) - machine=alliant4 opsys=bsd4-2 - ;; - i860-alliant-* ) - machine=alliant-2800 opsys=bsd4-3 - ;; - - ## Alpha (DEC) machines. - alpha*-dec-osf* ) - machine=alpha opsys=osf1 - # This is needed to find X11R6.1 libraries for certain tests. - NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib - GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib - # NON_GNU_CPP is necessary on 5.0 to avoid mangling src/Makefile - # due to non-traditional preprocessing with the current compiler - # defaults. OSF 4 can also have that compiler version, and there - # seems always to have been a usable /usr/bin/cpp. - NON_GNU_CPP=/usr/bin/cpp - case "${canonical}" in - alpha*-dec-osf[5-9]*) - opsys=osf5-0 ;; - esac - ;; - alpha*-*-linux-gnu* ) machine=alpha opsys=gnu-linux ;; @@ -2383,21 +2474,6 @@ _ACEOF machine=arm opsys=gnu-linux ;; - ## Altos 3068 - m68*-altos-sysv* ) - machine=altos opsys=usg5-2 - ;; - - ## Amdahl UTS - 580-amdahl-sysv* ) - machine=amdahl opsys=usg5-2-2 - ;; - - ## Apollo, Domain/OS - m68*-apollo-* ) - machine=apollo opsys=bsd4-3 - ;; - ## Apple Darwin / Mac OS X *-apple-darwin* ) case "${canonical}" in @@ -2416,101 +2492,11 @@ _ACEOF fi ;; - ## AT&T 3b2, 3b5, 3b15, 3b20 - we32k-att-sysv* ) - machine=att3b opsys=usg5-2-2 - ;; - - ## AT&T 3b1 - The Mighty Unix PC! - m68*-att-sysv* ) - machine=7300 opsys=usg5-2-2 - ;; - - ## Bull dpx20 - rs6000-bull-bosx* ) - machine=ibmrs6000 opsys=aix3-2 - ;; - - ## Bull dpx2 - m68*-bull-sysv3* ) - machine=dpx2 opsys=usg5-3 - ;; - - ## Bull sps7 - m68*-bull-sysv2* ) - machine=sps7 opsys=usg5-2 - ;; - - ## CCI 5/32, 6/32 -- see "Tahoe". - - ## Celerity - ## I don't know what configuration name to use for this; config.sub - ## doesn't seem to know anything about it. Hey, Celerity users, get - ## in touch with us! - celerity-celerity-bsd* ) - machine=celerity opsys=bsd4-2 - ;; - - ## Clipper - ## What operating systems does this chip run that Emacs has been - ## tested on? - clipper-* ) - machine=clipper - ## We'll use the catch-all code at the bottom to guess the - ## operating system. - ;; - - ## Compaq Nonstop - mips-compaq-nonstopux* ) - machine=nonstopux opsys=nonstopux - ;; - - ## Convex - *-convex-bsd* | *-convex-convexos* ) - machine=convex opsys=bsd4-3 - ## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov - NON_GNU_CPP="cc -E -P" - ;; - ## Cubix QBx/386 i[3456]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;; - ## Cydra 5 - cydra*-cydrome-sysv* ) - machine=cydra5 opsys=usg5-3 - ;; - - ## Data General AViiON Machines - ## DG changed naming conventions with the release of 5.4.4.10, they - ## dropped the initial 5.4 but left the intervening R. Because of the - ## R this shouldn't conflict with older versions of the OS (which I - ## think were named like dgux4.*). In addition, DG new AViiONs series - ## uses either Motorola M88k or Intel Pentium CPUs. - m88k-dg-dguxR4.* | m88k-dg-dgux4* ) - machine=aviion opsys=dgux4 - ;; - m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) - ## This name is dgux5-4-3 instead of dgux5-4r3 - ## to avoid a file name conflict on MSDOS. - machine=aviion opsys=dgux5-4-3 - ;; - m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) - machine=aviion opsys=dgux5-4r2 - ;; - m88k-dg-dgux* ) - machine=aviion opsys=dgux - ;; - - ## Data General AViiON Intel (x86) Machines - ## Exists from 5.4.3 (current i586-dg-dguxR4.11) - ## Ehud Karni, 1998-may-30, ehud@unix.simonwiesel.co.il - i[345]86-dg-dguxR4* ) - machine=aviion-intel opsys=dgux4 - ;; - - ## DECstations mips-dec-ultrix[0-3].* | mips-dec-ultrix4.0* | mips-dec-bsd4.2* ) machine=pmax opsys=bsd4-2 ;; @@ -2520,103 +2506,6 @@ _ACEOF mips-dec-ultrix* ) machine=pmax opsys=ultrix4-3 ;; - mips-dec-osf* ) - machine=pmax opsys=osf1 - ;; - mips-dec-mach_bsd4.3* ) - machine=pmax opsys=mach-bsd4-3 - ;; - - ## Motorola Delta machines - m68k-motorola-sysv* | m68000-motorola-sysv* ) - machine=delta opsys=usg5-3 - if test -z "`type gnucc | grep 'not found'`" - then - if test -s /etc/167config - then CC="gnucc -m68040" - else CC="gnucc -m68881" - fi - else - if test -z "`type gcc | grep 'not found'`" - then CC=gcc - else CC=cc - fi - fi - ;; - m88k-motorola-sysv4* ) - # jbotte@bnr.ca says that UNIX_System_V 4.0 R40V4.3 m88k mc88110 - # needs POSIX_SIGNALS and therefore needs usg5-4-2. - # I hope there are not other 4.0 versions for this machine - # which really need usg5-4 instead. - machine=delta88k opsys=usg5-4-2 - ;; - m88k-motorola-sysv* | m88k-motorola-m88kbcs* ) - machine=delta88k opsys=usg5-3 - ;; - - ## Dual machines - m68*-dual-sysv* ) - machine=dual opsys=usg5-2 - ;; - m68*-dual-uniplus* ) - machine=dual opsys=unipl5-2 - ;; - - ## Elxsi 6400 - elxsi-elxsi-sysv* ) - machine=elxsi opsys=usg5-2 - ;; - - ## Encore machines - ns16k-encore-bsd* ) - machine=ns16000 opsys=umax - ;; - - ## The GEC 63 - apparently, this port isn't really finished yet. - # I'm sure we finished off the last of the machines, though. -- fx - - ## Gould Power Node and NP1 - pn-gould-bsd4.2* ) - machine=gould opsys=bsd4-2 - ;; - pn-gould-bsd4.3* ) - machine=gould opsys=bsd4-3 - ;; - np1-gould-bsd* ) - machine=gould-np1 opsys=bsd4-3 - ;; - - ## Harris Night Hawk machines running CX/UX (a 5000 looks just like a 4000 - ## as far as Emacs is concerned). - m88k-harris-cxux* ) - # Build needs to be different on 7.0 and later releases - case "`uname -r`" in - [56].[0-9] ) machine=nh4000 opsys=cxux ;; - [7].[0-9] ) machine=nh4000 opsys=cxux7 ;; - esac - NON_GNU_CPP="/lib/cpp" - ;; - ## Harris ecx or gcx running CX/UX (Series 1200, Series 3000) - m68k-harris-cxux* ) - machine=nh3000 opsys=cxux - ;; - ## Harris power pc NightHawk running Power UNIX (Series 6000) - powerpc-harris-powerunix ) - machine=nh6000 opsys=powerunix - NON_GNU_CPP="cc -Xo -E -P" - ;; - ## SR2001/SR2201 running HI-UX/MPP - hppa1.1-hitachi-hiuxmpp* ) - machine=sr2k opsys=hiuxmpp - ;; - hppa1.1-hitachi-hiuxwe2* ) - machine=sr2k opsys=hiuxwe2 - ;; - ## Honeywell XPS100 - xps*-honeywell-sysv* ) - machine=xps100 opsys=usg5-2 - ;; - ## HP 9000 series 200 or 300 m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 @@ -2678,21 +2567,7 @@ _ACEOF machine=hp800 opsys=nextstep ;; - ## Orion machines - orion-orion-bsd* ) - machine=orion opsys=bsd4-2 - ;; - clipper-orion-bsd* ) - machine=orion105 opsys=bsd4-2 - ;; - ## IBM machines - i[3456]86-ibm-aix1.1* ) - machine=ibmps2-aix opsys=usg5-2-2 - ;; - i[3456]86-ibm-aix1.[23]* | i[3456]86-ibm-aix* ) - machine=ibmps2-aix opsys=usg5-3 - ;; i370-ibm-aix*) machine=ibm370aix opsys=usg5-3 ;; @@ -2720,6 +2595,9 @@ _ACEOF rs6000-ibm-aix5* | powerpc-ibm-aix5* ) machine=ibmrs6000 opsys=aix4-2 ;; + rs6000-ibm-aix5* | powerpc-ibm-aix6* ) + machine=ibmrs6000 opsys=aix4-2 + ;; rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0* ) machine=ibmrs6000 opsys=aix4 ;; @@ -2729,64 +2607,12 @@ _ACEOF rs6000-ibm-aix* | powerpc-ibm-aix* ) machine=ibmrs6000 opsys=aix3-2 ;; - romp-ibm-bsd4.3* ) - machine=ibmrt opsys=bsd4-3 - ;; - romp-ibm-bsd4.2* ) - machine=ibmrt opsys=bsd4-2 - ;; - romp-ibm-aos4.3* ) - machine=ibmrt opsys=bsd4-3 - ;; - romp-ibm-aos4.2* ) - machine=ibmrt opsys=bsd4-2 - ;; - romp-ibm-aos* ) - machine=ibmrt opsys=bsd4-3 - ;; - romp-ibm-bsd* ) - machine=ibmrt opsys=bsd4-3 - ;; - romp-ibm-aix* ) - machine=ibmrt-aix opsys=usg5-2-2 - ;; - - ## Integrated Solutions `Optimum V' - m68*-isi-bsd4.2* ) - machine=isi-ov opsys=bsd4-2 - ;; - m68*-isi-bsd4.3* ) - machine=isi-ov opsys=bsd4-3 - ;; - - ## Intel 386 machines where we do care about the manufacturer - i[3456]86-intsys-sysv* ) - machine=is386 opsys=usg5-2-2 - ;; ## Prime EXL i[3456]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;; - ## Sequent Symmetry running Dynix - i[3456]86-sequent-bsd* ) - machine=symmetry opsys=bsd4-3 - ;; - - ## Sequent Symmetry running ptx 4, which is a modified SVR4. - i[3456]86-sequent-ptx4* | i[3456]86-sequent-sysv4* ) - machine=sequent-ptx opsys=ptx4 - NON_GNU_CPP=/lib/cpp - ;; - - ## Sequent Symmetry running DYNIX/ptx - ## Use the old cpp rather than the newer ANSI one. - i[3456]86-sequent-ptx* ) - machine=sequent-ptx opsys=ptx - NON_GNU_CPP="/lib/cpp" - ;; - ## ncr machine running svr4.3. i[3456]86-ncr-sysv4.3 ) machine=ncr386 opsys=usg5-4-3 @@ -2798,58 +2624,15 @@ _ACEOF machine=ncr386 opsys=usg5-4-2 ;; - ## Intel Paragon OSF/1 - i860-intel-osf1* ) - machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp - ;; - - ## Intel 860 - i860-*-sysv4* ) - machine=i860 opsys=usg5-4 - NON_GNU_CC="/bin/cc" # Ie, not the one in /usr/ucb/cc. - NON_GNU_CPP="/usr/ccs/lib/cpp" # cc -E tokenizes macro expansion. - ;; - ## Macintosh PowerPC powerpc*-*-linux-gnu* ) machine=macppc opsys=gnu-linux ;; - ## Masscomp machines - m68*-masscomp-rtu* ) - machine=masscomp opsys=rtu - ;; - - ## Megatest machines - m68*-megatest-bsd* ) - machine=mega68 opsys=bsd4-2 - ;; - ## Workstations sold by MIPS ## This is not necessarily all workstations using the MIPS processor - ## Irises are produced by SGI, and DECstations by DEC. - ## etc/MACHINES lists mips.h and mips4.h as possible machine files, - ## and usg5-2-2 and bsd4-3 as possible OS files. The only guidance - ## it gives for choosing between the alternatives seems to be "Use - ## -machine=mips4 for RISCOS version 4; use -opsystem=bsd4-3 with - ## the BSD world." I'll assume that these are instructions for - ## handling two odd situations, and that every other situation - ## should use mips.h and usg5-2-2, they being listed first. - mips-mips-usg* ) - machine=mips4 - ## Fall through to the general code at the bottom to decide on the OS. - ;; - mips-mips-riscos4* ) - machine=mips4 opsys=bsd4-3 - NON_GNU_CC="cc -systype bsd43" - NON_GNU_CPP="cc -systype bsd43 -E" - ;; - mips-mips-riscos5* ) - machine=mips4 opsys=riscos5 - NON_GNU_CC="cc -systype bsd43" - NON_GNU_CPP="cc -systype bsd43 -E" - ;; mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;; @@ -2862,54 +2645,11 @@ _ACEOF machine=m68k opsys=nextstep ;; - ## The complete machine from National Semiconductor - ns32k-ns-genix* ) - machine=ns32000 opsys=usg5-2 - ;; - - ## NCR machines - m68*-ncr-sysv2* | m68*-ncr-sysvr2* ) - machine=tower32 opsys=usg5-2-2 - ;; - m68*-ncr-sysv3* | m68*-ncr-sysvr3* ) - machine=tower32v3 opsys=usg5-3 - ;; - ## NEC EWS4800 mips-nec-sysv4*) machine=ews4800 opsys=ux4800 ;; - ## Nixdorf Targon 31 - m68*-nixdorf-sysv* ) - machine=targon31 opsys=usg5-2-2 - ;; - - ## Nu (TI or LMI) - m68*-nu-sysv* ) - machine=nu opsys=usg5-2 - ;; - - ## Plexus - m68*-plexus-sysv* ) - machine=plexus opsys=usg5-2 - ;; - - ## Pyramid machines - ## I don't really have any idea what sort of processor the Pyramid has, - ## so I'm assuming it is its own architecture. - pyramid-pyramid-bsd* ) - machine=pyramid opsys=bsd4-2 - ;; - - ## Sequent Balance - ns32k-sequent-bsd4.2* ) - machine=sequent opsys=bsd4-2 - ;; - ns32k-sequent-bsd4.3* ) - machine=sequent opsys=bsd4-3 - ;; - ## Siemens Nixdorf mips-siemens-sysv* | mips-sni-sysv*) machine=mips-siemens opsys=usg5-4 @@ -2918,20 +2658,7 @@ _ACEOF ;; ## Silicon Graphics machines - ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030) - m68*-sgi-iris3.5* ) - machine=irist opsys=iris3-5 - ;; - m68*-sgi-iris3.6* | m68*-sgi-iris*) - machine=irist opsys=iris3-6 - ;; ## Iris 4D - mips-sgi-irix3* ) - machine=iris4d opsys=irix3-3 - ;; - mips-sgi-irix4* ) - machine=iris4d opsys=irix4-0 - ;; mips-sgi-irix6.5 ) machine=iris4d opsys=irix6-5 # Without defining _LANGUAGE_C, things get masked out in the headers @@ -2940,45 +2667,6 @@ _ACEOF NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C" NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C" ;; - mips-sgi-irix6* ) - machine=iris4d opsys=irix6-0 - # It's not clear whether -D_LANGUAGE_C is necessary as it is for 6.5, - # but presumably it does no harm. - NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C" - # -32 probably isn't necessary in later v.6s -- anyone know which? - NON_GCC_TEST_OPTIONS=-32 - ;; - mips-sgi-irix5.[01]* ) - machine=iris4d opsys=irix5-0 - ;; - mips-sgi-irix5* | mips-sgi-irix* ) - machine=iris4d opsys=irix5-2 - ;; - - ## SONY machines - m68*-sony-bsd4.2* ) - machine=news opsys=bsd4-2 - ;; - m68*-sony-bsd4.3* ) - machine=news opsys=bsd4-3 - ;; - m68*-sony-newsos3* | m68*-sony-news3*) - machine=news opsys=bsd4-3 - ;; - mips-sony-bsd* | mips-sony-newsos4* | mips-sony-news4*) - machine=news-risc opsys=bsd4-3 - ;; - mips-sony-newsos6* ) - machine=news-r6 opsys=newsos6 - ;; - mips-sony-news* ) - machine=news-risc opsys=newsos5 - ;; - - ## Stride - m68*-stride-sysv* ) - machine=stride opsys=usg5-2 - ;; ## Suns sparc-*-linux-gnu* | sparc64-*-linux-gnu* ) @@ -2989,10 +2677,6 @@ _ACEOF | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \ | rs6000-*-solaris2*) case "${canonical}" in - m68*-sunos1* ) machine=sun1 ;; - m68*-sunos2* ) machine=sun2 ;; - m68* ) machine=sun3 ;; - i[3456]86-sun-sunos[34]* ) machine=sun386 ;; i[3456]86-*-* ) machine=intel386 ;; amd64-*-*|x86_64-*-*) machine=amdx86-64 ;; powerpcle* ) machine=powerpcle ;; @@ -3001,26 +2685,6 @@ _ACEOF * ) unported=yes ;; esac case "${canonical}" in - ## The Sun386 didn't get past 4.0. - i[3456]86-*-sunos4 ) opsys=sunos4-0 ;; - *-sunos4.0* ) opsys=sunos4-0 ;; - *-sunos4.1.[3-9]*noshare ) - ## This name is sunos413 instead of sunos4-1-3 - ## to avoid a file name conflict on MSDOS. - opsys=sunos413 - NON_GNU_CPP=/usr/lib/cpp - NON_GCC_TEST_OPTIONS=-Bstatic - GCC_TEST_OPTIONS=-static - ;; - *-sunos4.1.[3-9]* | *-sunos4shr*) - opsys=sunos4shr - NON_GNU_CPP=/usr/lib/cpp - ;; - *-sunos4* | *-sunos ) - opsys=sunos4-1 - NON_GCC_TEST_OPTIONS=-Bstatic - GCC_TEST_OPTIONS=-static - ;; *-sunos5.3* | *-solaris2.3* ) opsys=sol2-3 NON_GNU_CPP=/usr/ccs/lib/cpp @@ -3063,50 +2727,11 @@ _ACEOF machine=sparc opsys=nextstep ;; - ## Tadpole 68k - m68*-tadpole-sysv* ) - machine=tad68k opsys=usg5-3 - ;; - - ## Tahoe machines - tahoe-tahoe-bsd4.2* ) - machine=tahoe opsys=bsd4-2 - ;; - tahoe-tahoe-bsd4.3* ) - machine=tahoe opsys=bsd4-3 - ;; - ## Tandem Integrity S2 mips-tandem-sysv* ) machine=tandem-s2 opsys=usg5-3 ;; - ## Tektronix XD88 - m88k-tektronix-sysv3* ) - machine=tekxd88 opsys=usg5-3 - ;; - - ## Tektronix 16000 box (6130?) - ns16k-tektronix-bsd* ) - machine=ns16000 opsys=bsd4-2 - ;; - ## Tektronix 4300 - ## src/m/tek4300.h hints that this is a m68k machine. - m68*-tektronix-bsd* ) - machine=tek4300 opsys=bsd4-3 - ;; - - ## Titan P2 or P3 - ## We seem to have lost the machine-description file titan.h! - titan-titan-sysv* ) - machine=titan opsys=usg5-3 - ;; - - ## Ustation E30 (SS5E) - m68*-unisys-uniplus* ) - machine=ustation opsystem=unipl5-2 - ;; - ## Vaxen. vax-dec-* ) machine=vax @@ -3121,18 +2746,6 @@ _ACEOF esac ;; - ## Whitechapel MG1 - ns16k-whitechapel-* ) - machine=mg1 - ## We don't know what sort of OS runs on these; we'll let the - ## operating system guessing code below try. - ;; - - ## Wicat - m68*-wicat-sysv* ) - machine=wicat opsys=usg5-2 - ;; - ## IA-64 ia64*-*-linux* ) machine=ia64 opsys=gnu-linux @@ -3146,25 +2759,7 @@ _ACEOF *-darwin* ) opsys=darwin CPP="${CC-cc} -E -no-cpp-precomp" ;; - *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;; - *-isc2.2* ) opsys=isc2-2 ;; - *-isc4.0* ) opsys=isc4-0 ;; - *-isc4.* ) opsys=isc4-1 - GCC_TEST_OPTIONS=-posix - NON_GCC_TEST_OPTIONS=-Xp - ;; - *-isc* ) opsys=isc3-0 ;; - *-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;; - *-esix* ) opsys=esix ;; - *-xenix* ) opsys=xenix ;; *-linux-gnu* ) opsys=gnu-linux ;; - *-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;; - *-sco3.2v5* ) opsys=sco5 - NON_GNU_CPP=/lib/cpp - # Prevent -belf from being passed to $CPP. - # /lib/cpp does not accept it. - OVERRIDE_CPPFLAGS=" " - ;; *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; @@ -3191,18 +2786,13 @@ _ACEOF RANLIB="ar -ts" ;; - ## UXP/V - f301-fujitsu-uxpv4.1) - machine=f301 opsys=uxpv - ;; - ## AMD x86-64 Linux-based GNU system x86_64-*-linux-gnu* ) machine=amdx86-64 opsys=gnu-linux ;; ## Tensilica Xtensa Linux-based GNU system - xtensa-*-linux-gnu* ) + xtensa*-*-linux-gnu* ) machine=xtensa opsys=gnu-linux ;; @@ -3249,6 +2839,30 @@ if test x"${opsys}" = x; then esac fi +### Tests for sytems that we beleive are obsolete and should be desupported. + +case "${machine}" in + pmax | hp9000s300 | ibm370aix | ncr386 | ews4800 | mips-siemens | powerpcle | tandem-s2 ) + echo "The system that you are configuring on: ${canonical} is considered to be obsolete" + echo "and it is planned to be desupported in the next version of Emacs" + echo "Please email emacs-devel@gnu.org as soon as possible if this system is still in use." + echo "The code is still functional, but you need to edit the 'configure' script and remove the" + echo "exit 33 line. After that you can run configure again and 'complete' the build." + exit 33 + ;; +esac + +case "${opsys}" in + bsd386 | bsdos2-1 | bsdos2 | bsdos3 | bsdos4 | bsd4-1 | bsd4-2 | bsd4-3 | usg5-0 | usg5-2-2 | usg5-2 | usg5-3 | ultrix4-3 | 386bsd | hpux | hpux8 | hpux9 | hpux9shr | hpux10 | hpux10-20 | aix3-1 | aix3-2-5 | aix3-2 | aix4-1 | nextstep | ux4800 | uxpds | uxpv ) + echo "The system that you are configuring on: ${canonical} is considered to be obsolete" + echo "and it is planned to be desupported in the next version of Emacs" + echo "Please email emacs-devel@gnu.org as soon as possible if this system is still in use." + echo "The code is still functional, but you need to edit the 'configure' script and remove the" + echo "'exit 44' line. After that you can run 'configure' again and complete the build." + exit 44 + ;; +esac + if test $unported = yes; then @@ -3269,11 +2883,6 @@ test -n "$CC" && cc_specified=yes # Save the value of CFLAGS that the user specified. SPECIFIED_CFLAGS="$CFLAGS" -case ${with_gcc} in - "yes" ) CC="gcc" GCC=yes ;; - "no" ) : ${CC=cc} ;; - * ) -esac ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5517,14 +5126,10 @@ configure___ c_switch_machine=C_SWITCH_MACHINE #define LIB_X11_LIB -lX11 #endif -#ifndef LIBX11_MACHINE -#define LIBX11_MACHINE -#endif - #ifndef LIBX11_SYSTEM #define LIBX11_SYSTEM #endif -configure___ LIBX=LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM +configure___ LIBX=LIB_X11_LIB LIBX11_SYSTEM #ifdef UNEXEC configure___ unexec=UNEXEC @@ -5973,14 +5578,14 @@ fi -### The standard library on x86-64 GNU/Linux distributions can +### The standard library on x86-64 and s390x GNU/Linux distributions can ### be located in either /usr/lib64 or /usr/lib. case "${canonical}" in - x86_64-*-linux-gnu* ) + x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) if test -d /usr/lib64; then cat >>confdefs.h <<\_ACEOF -#define HAVE_X86_64_LIB64_DIR 1 +#define HAVE_LIB64_DIR 1 _ACEOF fi @@ -6448,14 +6053,10 @@ fi ALSA_REQUIRED=1.0.0 ALSA_MODULES="alsa >= $ALSA_REQUIRED" - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi succeeded=no - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. + # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } @@ -6496,7 +6097,6 @@ echo "${ECHO_T}no" >&6; } fi - fi if test "$PKG_CONFIG" = "no" ; then HAVE_ALSA=no @@ -9640,7 +9240,7 @@ fi if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then if test "${with_carbon+set}" != set \ && test "${carbon_appdir_x+set}" != set; then - for var in with_x with_x_toolkit with_gtk with_xim \ + for var in with_x with_x_toolkit with_xim \ with_xpm with_jpeg with_tiff with_gif with_png; do if eval test \"\${$var+set}\" = set; then HAVE_CARBON=no @@ -9663,13 +9263,7 @@ case "${window_system}" in gtk ) with_gtk=yes USE_X_TOOLKIT=none ;; no ) USE_X_TOOLKIT=none ;; - * ) - if test x"$with_gtk" = xyes; then - USE_X_TOOLKIT=none - else - USE_X_TOOLKIT=maybe - fi - ;; + * ) USE_X_TOOLKIT=maybe ;; esac ;; mac | none ) @@ -9747,22 +9341,6 @@ case ${HAVE_X11} in yes ) HAVE_MENUS=yes ;; esac -if test "${opsys}" = "hpux9"; then - case "${x_libraries}" in - *X11R4* ) - opsysfile="s/hpux9-x11r4.h" - ;; - esac -fi - -if test "${opsys}" = "hpux9shr"; then - case "${x_libraries}" in - *X11R4* ) - opsysfile="s/hpux9shxr4.h" - ;; - esac -fi - ### Compute the unexec source name from the object name. UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`" @@ -10651,17 +10229,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for XFree86 in /usr/X386" >&5 -echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6; } -if test -d /usr/X386/include; then - HAVE_XFREE386=yes - : ${C_SWITCH_X_SITE="-I/usr/X386/include"} -else - HAVE_XFREE386=no -fi -{ echo "$as_me:$LINENO: result: $HAVE_XFREE386" >&5 -echo "${ECHO_T}$HAVE_XFREE386" >&6; } - case ${host_os} in aix*) @@ -11097,18 +10664,13 @@ fi HAVE_RSVG=no if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then if test "${with_rsvg}" != "no"; then - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi - RSVG_REQUIRED=2.0.0 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" succeeded=no - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. + # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } @@ -11149,7 +10711,6 @@ echo "${ECHO_T}no" >&6; } fi - fi if test "$PKG_CONFIG" = "no" ; then : @@ -11218,28 +10779,15 @@ fi HAVE_GTK=no -if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then - USE_X_TOOLKIT=none -fi -if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \ - test "$USE_X_TOOLKIT" = "maybe"; then - if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then - { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 -echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} - { (exit 1); exit 1; }; }; - fi +if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then GLIB_REQUIRED=2.6 GTK_REQUIRED=2.6 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi succeeded=no - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. + # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } @@ -11280,7 +10828,6 @@ echo "${ECHO_T}no" >&6; } fi - fi if test "$PKG_CONFIG" = "no" ; then pkg_check_gtk=no @@ -11455,6 +11002,19 @@ cat >>confdefs.h <<\_ACEOF _ACEOF USE_X_TOOLKIT=none + if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then + : + else + { echo "$as_me:$LINENO: WARNING: Your version of Gtk+ will have problems with + closing open displays. This is no problem if you just use + one display, but if you use more than one and close one of them + Emacs may crash." >&5 +echo "$as_me: WARNING: Your version of Gtk+ will have problems with + closing open displays. This is no problem if you just use + one display, but if you use more than one and close one of them + Emacs may crash." >&2;} + sleep 3 + fi fi fi @@ -11993,18 +11553,12 @@ _ACEOF fi fi -### Link with -lXft if available to work around a bug. -HAVE_XFT=maybe -if test "${HAVE_GTK}" = "yes"; then - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi - +HAVE_DBUS=no +if test "${with_dbus}" = "yes"; then succeeded=no - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. + # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } @@ -12045,40 +11599,39 @@ echo "${ECHO_T}no" >&6; } fi - fi if test "$PKG_CONFIG" = "no" ; then - HAVE_XFT=no + HAVE_DBUS=no else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for xft >= 0.13.0" >&5 -echo $ECHO_N "checking for xft >= 0.13.0... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for dbus-1 >= 1.0" >&5 +echo $ECHO_N "checking for dbus-1 >= 1.0... $ECHO_C" >&6; } - if $PKG_CONFIG --exists "xft >= 0.13.0" 2>&5; then + if $PKG_CONFIG --exists "dbus-1 >= 1.0" 2>&5; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } succeeded=yes - { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5 -echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; } - XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'` - { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5 -echo "${ECHO_T}$XFT_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking XFT_LIBS" >&5 -echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; } - XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'` - { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5 -echo "${ECHO_T}$XFT_LIBS" >&6; } + { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; } + DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +echo "${ECHO_T}$DBUS_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; } + DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +echo "${ECHO_T}$DBUS_LIBS" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - XFT_CFLAGS="" - XFT_LIBS="" + DBUS_CFLAGS="" + DBUS_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft >= 0.13.0"` + DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0"` fi @@ -12091,47 +11644,53 @@ echo "${ECHO_T}no" >&6; } fi if test $succeeded = yes; then - : + HAVE_DBUS=yes else - HAVE_XFT=no + HAVE_DBUS=no fi - if test "$HAVE_XFT" != no; then - OLD_CFLAGS="$CPPFLAGS" - OLD_CPPFLAGS="$CFLAGS" - OLD_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" - CFLAGS="$CFLAGS $XFT_CFLAGS" - LIBS="$XFT_LIBS $LIBS" - if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 -echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "$HAVE_DBUS" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DBUS 1 +_ACEOF + + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } + +HAVE_XAW3D=no +if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then + if test "$with_xaw3d" != no; then + { echo "$as_me:$LINENO: checking for xaw3d" >&5 +echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; } + if test "${emacs_cv_xaw3d+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include + +#include +#include +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -12140,120 +11699,54 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + emacs_cv_xaw3d=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + emacs_cv_xaw3d=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;} + else + emacs_cv_xaw3d=no + fi + if test $emacs_cv_xaw3d = yes; then + { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 +echo "${ECHO_T}yes; using Lucid toolkit" >&6; } + USE_X_TOOLKIT=LUCID + HAVE_XAW3D=yes - ;; -esac -{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 -echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_XAW3D 1 +_ACEOF -fi -if test $ac_cv_header_X11_Xft_Xft_h = yes; then - { echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5 -echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for libXaw" >&5 +echo $ECHO_N "checking for libXaw... $ECHO_C" >&6; } + if test "${emacs_cv_xaw+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXft $XFT_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XftFontOpen (); +#include +#include int main () { -return XftFontOpen (); + ; return 0; } @@ -12276,161 +11769,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xft_XftFontOpen=yes + emacs_cv_xaw=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xft_XftFontOpen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5 -echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6; } -if test $ac_cv_lib_Xft_XftFontOpen = yes; then - HAVE_XFT=yes -fi - -fi - - - - if test "${HAVE_XFT}" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XFT 1 -_ACEOF - - - C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS" - else - CFLAGS="$OLD_CPPFLAGS" - CFLAGS="$OLD_CFLAGS" - LIBS="$OLD_LIBS" - fi - fi -fi - -HAVE_XAW3D=no -if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then - if test "$with_xaw3d" != no; then - { echo "$as_me:$LINENO: checking for xaw3d" >&5 -echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; } - if test "${emacs_cv_xaw3d+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - emacs_cv_xaw3d=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - emacs_cv_xaw3d=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi - - else - emacs_cv_xaw3d=no - fi - if test $emacs_cv_xaw3d = yes; then - { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 -echo "${ECHO_T}yes; using Lucid toolkit" >&6; } - USE_X_TOOLKIT=LUCID - HAVE_XAW3D=yes - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XAW3D 1 -_ACEOF - - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: checking for libXaw" >&5 -echo $ECHO_N "checking for libXaw... $ECHO_C" >&6; } - if test "${emacs_cv_xaw+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - emacs_cv_xaw=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - emacs_cv_xaw=no + emacs_cv_xaw=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ @@ -12888,172 +12232,938 @@ fi -USE_TOOLKIT_SCROLL_BARS=no -if test "${with_toolkit_scroll_bars}" != "no"; then - if test "${USE_X_TOOLKIT}" != "none"; then - if test "${USE_X_TOOLKIT}" = "MOTIF"; then - cat >>confdefs.h <<\_ACEOF -#define USE_TOOLKIT_SCROLL_BARS 1 -_ACEOF +USE_TOOLKIT_SCROLL_BARS=no +if test "${with_toolkit_scroll_bars}" != "no"; then + if test "${USE_X_TOOLKIT}" != "none"; then + if test "${USE_X_TOOLKIT}" = "MOTIF"; then + cat >>confdefs.h <<\_ACEOF +#define USE_TOOLKIT_SCROLL_BARS 1 +_ACEOF + + HAVE_XAW3D=no + USE_TOOLKIT_SCROLL_BARS=yes + elif test "${HAVE_XAW3D}" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define USE_TOOLKIT_SCROLL_BARS 1 +_ACEOF + + USE_TOOLKIT_SCROLL_BARS=yes + fi + elif test "${HAVE_GTK}" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define USE_TOOLKIT_SCROLL_BARS 1 +_ACEOF + + USE_TOOLKIT_SCROLL_BARS=yes + elif test "${HAVE_CARBON}" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define USE_TOOLKIT_SCROLL_BARS 1 +_ACEOF + + USE_TOOLKIT_SCROLL_BARS=yes + fi +fi + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include +int +main () +{ +XIMProc callback; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + HAVE_XIM=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XIM 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + HAVE_XIM=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +if test "${with_xim}" != "no"; then + +cat >>confdefs.h <<\_ACEOF +#define USE_XIM 1 +_ACEOF + +fi + + +if test "${HAVE_XIM}" != "no"; then + late_CFLAGS=$CFLAGS + if test "$GCC" = yes; then + CFLAGS="$CFLAGS --pedantic-errors" + fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +int +main () +{ +Display *display; +XrmDatabase db; +char *res_name; +char *res_class; +XIMProc callback; +XPointer *client_data; +#ifndef __GNUC__ +/* If we're not using GCC, it's probably not XFree86, and this is + probably right, but we can't use something like --pedantic-errors. */ +extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*, + char*, XIMProc, XPointer*); +#endif +(void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback, + client_data); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + emacs_cv_arg6_star=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test "$emacs_cv_arg6_star" = yes; then + cat >>confdefs.h <<\_ACEOF +#define XRegisterIMInstantiateCallback_arg6 XPointer* +_ACEOF + + else + cat >>confdefs.h <<\_ACEOF +#define XRegisterIMInstantiateCallback_arg6 XPointer +_ACEOF + + fi + CFLAGS=$late_CFLAGS +fi + +### Start of font-backend section. +if test "${HAVE_X11}" != "yes"; then + USE_FONT_BACKEND=no +fi + +if test "${USE_FONT_BACKEND}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define USE_FONT_BACKEND 1 +_ACEOF + + + ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. + HAVE_XFT=maybe + if test "x${with_freetype}" = "xno"; then + with_xft="no"; + fi + if test "x${with_xft}" != "xno"; then + + + succeeded=no + + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + + if test "$PKG_CONFIG" = "no" ; then + HAVE_XFT=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for xft >= 0.13.0" >&5 +echo $ECHO_N "checking for xft >= 0.13.0... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "xft >= 0.13.0" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5 +echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; } + XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5 +echo "${ECHO_T}$XFT_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking XFT_LIBS" >&5 +echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; } + XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5 +echo "${ECHO_T}$XFT_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + XFT_CFLAGS="" + XFT_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft >= 0.13.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + HAVE_XFT=no + fi + + if test "$HAVE_XFT" != no; then + OLD_CPPFLAGS="$CPPFLAGS" + OLD_CFLAGS="$CFLAGS" + OLD_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" + CFLAGS="$CFLAGS $XFT_CFLAGS" + LIBS="$XFT_LIBS $LIBS" + if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then + { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } +if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 +echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 +echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } +if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } + +fi +if test $ac_cv_header_X11_Xft_Xft_h = yes; then + { echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5 +echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXft $XFT_LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XftFontOpen (); +int +main () +{ +return XftFontOpen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xft_XftFontOpen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xft_XftFontOpen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5 +echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6; } +if test $ac_cv_lib_Xft_XftFontOpen = yes; then + HAVE_XFT=yes +fi + +fi + + + + if test "${HAVE_XFT}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XFT 1 +_ACEOF + + + C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS" + else + CPPFLAGS="$OLD_CPPFLAGS" + CFLAGS="$OLD_CFLAGS" + LIBS="$OLD_LIBS" + fi # "${HAVE_XFT}" = "yes" + fi # "$HAVE_XFT" != no + fi # "x${with_xft}" != "xno" + + if test "$HAVE_XFT" != "yes"; then + HAVE_XFT=no + fi + + + HAVE_FREETYPE=no + ### Use -lfreetype if available, unless `--with-freetype=no'. + if test "${HAVE_XFT}" = "yes"; then + HAVE_FREETYPE=yes + elif test "x${with_freetype}" != "xno"; then + + + succeeded=no + + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + + if test "$PKG_CONFIG" = "no" ; then + HAVE_FREETYPE=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for freetype2" >&5 +echo $ECHO_N "checking for freetype2... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "freetype2" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 +echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6; } + FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 +echo "${ECHO_T}$FREETYPE_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 +echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6; } + FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 +echo "${ECHO_T}$FREETYPE_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + FREETYPE_CFLAGS="" + FREETYPE_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_FREETYPE=yes + else + HAVE_FREETYPE=no + fi + + if test "${HAVE_FREETYPE}" = "yes"; then + + succeeded=no + + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + + if test "$PKG_CONFIG" = "no" ; then + HAVE_FC=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for fontconfig" >&5 +echo $ECHO_N "checking for fontconfig... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "fontconfig" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking FONTCONFIG_CFLAGS" >&5 +echo $ECHO_N "checking FONTCONFIG_CFLAGS... $ECHO_C" >&6; } + FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $FONTCONFIG_CFLAGS" >&5 +echo "${ECHO_T}$FONTCONFIG_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5 +echo $ECHO_N "checking FONTCONFIG_LIBS... $ECHO_C" >&6; } + FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5 +echo "${ECHO_T}$FONTCONFIG_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + FONTCONFIG_CFLAGS="" + FONTCONFIG_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_FC=yes + else + HAVE_FC=no + fi + + if test "${HAVE_FC}" = "no"; then + HAVE_FREETYPE=no + fi + fi + fi + + HAVE_LIBOTF=no + if test "${HAVE_FREETYPE}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FREETYPE 1 +_ACEOF + + if test "${with_libotf}" != "no"; then + + succeeded=no + + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + + if test "$PKG_CONFIG" = "no" ; then + HAVE_LIBOTF=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for libotf" >&5 +echo $ECHO_N "checking for libotf... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "libotf" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking LIBOTF_CFLAGS" >&5 +echo $ECHO_N "checking LIBOTF_CFLAGS... $ECHO_C" >&6; } + LIBOTF_CFLAGS=`$PKG_CONFIG --cflags "libotf"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $LIBOTF_CFLAGS" >&5 +echo "${ECHO_T}$LIBOTF_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking LIBOTF_LIBS" >&5 +echo $ECHO_N "checking LIBOTF_LIBS... $ECHO_C" >&6; } + LIBOTF_LIBS=`$PKG_CONFIG --libs "libotf"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $LIBOTF_LIBS" >&5 +echo "${ECHO_T}$LIBOTF_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + LIBOTF_CFLAGS="" + LIBOTF_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBOTF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libotf"` + + fi + + - HAVE_XAW3D=no - USE_TOOLKIT_SCROLL_BARS=yes - elif test "${HAVE_XAW3D}" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define USE_TOOLKIT_SCROLL_BARS 1 + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_LIBOTF=yes + else + HAVE_LIBOTF=no + fi + + if test "$HAVE_LIBOTF" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBOTF 1 _ACEOF - USE_TOOLKIT_SCROLL_BARS=yes + fi fi - elif test "${HAVE_GTK}" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define USE_TOOLKIT_SCROLL_BARS 1 -_ACEOF + fi - USE_TOOLKIT_SCROLL_BARS=yes - elif test "${HAVE_CARBON}" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define USE_TOOLKIT_SCROLL_BARS 1 -_ACEOF + HAVE_M17N_FLT=no + if test "${with_m17n_flt}" != "no"; then - USE_TOOLKIT_SCROLL_BARS=yes + succeeded=no + + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - #include - #include -int -main () -{ -XIMProc callback; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - HAVE_XIM=yes -cat >>confdefs.h <<\_ACEOF -#define HAVE_XIM 1 -_ACEOF + if test "$PKG_CONFIG" = "no" ; then + HAVE_M17N_FLT=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for m17n-flt" >&5 +echo $ECHO_N "checking for m17n-flt... $ECHO_C" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if $PKG_CONFIG --exists "m17n-flt" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes - HAVE_XIM=no -fi + { echo "$as_me:$LINENO: checking M17N_FLT_CFLAGS" >&5 +echo $ECHO_N "checking M17N_FLT_CFLAGS... $ECHO_C" >&6; } + M17N_FLT_CFLAGS=`$PKG_CONFIG --cflags "m17n-flt"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $M17N_FLT_CFLAGS" >&5 +echo "${ECHO_T}$M17N_FLT_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking M17N_FLT_LIBS" >&5 +echo $ECHO_N "checking M17N_FLT_LIBS... $ECHO_C" >&6; } + M17N_FLT_LIBS=`$PKG_CONFIG --libs "m17n-flt"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $M17N_FLT_LIBS" >&5 +echo "${ECHO_T}$M17N_FLT_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + M17N_FLT_CFLAGS="" + M17N_FLT_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + M17N_FLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "m17n-flt"` -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -if test "${with_xim}" != "no"; then + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_M17N_FLT=yes + else + HAVE_M17N_FLT=no + fi + + if test "$HAVE_M17N_FLT" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define USE_XIM 1 +#define HAVE_M17N_FLT 1 _ACEOF -fi + fi + fi -if test "${HAVE_XIM}" != "no"; then - late_CFLAGS=$CFLAGS - if test "$GCC" = yes; then - CFLAGS="$CFLAGS --pedantic-errors" - fi - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -Display *display; -XrmDatabase db; -char *res_name; -char *res_class; -XIMProc callback; -XPointer *client_data; -#ifndef __GNUC__ -/* If we're not using GCC, it's probably not XFree86, and this is - probably right, but we can't use something like --pedantic-errors. */ -extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*, - char*, XIMProc, XPointer*); -#endif -(void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback, - client_data); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - emacs_cv_arg6_star=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$emacs_cv_arg6_star" = yes; then - cat >>confdefs.h <<\_ACEOF -#define XRegisterIMInstantiateCallback_arg6 XPointer* -_ACEOF - else - cat >>confdefs.h <<\_ACEOF -#define XRegisterIMInstantiateCallback_arg6 XPointer -_ACEOF - fi - CFLAGS=$late_CFLAGS -fi + +fi # "${USE_FONT_BACKEND}" = "yes" +### End of font-backend section. ### Use -lXpm if available, unless `--with-xpm=no'. HAVE_XPM=no @@ -23716,13 +23826,6 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_X11 1 _ACEOF -fi -if test "${HAVE_XFREE386}" = "yes" ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XFREE386 1 -_ACEOF - fi if test "${HAVE_MENUS}" = "yes" ; then @@ -23791,15 +23894,30 @@ echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_ 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 if test $USE_XASSERTS = yes; then echo " Compiling with asserts turned on." CPPFLAGS="$CPPFLAGS -DXASSERTS=1" - echo fi +if test $USE_SYNC_INPUT = yes; then + echo " Compiling with sync input." + CPPFLAGS="$CPPFLAGS -DSYNC_INPUT=1" +fi + +echo + if test "$USE_X_TOOLKIT" = GTK; then case "$canonical" in *cygwin*) @@ -23819,6 +23937,11 @@ Read the emacs-devel archives for more information." echo fi +if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then + echo "D-Bus integration has been tested for GNU/Linux only." + echo +fi + # Remove any trailing slashes in these variables. test "${prefix}" != NONE && @@ -24248,7 +24371,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by emacs $as_me 23.0.50, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24301,7 +24424,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +emacs config.status 23.0.50 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -24565,8 +24688,18 @@ RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim RSVG_LIBS!$RSVG_LIBS$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim GTK_LIBS!$GTK_LIBS$ac_delim +DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim +DBUS_LIBS!$DBUS_LIBS$ac_delim XFT_CFLAGS!$XFT_CFLAGS$ac_delim XFT_LIBS!$XFT_LIBS$ac_delim +FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim +FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim +FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim +FONTCONFIG_LIBS!$FONTCONFIG_LIBS$ac_delim +LIBOTF_CFLAGS!$LIBOTF_CFLAGS$ac_delim +LIBOTF_LIBS!$LIBOTF_LIBS$ac_delim +M17N_FLT_CFLAGS!$M17N_FLT_CFLAGS$ac_delim +M17N_FLT_LIBS!$M17N_FLT_LIBS$ac_delim ALLOCA!$ALLOCA$ac_delim liblockfile!$liblockfile$ac_delim LIBOBJS!$LIBOBJS$ac_delim @@ -24576,16 +24709,6 @@ GETLOADAVG_LIBS!$GETLOADAVG_LIBS$ac_delim GETOPT_H!$GETOPT_H$ac_delim GETOPTOBJS!$GETOPTOBJS$ac_delim version!$version$ac_delim -configuration!$configuration$ac_delim -canonical!$canonical$ac_delim -srcdir!$srcdir$ac_delim -lispdir!$lispdir$ac_delim -locallisppath!$locallisppath$ac_delim -lisppath!$lisppath$ac_delim -x_default_search_path!$x_default_search_path$ac_delim -etcdir!$etcdir$ac_delim -archlibdir!$archlibdir$ac_delim -bitmapdir!$bitmapdir$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -24627,6 +24750,16 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +configuration!$configuration$ac_delim +canonical!$canonical$ac_delim +srcdir!$srcdir$ac_delim +lispdir!$lispdir$ac_delim +locallisppath!$locallisppath$ac_delim +lisppath!$lisppath$ac_delim +x_default_search_path!$x_default_search_path$ac_delim +etcdir!$etcdir$ac_delim +archlibdir!$archlibdir$ac_delim +bitmapdir!$bitmapdir$ac_delim gamedir!$gamedir$ac_delim gameuser!$gameuser$ac_delim c_switch_system!$c_switch_system$ac_delim @@ -24641,7 +24774,7 @@ carbon_appdir!$carbon_appdir$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -25100,6 +25233,11 @@ echo creating src/Makefile sed -e '1,/start of cpp stuff/d'\ -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 | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new