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.
This commit is contained in:
Dan Nicolaescu
parent
8ea5f2d92f
commit
aaa36002be
6 changed files with 3311 additions and 15778 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2010-04-27 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
Reduce CPP usage.
|
||||
* 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.
|
||||
|
||||
2010-04-27 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* configure.in (HAVE_MOTIF_2_1, HAVE_LIBXP): Remove unused AC_DEFINEs,
|
||||
|
|
|
|||
13
configure.in
13
configure.in
|
|
@ -879,17 +879,9 @@ configure___ libsrc_libs=LIBS_SYSTEM
|
|||
configure___ c_switch_system=C_SWITCH_SYSTEM
|
||||
configure___ c_switch_machine=C_SWITCH_MACHINE
|
||||
|
||||
#ifndef LIB_X11_LIB
|
||||
#define LIB_X11_LIB -lX11
|
||||
#endif
|
||||
configure___ LIBX=-lX11
|
||||
|
||||
configure___ LIBX=LIB_X11_LIB
|
||||
|
||||
#ifdef UNEXEC
|
||||
configure___ unexec=UNEXEC
|
||||
#else
|
||||
configure___ unexec=unexec.o
|
||||
#endif
|
||||
|
||||
#ifdef SYSTEM_MALLOC
|
||||
configure___ system_malloc=yes
|
||||
|
|
@ -2767,6 +2759,7 @@ AC_SUBST(gamedir)
|
|||
AC_SUBST(gameuser)
|
||||
AC_SUBST(c_switch_system)
|
||||
AC_SUBST(c_switch_machine)
|
||||
AC_SUBST(unexec)
|
||||
AC_SUBST(LD_SWITCH_X_SITE)
|
||||
AC_SUBST(LD_SWITCH_X_SITE_AUX)
|
||||
AC_SUBST(C_SWITCH_X_SITE)
|
||||
|
|
@ -2809,8 +2802,6 @@ AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE},
|
|||
HAVE_X_WINDOWS above and your X include files aren't in a place
|
||||
that your compiler can find on its own, you might want to add
|
||||
"-I/..." or something similar.])
|
||||
AC_DEFINE_UNQUOTED(UNEXEC_SRC, ${UNEXEC_SRC},
|
||||
[Define to the unexec source file name.])
|
||||
|
||||
XMENU_OBJ=
|
||||
XOBJ=
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2010-04-27 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
Reduce CPP usage.
|
||||
* Makefile.in (LIB_X11_LIB): Remove, inline in the only user.
|
||||
(obj): Use autoconf for unexec instead of cpp.
|
||||
|
||||
2010-04-27 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* m/amdx86-64.h (START_FILES, LIB_STANDARD): Change the logic around,
|
||||
|
|
|
|||
|
|
@ -252,10 +252,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
|
|||
#endif
|
||||
$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
|
||||
|
||||
#ifndef LIB_X11_LIB
|
||||
#define LIB_X11_LIB -lX11
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_X_WINDOWS
|
||||
#ifdef HAVE_MENUS
|
||||
|
||||
|
|
@ -318,7 +314,7 @@ LIBXT=$(LIBW) $(LIBXSM)
|
|||
/* LD_SWITCH_X_DEFAULT comes after everything else that specifies
|
||||
options for where to find X libraries, but before those libraries. */
|
||||
X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
|
||||
LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB $(XFT_LIBS)
|
||||
LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS)
|
||||
#else /* not HAVE_X11 */
|
||||
LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
|
||||
#endif /* not HAVE_X11 */
|
||||
|
|
@ -438,7 +434,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
|
|||
cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
|
||||
alloc.o data.o doc.o editfns.o callint.o \
|
||||
eval.o floatfns.o fns.o font.o print.o lread.o \
|
||||
syntax.o UNEXEC bytecode.o \
|
||||
syntax.o @unexec@ bytecode.o \
|
||||
process.o callproc.o \
|
||||
region-cache.o sound.o atimer.o \
|
||||
doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
|
||||
|
|
|
|||
|
|
@ -318,10 +318,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Define to 1 if you have the <kerberos/krb.h> header file. */
|
||||
#undef HAVE_KERBEROS_KRB_H
|
||||
|
||||
/* Define to 1 if `e_text' is member of `krb5_error'. */
|
||||
/* Define to 1 if `e_text' is a member of `krb5_error'. */
|
||||
#undef HAVE_KRB5_ERROR_E_TEXT
|
||||
|
||||
/* Define to 1 if `text' is member of `krb5_error'. */
|
||||
/* Define to 1 if `text' is a member of `krb5_error'. */
|
||||
#undef HAVE_KRB5_ERROR_TEXT
|
||||
|
||||
/* Define to 1 if you have the <krb5.h> header file. */
|
||||
|
|
@ -609,25 +609,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Define to 1 if you have the `strsignal' function. */
|
||||
#undef HAVE_STRSIGNAL
|
||||
|
||||
/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
|
||||
/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */
|
||||
#undef HAVE_STRUCT_IFREQ_IFR_ADDR
|
||||
|
||||
/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */
|
||||
/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */
|
||||
#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
|
||||
|
||||
/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */
|
||||
/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */
|
||||
#undef HAVE_STRUCT_IFREQ_IFR_FLAGS
|
||||
|
||||
/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */
|
||||
/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
|
||||
#undef HAVE_STRUCT_IFREQ_IFR_HWADDR
|
||||
|
||||
/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */
|
||||
/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */
|
||||
#undef HAVE_STRUCT_IFREQ_IFR_NETMASK
|
||||
|
||||
/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
|
||||
/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */
|
||||
#undef HAVE_STRUCT_NLIST_N_UN_N_NAME
|
||||
|
||||
/* Define to 1 if `tm_zone' is member of `struct tm'. */
|
||||
/* Define to 1 if `tm_zone' is a member of `struct tm'. */
|
||||
#undef HAVE_STRUCT_TM_TM_ZONE
|
||||
|
||||
/* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
|
||||
|
|
@ -854,6 +854,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the home page for this package. */
|
||||
#undef PACKAGE_URL
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
|
|
@ -901,9 +904,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
<sys/cpustats.h>. */
|
||||
#undef UMAX4_3
|
||||
|
||||
/* Define to the unexec source file name. */
|
||||
#undef UNEXEC_SRC
|
||||
|
||||
/* Define to 1 if using GTK. */
|
||||
#undef USE_GTK
|
||||
|
||||
|
|
@ -913,6 +913,28 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Define to 1 if using the Motif X toolkit. */
|
||||
#undef USE_MOTIF
|
||||
|
||||
/* Enable extensions on AIX 3, Interix. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
#endif
|
||||
/* Enable GNU extensions on systems that have them. */
|
||||
#ifndef _GNU_SOURCE
|
||||
# undef _GNU_SOURCE
|
||||
#endif
|
||||
/* Enable threading extensions on Solaris. */
|
||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||
# undef _POSIX_PTHREAD_SEMANTICS
|
||||
#endif
|
||||
/* Enable extensions on HP NonStop. */
|
||||
#ifndef _TANDEM_SOURCE
|
||||
# undef _TANDEM_SOURCE
|
||||
#endif
|
||||
/* Enable general extensions on Solaris. */
|
||||
#ifndef __EXTENSIONS__
|
||||
# undef __EXTENSIONS__
|
||||
#endif
|
||||
|
||||
|
||||
/* Define to 1 if we should use toolkit scroll bars. */
|
||||
#undef USE_TOOLKIT_SCROLL_BARS
|
||||
|
||||
|
|
@ -948,28 +970,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Define to 1 if you need to in order for `stat' and other things to work. */
|
||||
#undef _POSIX_SOURCE
|
||||
|
||||
/* Enable extensions on AIX 3, Interix. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
#endif
|
||||
/* Enable GNU extensions on systems that have them. */
|
||||
#ifndef _GNU_SOURCE
|
||||
# undef _GNU_SOURCE
|
||||
#endif
|
||||
/* Enable threading extensions on Solaris. */
|
||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||
# undef _POSIX_PTHREAD_SEMANTICS
|
||||
#endif
|
||||
/* Enable extensions on HP NonStop. */
|
||||
#ifndef _TANDEM_SOURCE
|
||||
# undef _TANDEM_SOURCE
|
||||
#endif
|
||||
/* Enable general extensions on Solaris. */
|
||||
#ifndef __EXTENSIONS__
|
||||
# undef __EXTENSIONS__
|
||||
#endif
|
||||
|
||||
|
||||
/* Define to rpl_ if the getopt replacement functions and variables should be
|
||||
used. */
|
||||
#undef __GETOPT_PREFIX
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue