Move MOTIF_LIBW to autoconf.

* configure.in (HAVE_MOTIF_2_1): Remove unused variable.
(LIBXP): No longer substitute in Makefiles.
(MOTIF_LIBW): New output variable.  Move system-specific settings here
from src/s files.

* src/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.

* admin/CPP-DEFINES: Remove LIB_MOTIF.

1 files changed, 1 insertions, 6 deletions

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