* configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
(TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
* src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
(TOOLKIT_LIBW): New, set by configure.
(@X_TOOLKIT_TYPE@): No longer define it.
2010-04-27 Glenn Morris <rgm@gnu.org>
+ * configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute
+ in Makefiles.
+ (TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
+
* 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
fi
fi
fi
-AC_SUBST(LUCID_LIBW)
X_TOOLKIT_TYPE=$USE_X_TOOLKIT
AC_SUBST(C_SWITCH_X_SITE)
AC_SUBST(C_SWITCH_X_SYSTEM)
AC_SUBST(CFLAGS)
+## Used in lwlib/Makefile.in.
AC_SUBST(X_TOOLKIT_TYPE)
AC_SUBST(machfile)
AC_SUBST(opsysfile)
fi
fi
AC_SUBST(WIDGET_OBJ)
-AC_SUBST(MOTIF_LIBW)
+
+case "$USE_X_TOOLKIT" in
+ MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;;
+ LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;;
+ *) TOOLKIT_LIBW= ;;
+esac
+AC_SUBST(TOOLKIT_LIBW)
+
if test "${HAVE_X11}" = "yes" ; then
AC_DEFINE(HAVE_X11, 1,
[Define to 1 if you want to use version 11 of X windows.
2010-04-27 Glenn Morris <rgm@gnu.org>
+ * Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
+ (TOOLKIT_LIBW): New, set by configure.
+ (@X_TOOLKIT_TYPE@): No longer define it.
+
* Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW.
(MOTIF_LIBW): Set with configure, not cpp.
* s/aix4-2.h (LIB_MOTIF):
XMENU_OBJ=@XMENU_OBJ@
XOBJ=@XOBJ@
-LUCID_LIBW=@LUCID_LIBW@
-MOTIF_LIBW=@MOTIF_LIBW@
+TOOLKIT_LIBW=@TOOLKIT_LIBW@
LIBSOUND= @LIBSOUND@
CFLAGS_SOUND= @CFLAGS_SOUND@
#endif /* not HAVE_MENUS */
#ifdef USE_X_TOOLKIT
-# define @X_TOOLKIT_TYPE@
-LIBW=$(@X_TOOLKIT_TYPE@_LIBW)
+LIBW=$(TOOLKIT_LIBW)
#ifdef HAVE_X11XTR6
#ifdef NEED_LIBW