Mercurial > emacs

comparison configure @ 83560:738ce3540ffb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Karoly Lorentey <karoly@lorentey.hu>
date Sun, 22 Apr 2007 12:12:29 +0000
parents edf631bdbb7a 5479380913c9
children dc002877ce12
comparison
equal deleted inserted replaced
83559:edf631bdbb7a 83560:738ce3540ffb
1837 1837
1838 1838
1839 1839
1840 # Check whether --with-kerberos was given. 1840 # Check whether --with-kerberos was given.
1841 if test "${with_kerberos+set}" = set; then 1841 if test "${with_kerberos+set}" = set; then
1842 withval=$with_kerberos; cat >>confdefs.h <<\_ACEOF 1842 withval=$with_kerberos; if test "$withval" = yes; then
1843 cat >>confdefs.h <<\_ACEOF
1843 #define KERBEROS 1 1844 #define KERBEROS 1
1844 _ACEOF 1845 _ACEOF
1845 1846
1847 fi
1846 fi 1848 fi
1847 1849
1848 1850
1849 1851
1850 # Check whether --with-kerberos5 was given. 1852 # Check whether --with-kerberos5 was given.
1855 cat >>confdefs.h <<\_ACEOF 1857 cat >>confdefs.h <<\_ACEOF
1856 #define KERBEROS 1 1858 #define KERBEROS 1
1857 _ACEOF 1859 _ACEOF
1858 1860
1859 fi 1861 fi
1860 fi
1861 1862
1862 cat >>confdefs.h <<\_ACEOF 1863 cat >>confdefs.h <<\_ACEOF
1863 #define KERBEROS5 1 1864 #define KERBEROS5 1
1864 _ACEOF 1865 _ACEOF
1865 1866
1866 fi 1867 fi
1868 fi
1867 1869
1868 1870
1869 # Check whether --with-hesiod was given. 1871 # Check whether --with-hesiod was given.
1870 if test "${with_hesiod+set}" = set; then 1872 if test "${with_hesiod+set}" = set; then
1871 withval=$with_hesiod; 1873 withval=$with_hesiod; if test "$withval" = yes; then
1874
1872 cat >>confdefs.h <<\_ACEOF 1875 cat >>confdefs.h <<\_ACEOF
1873 #define HESIOD 1 1876 #define HESIOD 1
1874 _ACEOF 1877 _ACEOF
1875 1878
1879 fi
1876 fi 1880 fi
1877 1881
1878 1882
1879 1883
1880 # Check whether --with-sound was given. 1884 # Check whether --with-sound was given.
2243 ## OpenBSD ports 2247 ## OpenBSD ports
2244 *-*-openbsd* ) 2248 *-*-openbsd* )
2245 opsys=openbsd 2249 opsys=openbsd
2246 case "${canonical}" in 2250 case "${canonical}" in
2247 alpha*-*-openbsd*) machine=alpha ;; 2251 alpha*-*-openbsd*) machine=alpha ;;
2252 arm-*-openbsd*) machine=arm ;;
2253 hppa-*-openbsd*) machine=hp9000s300 ;;
2254 i386-*-openbsd*) machine=intel386 ;;
2255 m68k-*-openbsd*) machine=hp9000s300 ;;
2256 m88k-*-openbsd*) machine=aviion ;;
2257 mips64-*-openbsd*) machine=mips64 ;;
2258 powerpc-*-openbsd*) machine=macppc ;;
2259 sh-*-openbsd*) machine=sh3el ;;
2260 sparc*-*-openbsd*) machine=sparc ;;
2261 vax-*-openbsd*) machine=vax ;;
2262 x86_64-*-openbsd*) machine=amdx86-64 ;;
2248 i386-*-openbsd*) machine=intel386 ;; 2263 i386-*-openbsd*) machine=intel386 ;;
2249 x86_64-*-openbsd*) machine=amdx86-64 ;; 2264 x86_64-*-openbsd*) machine=amdx86-64 ;;
2250 m68k-*-openbsd*) machine=hp9000s300 ;; 2265 m68k-*-openbsd*) machine=hp9000s300 ;;
2251 mipsel-*-openbsd*) machine=pmax ;; 2266 mipsel-*-openbsd*) machine=pmax ;;
2252 ns32k-*-openbsd*) machine=ns32000 ;; 2267 ns32k-*-openbsd*) machine=ns32000 ;;
11737 HAVE_XFT=no 11752 HAVE_XFT=no
11738 fi 11753 fi
11739 11754
11740 if test "$HAVE_XFT" != no; then 11755 if test "$HAVE_XFT" != no; then
11741 OLD_CFLAGS="$CPPFLAGS" 11756 OLD_CFLAGS="$CPPFLAGS"
11742 OLD_CFLAGS="$CFLAGS" 11757 OLD_CPPFLAGS="$CFLAGS"
11743 OLD_LIBS="$LIBS" 11758 OLD_LIBS="$LIBS"
11744 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" 11759 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
11745 CFLAGS="$CFLAGS $XFT_CFLAGS" 11760 CFLAGS="$CFLAGS $XFT_CFLAGS"
11746 LIBS="$XFT_LIBS $LIBS" 11761 LIBS="$XFT_LIBS $LIBS"
11747 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then 11762 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
23049 23064
23050 if test $USE_XASSERTS = yes; then 23065 if test $USE_XASSERTS = yes; then
23051 echo " Compiling with asserts turned on." 23066 echo " Compiling with asserts turned on."
23052 CPPFLAGS="$CPPFLAGS -DXASSERTS=1" 23067 CPPFLAGS="$CPPFLAGS -DXASSERTS=1"
23053 echo 23068 echo
23069 fi
23070
23071 if test "$USE_X_TOOLKIT" = GTK; then
23072 case "$canonical" in
23073 *cygwin*)
23074 echo "There are known problems with Emacs and Gtk+ on cygwin, so you
23075 will probably get a crash on startup. If this happens, please use another
23076 toolkit for Emacs. See etc/PROBLEMS for more information."
23077 ;;
23078 esac
23054 fi 23079 fi
23055 23080
23056 23081
23057 23082
23058 # Remove any trailing slashes in these variables. 23083 # Remove any trailing slashes in these variables.