diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 7 | ||||
| -rw-r--r-- | src/s/aix4-2.h | 5 | ||||
| -rw-r--r-- | src/s/gnu-linux.h | 3 | ||||
| -rw-r--r-- | src/s/unixware.h | 8 |
5 files changed, 10 insertions, 21 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 53d11c87a63..41d0fb414f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2010-04-27 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW. + (MOTIF_LIBW): Set with configure, not cpp. + * s/aix4-2.h (LIB_MOTIF): + * s/gnu-linux.h (LIB_MOTIF): + * s/unixware.h (LIB_MOTIF): Move to configure.in. + 2010-04-27 Dan Nicolaescu <dann@ics.uci.edu> Reduce CPP usage. diff --git a/src/Makefile.in b/src/Makefile.in index e1933a37388..5b4426686d0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -86,13 +86,13 @@ GCONF_LIBS = @GCONF_LIBS@ GTK_OBJ=@GTK_OBJ@ -LIBXP=@LIBXP@ LIBXSM=@LIBXSM@ XMENU_OBJ=@XMENU_OBJ@ XOBJ=@XOBJ@ LUCID_LIBW=@LUCID_LIBW@ +MOTIF_LIBW=@MOTIF_LIBW@ LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -256,11 +256,6 @@ LIBXMENU= #ifdef USE_X_TOOLKIT # define @X_TOOLKIT_TYPE@ -# ifdef LIB_MOTIF -MOTIF_LIBW= LIB_MOTIF $(LIBXP) -# else -MOTIF_LIBW= -lXm $(LIBXP) -# endif LIBW=$(@X_TOOLKIT_TYPE@_LIBW) #ifdef HAVE_X11XTR6 diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index 32bc67bfd46..c14835531df 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -135,9 +135,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define POSIX_SIGNALS #undef sigmask -/* olson@mcs.anl.gov says -li18n is needed by -lXm. */ -#define LIB_MOTIF -lXm -li18n - #ifndef HAVE_LIBXMU #define LIBXMU @@ -148,7 +145,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* On AIX Emacs uses the gmalloc.c malloc implementation. But given the way this system works, libc functions that return malloced memory use the libc malloc implementation. Calling xfree or - xrealloc on the results of such functions results in a crash. + xrealloc on the results of such functions results in a crash. One solution for this could be to define SYSTEM_MALLOC here, but that does not currently work on this system. diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 3d470032efc..948f96a1e40 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -197,9 +197,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ anyone's still using Emacs on those. --fx 2002-12-14 */ /* #define C_SWITCH_SYSTEM -D_BSD_SOURCE */ -/* Paul Abrahams <abrahams@equinox.shaysnet.com> says this is needed. */ -#define LIB_MOTIF -lXm -lXpm - #ifdef HAVE_LIBNCURSES #define TERMINFO #define LIBS_TERMCAP -lncurses diff --git a/src/s/unixware.h b/src/s/unixware.h index 27fd41b7416..d019b8bba80 100644 --- a/src/s/unixware.h +++ b/src/s/unixware.h @@ -59,14 +59,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Use libw.a along with X11R6 Xt. */ #define NEED_LIBW -/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp - is needed in UNIX_SV ... 4.2 1.1.2. */ -#define LIB_MOTIF -lXm -lXimp - -/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6 - (do not change this comment) */ - - /* Data type of load average, as read out of kmem. */ #define LOAD_AVE_TYPE long |