diff options
| author | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
|---|---|---|
| committer | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
| commit | e18c709364b095ea0be8ecabe458ac9a642a252f (patch) | |
| tree | efe814a842f932f387b3947c572bf43a548d17ef /configure | |
| parent | 81088e260b086fe28f36964f32b6338210ec6fd8 (diff) | |
| parent | 9f25e707aaad5ed14a9448e9c5d345ff0bdbc5a7 (diff) | |
| download | emacs-e18c709364b095ea0be8ecabe458ac9a642a252f.tar.gz | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-660
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-662
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-663
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-664
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-665
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* emacs@sv.gnu.org/emacs--devo--0--patch-667
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-668
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-670
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-671
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-672
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-673
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/configure b/configure index 9338f859b6f..2ea6ff80b0d 100755 --- a/configure +++ b/configure @@ -1839,11 +1839,13 @@ fi # Check whether --with-kerberos was given. if test "${with_kerberos+set}" = set; then - withval=$with_kerberos; cat >>confdefs.h <<\_ACEOF + withval=$with_kerberos; if test "$withval" = yes; then + cat >>confdefs.h <<\_ACEOF #define KERBEROS 1 _ACEOF fi +fi @@ -1857,23 +1859,25 @@ if test "${with_kerberos5+set}" = set; then _ACEOF fi -fi cat >>confdefs.h <<\_ACEOF #define KERBEROS5 1 _ACEOF fi +fi # Check whether --with-hesiod was given. if test "${with_hesiod+set}" = set; then - withval=$with_hesiod; + withval=$with_hesiod; if test "$withval" = yes; then + cat >>confdefs.h <<\_ACEOF #define HESIOD 1 _ACEOF fi +fi @@ -2245,6 +2249,17 @@ _ACEOF opsys=openbsd case "${canonical}" in alpha*-*-openbsd*) machine=alpha ;; + arm-*-openbsd*) machine=arm ;; + 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 ;; i386-*-openbsd*) machine=intel386 ;; x86_64-*-openbsd*) machine=amdx86-64 ;; m68k-*-openbsd*) machine=hp9000s300 ;; @@ -11739,7 +11754,7 @@ echo "${ECHO_T}no" >&6; } if test "$HAVE_XFT" != no; then OLD_CFLAGS="$CPPFLAGS" - OLD_CFLAGS="$CFLAGS" + OLD_CPPFLAGS="$CFLAGS" OLD_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" CFLAGS="$CFLAGS $XFT_CFLAGS" @@ -23053,6 +23068,16 @@ if test $USE_XASSERTS = yes; then echo fi +if test "$USE_X_TOOLKIT" = GTK; then + case "$canonical" in + *cygwin*) + echo "There are known problems with Emacs and Gtk+ on cygwin, so you + will probably get a crash on startup. If this happens, please use another + toolkit for Emacs. See etc/PROBLEMS for more information." + ;; + esac +fi + # Remove any trailing slashes in these variables. |