diff --git a/configure b/configure
index dd8a070cfa..730e0c01fe 100755
--- a/configure
+++ b/configure
@@ -2270,10 +2270,10 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_LIBS="-lXmHTML $X_LIBS"
+  MOTIF_LIBS="-lXmHTML $MOTIF_LIBS"
 else
   echo "$ac_t""no" 1>&6
-X_LIBS="-lXmHTML $X_LIBS"
+MOTIF_LIBS="-lXmHTML $MOTIF_LIBS"
         XMHTML_TARGET=default 
         XMHTML_INC=/lib/XmHTML-1.1.0/src 
         LIBS="-L $srcdir/lib/XmHTML-1.1.0 $LIBS" 
diff --git a/configure.in b/configure.in
index 028388e1fa..dafac561ba 100644
--- a/configure.in
+++ b/configure.in
@@ -140,8 +140,8 @@ AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
 # Don't build the xmhtml source if user already has it installed...
 # this is ugly, there must be a nicer way of setting this up ...
 AC_CHECK_LIB(XmHTML,  XmHTMLTextScrollToLine,
-        X_LIBS="-lXmHTML $X_LIBS",
-        X_LIBS="-lXmHTML $X_LIBS"
+        MOTIF_LIBS="-lXmHTML $MOTIF_LIBS",
+        MOTIF_LIBS="-lXmHTML $MOTIF_LIBS"
         XMHTML_TARGET=default 
         XMHTML_INC=/lib/XmHTML-1.1.0/src 
         LIBS="-L $srcdir/lib/XmHTML-1.1.0 $LIBS" ,