Mercurial > emacs
comparison configure @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 21 Mar 2007 13:33:07 +0000 |
parents | dd7c098af727 5479380913c9 |
children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
90788:a12805fdabe8 | 90789:c0409ee15cee |
---|---|
1847 | 1847 |
1848 | 1848 |
1849 | 1849 |
1850 # Check whether --with-kerberos was given. | 1850 # Check whether --with-kerberos was given. |
1851 if test "${with_kerberos+set}" = set; then | 1851 if test "${with_kerberos+set}" = set; then |
1852 withval=$with_kerberos; cat >>confdefs.h <<\_ACEOF | 1852 withval=$with_kerberos; if test "$withval" = yes; then |
1853 cat >>confdefs.h <<\_ACEOF | |
1853 #define KERBEROS 1 | 1854 #define KERBEROS 1 |
1854 _ACEOF | 1855 _ACEOF |
1855 | 1856 |
1857 fi | |
1856 fi | 1858 fi |
1857 | 1859 |
1858 | 1860 |
1859 | 1861 |
1860 # Check whether --with-kerberos5 was given. | 1862 # Check whether --with-kerberos5 was given. |
1865 cat >>confdefs.h <<\_ACEOF | 1867 cat >>confdefs.h <<\_ACEOF |
1866 #define KERBEROS 1 | 1868 #define KERBEROS 1 |
1867 _ACEOF | 1869 _ACEOF |
1868 | 1870 |
1869 fi | 1871 fi |
1870 fi | |
1871 | 1872 |
1872 cat >>confdefs.h <<\_ACEOF | 1873 cat >>confdefs.h <<\_ACEOF |
1873 #define KERBEROS5 1 | 1874 #define KERBEROS5 1 |
1874 _ACEOF | 1875 _ACEOF |
1875 | 1876 |
1876 fi | 1877 fi |
1878 fi | |
1877 | 1879 |
1878 | 1880 |
1879 # Check whether --with-hesiod was given. | 1881 # Check whether --with-hesiod was given. |
1880 if test "${with_hesiod+set}" = set; then | 1882 if test "${with_hesiod+set}" = set; then |
1881 withval=$with_hesiod; | 1883 withval=$with_hesiod; if test "$withval" = yes; then |
1884 | |
1882 cat >>confdefs.h <<\_ACEOF | 1885 cat >>confdefs.h <<\_ACEOF |
1883 #define HESIOD 1 | 1886 #define HESIOD 1 |
1884 _ACEOF | 1887 _ACEOF |
1885 | 1888 |
1889 fi | |
1886 fi | 1890 fi |
1887 | 1891 |
1888 | 1892 |
1889 | 1893 |
1890 # Check whether --with-sound was given. | 1894 # Check whether --with-sound was given. |
2273 ## OpenBSD ports | 2277 ## OpenBSD ports |
2274 *-*-openbsd* ) | 2278 *-*-openbsd* ) |
2275 opsys=openbsd | 2279 opsys=openbsd |
2276 case "${canonical}" in | 2280 case "${canonical}" in |
2277 alpha*-*-openbsd*) machine=alpha ;; | 2281 alpha*-*-openbsd*) machine=alpha ;; |
2282 arm-*-openbsd*) machine=arm ;; | |
2283 hppa-*-openbsd*) machine=hp9000s300 ;; | |
2284 i386-*-openbsd*) machine=intel386 ;; | |
2285 m68k-*-openbsd*) machine=hp9000s300 ;; | |
2286 m88k-*-openbsd*) machine=aviion ;; | |
2287 mips64-*-openbsd*) machine=mips64 ;; | |
2288 powerpc-*-openbsd*) machine=macppc ;; | |
2289 sh-*-openbsd*) machine=sh3el ;; | |
2290 sparc*-*-openbsd*) machine=sparc ;; | |
2291 vax-*-openbsd*) machine=vax ;; | |
2292 x86_64-*-openbsd*) machine=amdx86-64 ;; | |
2278 i386-*-openbsd*) machine=intel386 ;; | 2293 i386-*-openbsd*) machine=intel386 ;; |
2279 x86_64-*-openbsd*) machine=amdx86-64 ;; | 2294 x86_64-*-openbsd*) machine=amdx86-64 ;; |
2280 m68k-*-openbsd*) machine=hp9000s300 ;; | 2295 m68k-*-openbsd*) machine=hp9000s300 ;; |
2281 mipsel-*-openbsd*) machine=pmax ;; | 2296 mipsel-*-openbsd*) machine=pmax ;; |
2282 ns32k-*-openbsd*) machine=ns32000 ;; | 2297 ns32k-*-openbsd*) machine=ns32000 ;; |
23360 | 23375 |
23361 if test $USE_XASSERTS = yes; then | 23376 if test $USE_XASSERTS = yes; then |
23362 echo " Compiling with asserts turned on." | 23377 echo " Compiling with asserts turned on." |
23363 CPPFLAGS="$CPPFLAGS -DXASSERTS=1" | 23378 CPPFLAGS="$CPPFLAGS -DXASSERTS=1" |
23364 echo | 23379 echo |
23380 fi | |
23381 | |
23382 if test "$USE_X_TOOLKIT" = GTK; then | |
23383 case "$canonical" in | |
23384 *cygwin*) | |
23385 echo "There are known problems with Emacs and Gtk+ on cygwin, so you | |
23386 will probably get a crash on startup. If this happens, please use another | |
23387 toolkit for Emacs. See etc/PROBLEMS for more information." | |
23388 ;; | |
23389 esac | |
23365 fi | 23390 fi |
23366 | 23391 |
23367 | 23392 |
23368 | 23393 |
23369 # Remove any trailing slashes in these variables. | 23394 # Remove any trailing slashes in these variables. |