Mercurial > emacs
changeset 108135:1b010f84803e
Regenerate configure.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 27 Apr 2010 00:38:05 -0700 |
| parents | 236318fbe135 |
| children | 43dcbd8381dc |
| files | configure |
| diffstat | 1 files changed, 32 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Apr 27 00:33:35 2010 -0700 +++ b/configure Tue Apr 27 00:38:05 2010 -0700 @@ -723,8 +723,6 @@ GCONF_CFLAGS GCONF_LIBS LIBSELINUX_LIBS -LUCID_LIBW -LIBXP FONTCONFIG_CFLAGS FONTCONFIG_LIBS XFT_CFLAGS @@ -794,6 +792,7 @@ XMENU_OBJ XOBJ WIDGET_OBJ +TOOLKIT_LIBW LTLIBOBJS' ac_subst_files='' ac_user_opts=' @@ -13011,7 +13010,6 @@ fi fi - X_TOOLKIT_TYPE=$USE_X_TOOLKIT if test "${USE_X_TOOLKIT}" != "none"; then @@ -13307,7 +13305,6 @@ fi { $as_echo "$as_me:$LINENO: result: $emacs_cv_motif_version_2_1" >&5 $as_echo "$emacs_cv_motif_version_2_1" >&6; } - HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1 if test $emacs_cv_motif_version_2_1 = yes; then { $as_echo "$as_me:$LINENO: checking for XpCreateContext in -lXp" >&5 $as_echo_n "checking for XpCreateContext in -lXp... " >&6; } @@ -13453,7 +13450,6 @@ - USE_TOOLKIT_SCROLL_BARS=no if test "${with_toolkit_scroll_bars}" != "no"; then if test "${USE_X_TOOLKIT}" != "none"; then @@ -25888,6 +25884,7 @@ +## Used in lwlib/Makefile.in. @@ -25954,6 +25951,7 @@ WIDGET_OBJ= +MOTIF_LIBW= if test "${USE_X_TOOLKIT}" != "none" ; then WIDGET_OBJ=widget.o @@ -25973,8 +25971,35 @@ #define USE_MOTIF 1 _ACEOF - fi -fi + MOTIF_LIBW=-lXm + case "$opsys" in + gnu-linux) + ## Paul Abrahams <abrahams at equinox.shaysnet.com> says this is needed. + MOTIF_LIBW="$MOTIF_LIBW -lXpm" + ;; + + unixware) + ## Richard Anthony Ryan <ryanr at ellingtn.ftc.nrcs.usda.gov> + ## says -lXimp is needed in UNIX_SV ... 4.2 1.1.2. + MOTIF_LIBW="MOTIF_LIBW -lXimp" + ;; + + aix4-2) + ## olson@mcs.anl.gov says -li18n is needed by -lXm. + MOTIF_LIBW="$MOTIF_LIBW -li18n" + ;; + esac + MOTIF_LIBW="$MOTIF_LIBW $LIBXP" + fi +fi + + +case "$USE_X_TOOLKIT" in + MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;; + LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;; + *) TOOLKIT_LIBW= ;; +esac + if test "${HAVE_X11}" = "yes" ; then