From 11d6d6d102eeff52931da9f2c3094ff61b7b7f1b Mon Sep 17 00:00:00 2001
From: sam <sam@55e467fa-43c5-0310-a8a2-de718669efc6>
Date: Tue, 30 Sep 2003 02:00:20 +0000
Subject: [PATCH]   * Do not fail if -lXmu is not present; -lXt should be
 enough.

git-svn-id: svn://svn.zoy.org/elk/trunk@222 55e467fa-43c5-0310-a8a2-de718669efc6
---
 configure.ac             | 32 ++++++++++++++++++--------------
 lib/xwidgets/Makefile.am |  6 +++---
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index cd28ffc..97c084d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,26 +463,30 @@ AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LIBS)
 
 if test "${cross_compiling}" = "no"; then
-  AC_CHECK_LIB(Xmu, XmuDrawLogo,
-   [ac_cv_my_have_xmu=yes
-    XMU_CFLAGS="-I${x_includes}"
-    XMU_LIBS="-L${x_libraries} -lXt -lSM -lICE -lXext -lX11"],
-   [ac_cv_my_have_xmu=no],
-   [[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])
+  AC_CHECK_LIB(Xt, XtDisplayTranslations,
+   [ac_cv_my_have_xt=yes
+    AC_CHECK_LIB(Xmu, XmuDrawLogo,
+     [XT_CFLAGS="-I${x_includes}"
+      XT_LIBS="-L${x_libraries} -lXmu -lXt -lSM -lICE -lXext -lX11"],
+     [XT_CFLAGS="-I${x_includes}"
+      XT_LIBS="-L${x_libraries} -lXt -lSM -lICE -lXext -lX11"],
+     [[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])],
+   [ac_cv_my_have_xt=no],
+   [[-lSM -lICE -lXext -lX11 -L${x_libraries}]])
 else
-  ac_cv_my_have_xmu="no (cross-compiling)"
+  ac_cv_my_have_xt=no
 fi
-AM_CONDITIONAL(HAVE_XMU, test "${ac_cv_my_have_xmu}" = "yes")
-AC_SUBST(XMU_CFLAGS)
-AC_SUBST(XMU_LIBS)
+AM_CONDITIONAL(HAVE_XT, test "${ac_cv_my_have_xt}" = "yes")
+AC_SUBST(XT_CFLAGS)
+AC_SUBST(XT_LIBS)
 
 if test "${cross_compiling}" = "no"; then
   AC_CHECK_LIB(Xaw, XawTextSearch,
    [ac_cv_my_have_xaw=yes
     XAW_CFLAGS="-I${x_includes}"
-    XAW_LIBS="-L${x_libraries} -lXaw ${XMU_LIBS}"],
+    XAW_LIBS="-L${x_libraries} -lXaw ${XT_LIBS}"],
    [ac_cv_my_have_xaw=no],
-   [[${XMU_LIBS}]])
+   [[${XT_LIBS}]])
 else
   ac_cv_my_have_xaw="no (cross-compiling)"
 fi
@@ -494,9 +498,9 @@ if test "${cross_compiling}" = "no"; then
   AC_CHECK_LIB(Xm, XmStringConcat,
    [ac_cv_my_have_motif=yes
     MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm"
-    MOTIF_LIBS="-L${x_libraries} -lXm ${XMU_LIBS}"],
+    MOTIF_LIBS="-L${x_libraries} -lXm ${XT_LIBS}"],
    [ac_cv_my_have_motif=no],
-   [[${XMU_LIBS}]])
+   [[${XT_LIBS}]])
 else
   ac_cv_my_have_motif="no (cross-compiling)"
 fi
diff --git a/lib/xwidgets/Makefile.am b/lib/xwidgets/Makefile.am
index d218830..39f6a55 100644
--- a/lib/xwidgets/Makefile.am
+++ b/lib/xwidgets/Makefile.am
@@ -6,14 +6,14 @@ EXTRA_DIST = MISSING mkwidget.scm
 
 lib_LTLIBRARIES = $(libelk_xt_la)
 
-if HAVE_XMU
+if HAVE_XT
 libelk_xt_la = libelk-xt.la
 endif
 
 libelk_xt_la_SOURCES = $(SOURCES_XT)
-libelk_xt_la_CFLAGS = -I$(srcdir)/../xlib @XMU_CFLAGS@
+libelk_xt_la_CFLAGS = -I$(srcdir)/../xlib @XT_CFLAGS@
 libelk_xt_la_LDFLAGS = -no-undefined
-libelk_xt_la_LIBADD = $(top_builddir)/src/libelk.la ../xlib/libelk-xlib.la @XMU_LIBS@
+libelk_xt_la_LIBADD = $(top_builddir)/src/libelk.la ../xlib/libelk-xlib.la @XT_LIBS@
 
 extensions_HEADERS = xt.h
 extensionsdir = $(pkgincludedir)/extensions