Mercurial > emacs
comparison configure.in @ 112404:2b0d6f7bbb80
Merge: src/config.in: shrink slightly
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 21 Jan 2011 16:13:42 -0800 |
parents | c81ff7082a9a |
children | 7aa0a7abfb6d |
comparison
equal
deleted
inserted
replaced
112401:e80422318be4 | 112404:2b0d6f7bbb80 |
---|---|
875 sol2-10) | 875 sol2-10) |
876 # Use the Solaris dldump() function, called from unexsol.c, to dump | 876 # Use the Solaris dldump() function, called from unexsol.c, to dump |
877 # emacs, instead of the generic ELF dump code found in unexelf.c. | 877 # emacs, instead of the generic ELF dump code found in unexelf.c. |
878 # The resulting binary has a complete symbol table, and is better | 878 # The resulting binary has a complete symbol table, and is better |
879 # for debugging and other observability tools (debuggers, pstack, etc). | 879 # for debugging and other observability tools (debuggers, pstack, etc). |
880 # | 880 # |
881 # If you encounter a problem using dldump(), please consider sending | 881 # If you encounter a problem using dldump(), please consider sending |
882 # a message to the OpenSolaris tools-linking mailing list: | 882 # a message to the OpenSolaris tools-linking mailing list: |
883 # http://mail.opensolaris.org/mailman/listinfo/tools-linking | 883 # http://mail.opensolaris.org/mailman/listinfo/tools-linking |
884 # | 884 # |
885 # It is likely that dldump() works with older Solaris too, but this has | 885 # It is likely that dldump() works with older Solaris too, but this has |
886 # not been tested, so for now this change is for Solaris 10 or newer. | 886 # not been tested, so for now this change is for Solaris 10 or newer. |
887 UNEXEC_OBJ=unexsol.o | 887 UNEXEC_OBJ=unexsol.o |
888 ;; | 888 ;; |
889 esac | 889 esac |
946 C_SWITCH_MACHINE="-fno-common" | 946 C_SWITCH_MACHINE="-fno-common" |
947 else | 947 else |
948 AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.]) | 948 AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.]) |
949 fi | 949 fi |
950 else | 950 else |
951 UNEXEC_OBJ=unexalpha.o | 951 UNEXEC_OBJ=unexalpha.o |
952 fi | 952 fi |
953 fi | 953 fi |
954 AC_SUBST(C_SWITCH_MACHINE) | 954 AC_SUBST(C_SWITCH_MACHINE) |
955 | 955 |
956 AC_SUBST(UNEXEC_OBJ) | 956 AC_SUBST(UNEXEC_OBJ) |
1128 ]) | 1128 ]) |
1129 | 1129 |
1130 | 1130 |
1131 if test "${with_sound}" != "no"; then | 1131 if test "${with_sound}" != "no"; then |
1132 # Sound support for GNU/Linux and the free BSDs. | 1132 # Sound support for GNU/Linux and the free BSDs. |
1133 AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h, | 1133 AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h, |
1134 have_sound_header=yes) | 1134 have_sound_header=yes) |
1135 # Emulation library used on NetBSD. | 1135 # Emulation library used on NetBSD. |
1136 AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) | 1136 AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) |
1137 AC_SUBST(LIBSOUND) | 1137 AC_SUBST(LIBSOUND) |
1138 | 1138 |
1815 if test "${with_imagemagick}" != "no"; then | 1815 if test "${with_imagemagick}" != "no"; then |
1816 IMAGEMAGICK_MODULE="Wand" | 1816 IMAGEMAGICK_MODULE="Wand" |
1817 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) | 1817 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) |
1818 AC_SUBST(IMAGEMAGICK_CFLAGS) | 1818 AC_SUBST(IMAGEMAGICK_CFLAGS) |
1819 AC_SUBST(IMAGEMAGICK_LIBS) | 1819 AC_SUBST(IMAGEMAGICK_LIBS) |
1820 | 1820 |
1821 if test $HAVE_IMAGEMAGICK = yes; then | 1821 if test $HAVE_IMAGEMAGICK = yes; then |
1822 AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) | 1822 AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) |
1823 CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" | 1823 CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" |
1824 LIBS="$IMAGEMAGICK_LIBS $LIBS" | 1824 LIBS="$IMAGEMAGICK_LIBS $LIBS" |
1825 AC_CHECK_FUNCS(MagickExportImagePixels) | 1825 AC_CHECK_FUNCS(MagickExportImagePixels) |
2668 AC_FUNC_FSEEKO | 2668 AC_FUNC_FSEEKO |
2669 | 2669 |
2670 AC_FUNC_GETPGRP | 2670 AC_FUNC_GETPGRP |
2671 | 2671 |
2672 # Configure gnulib. | 2672 # Configure gnulib. |
2673 gl_ASSERT_NO_GNULIB_TESTS | |
2673 gl_INIT | 2674 gl_INIT |
2674 | 2675 |
2675 AC_FUNC_STRFTIME | 2676 AC_FUNC_STRFTIME |
2676 | 2677 |
2677 # UNIX98 PTYs. | 2678 # UNIX98 PTYs. |
3239 OLDXMENU_DEPS= | 3240 OLDXMENU_DEPS= |
3240 fi | 3241 fi |
3241 | 3242 |
3242 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then | 3243 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then |
3243 OLDXMENU_TARGET= | 3244 OLDXMENU_TARGET= |
3244 OLDXMENU=nothing | 3245 OLDXMENU=nothing |
3245 LIBXMENU= | 3246 LIBXMENU= |
3246 OLDXMENU_DEPS= | 3247 OLDXMENU_DEPS= |
3247 fi | 3248 fi |
3248 | 3249 |
3249 AC_SUBST(OLDXMENU_TARGET) | 3250 AC_SUBST(OLDXMENU_TARGET) |
3303 else | 3304 else |
3304 libs_nsgui= | 3305 libs_nsgui= |
3305 headerpad_extra=690 | 3306 headerpad_extra=690 |
3306 fi | 3307 fi |
3307 LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra" | 3308 LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra" |
3308 | 3309 |
3309 ## This is here because src/Makefile.in did some extra fiddling around | 3310 ## This is here because src/Makefile.in did some extra fiddling around |
3310 ## with LD_SWITCH_SYSTEM. The cpp logic was: | 3311 ## with LD_SWITCH_SYSTEM. The cpp logic was: |
3311 ## #ifndef LD_SWITCH_SYSTEM | 3312 ## #ifndef LD_SWITCH_SYSTEM |
3312 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF))) | 3313 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF))) |
3313 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to: | 3314 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to: |