Mercurial > emacs
comparison configure.in @ 108128:1e7aaadc50e8
Reduce CPP usage.
* Makefile.in (LIB_X11_LIB): Remove, inline in the only user.
(obj): Use autoconf for unexec instead of cpp.
* configure.in (LIB_X11_LIB): Remove, inline in the only user.
(unexec): Define unconditionally, all platforms define
UNEXEC. AC_SUBST it.
(UNEXEC_SRC): Remove, unused.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 26 Apr 2010 20:47:47 -0700 |
| parents | 4daf18b3d6e8 |
| children | e272dbe64cda |
comparison
equal
deleted
inserted
replaced
| 108127:4daf18b3d6e8 | 108128:1e7aaadc50e8 |
|---|---|
| 877 #endif | 877 #endif |
| 878 configure___ libsrc_libs=LIBS_SYSTEM | 878 configure___ libsrc_libs=LIBS_SYSTEM |
| 879 configure___ c_switch_system=C_SWITCH_SYSTEM | 879 configure___ c_switch_system=C_SWITCH_SYSTEM |
| 880 configure___ c_switch_machine=C_SWITCH_MACHINE | 880 configure___ c_switch_machine=C_SWITCH_MACHINE |
| 881 | 881 |
| 882 #ifndef LIB_X11_LIB | 882 configure___ LIBX=-lX11 |
| 883 #define LIB_X11_LIB -lX11 | 883 |
| 884 #endif | |
| 885 | |
| 886 configure___ LIBX=LIB_X11_LIB | |
| 887 | |
| 888 #ifdef UNEXEC | |
| 889 configure___ unexec=UNEXEC | 884 configure___ unexec=UNEXEC |
| 890 #else | |
| 891 configure___ unexec=unexec.o | |
| 892 #endif | |
| 893 | 885 |
| 894 #ifdef SYSTEM_MALLOC | 886 #ifdef SYSTEM_MALLOC |
| 895 configure___ system_malloc=yes | 887 configure___ system_malloc=yes |
| 896 #else | 888 #else |
| 897 configure___ system_malloc=no | 889 configure___ system_malloc=no |
| 2765 AC_SUBST(bitmapdir) | 2757 AC_SUBST(bitmapdir) |
| 2766 AC_SUBST(gamedir) | 2758 AC_SUBST(gamedir) |
| 2767 AC_SUBST(gameuser) | 2759 AC_SUBST(gameuser) |
| 2768 AC_SUBST(c_switch_system) | 2760 AC_SUBST(c_switch_system) |
| 2769 AC_SUBST(c_switch_machine) | 2761 AC_SUBST(c_switch_machine) |
| 2762 AC_SUBST(unexec) | |
| 2770 AC_SUBST(LD_SWITCH_X_SITE) | 2763 AC_SUBST(LD_SWITCH_X_SITE) |
| 2771 AC_SUBST(LD_SWITCH_X_SITE_AUX) | 2764 AC_SUBST(LD_SWITCH_X_SITE_AUX) |
| 2772 AC_SUBST(C_SWITCH_X_SITE) | 2765 AC_SUBST(C_SWITCH_X_SITE) |
| 2773 AC_SUBST(CFLAGS) | 2766 AC_SUBST(CFLAGS) |
| 2774 AC_SUBST(X_TOOLKIT_TYPE) | 2767 AC_SUBST(X_TOOLKIT_TYPE) |
| 2807 [Define C_SWITCH_X_SITE to contain any special flags your compiler | 2800 [Define C_SWITCH_X_SITE to contain any special flags your compiler |
| 2808 may need to deal with X Windows. For instance, if you've defined | 2801 may need to deal with X Windows. For instance, if you've defined |
| 2809 HAVE_X_WINDOWS above and your X include files aren't in a place | 2802 HAVE_X_WINDOWS above and your X include files aren't in a place |
| 2810 that your compiler can find on its own, you might want to add | 2803 that your compiler can find on its own, you might want to add |
| 2811 "-I/..." or something similar.]) | 2804 "-I/..." or something similar.]) |
| 2812 AC_DEFINE_UNQUOTED(UNEXEC_SRC, ${UNEXEC_SRC}, | |
| 2813 [Define to the unexec source file name.]) | |
| 2814 | 2805 |
| 2815 XMENU_OBJ= | 2806 XMENU_OBJ= |
| 2816 XOBJ= | 2807 XOBJ= |
| 2817 if test "${HAVE_X_WINDOWS}" = "yes" ; then | 2808 if test "${HAVE_X_WINDOWS}" = "yes" ; then |
| 2818 AC_DEFINE(HAVE_X_WINDOWS, 1, | 2809 AC_DEFINE(HAVE_X_WINDOWS, 1, |