--- rpl/Attic/configure.in	2011/09/15 19:51:53	1.83
+++ rpl/Attic/configure.in	2011/09/16 14:42:02	1.84
@@ -18,6 +18,7 @@ ICONV=libiconv-1.13.1
 SQLITE=sqlite-3.7.7.1
 OPENSSL=openssl-1.0.0e
 OPENMOTIF=openmotif-2.3.3
+LIBXPM=libXpm-3.5.9
 SIGSEGV=libsigsegv-2.6
 
 GMP=gmp-5.0.2
@@ -281,25 +282,35 @@ else
 	FORCE_GNUPLOT_PATH=-UFORCE_GNUPLOT_PATH
 fi])
 
+libX=""
+LIBMOTIF=""
+INCMOTIF=""
+BUILD_OPENMOTIF=""
+
 AC_ARG_ENABLE(motif,
 [  --enable-motif          provide the Motif support [[default=guessed]]], [
 if test "$enableval" = "no"; then
 	MOTIF_SUPPORT="-UMOTIF_SUPPORT"
 else
-	CFLAGS_ORIG=$CFLAGS
-	LIBS_ORIG=$LIBS
-	CFLAGS="$CFLAGS $X_CFLAGS"
-	LIBS="$LIB $X_LIBS"
-	AC_CHECK_LIB(Xm, main, MOTIF_SUPPORT="-DMOTIF_SUPPORT", MOTIF_SUPPORT="-UMOTIF_SUPPORT")
-	if test "$MOTIF_SUPPORT" = "-UMOTIF_SUPPORT"; then
-		AC_MSG_WARN([Can not find Motif! You may install it.
-Motif flag is disabled.
-])
-	fi
-	LIBS=$LIBS_ORIG
-	CFLAGS=$CFLAGS_ORIG
+	MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 fi],
-MOTIF_SUPPORT=guessed)
+if test "$have_x" == "yes"; then
+	MOTIF_SUPPORT="-DMOTIF_SUPPORT"
+else
+	MOTIF_SUPPORT="-UMOTIF_SUPPORT"
+fi)
+
+if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
+	libX="$X_LIBS -lXt -lX11"
+	LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/lib/Xm/.libs/libXm.a \
+			\$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a"
+	INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \
+			-I\$(top_builddir)/tools/$OPENMOTIF/lib \
+			-I\$(top_builddir)/tools/$LIBXPM/include"
+	BUILD_OPENMOTIF="$LIBXPM $OPENMOTIF"
+	AC_CONFIG_SUBDIRS(tools/$LIBXPM)
+	AC_CONFIG_SUBDIRS(tools/$OPENMOTIF)
+fi
 
 AC_ARG_ENABLE(experimental,
 [  --enable-experimental   enable experimental code [[default=no]]], [
@@ -378,6 +389,14 @@ if test ! -d "$srcdir"/tools/$SIGSEGV; t
 	gunzip -c "$srcdir"/tools/$SIGSEGV.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf -)
 fi
+if test ! -d "$srcdir"/tools/$OPENMOTIF; then
+	gunzip -c "$srcdir"/tools/$OPENMOTIF.tar.gz | \
+			(cd "$srcdir/tools" && tar -xf -)
+fi
+if test ! -d "$srcdir"/tools/$LIBXPM; then
+	gunzip -c "$srcdir"/tools/$LIBXPM.tar.gz | \
+			(cd "$srcdir/tools" && tar -xf -)
+fi
 if test ! -d tools/$OPENSSL; then
 	gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
 			(cd tools && tar -xf -)
@@ -535,41 +554,6 @@ else
 	fi
 fi
 
-if test "$MOTIF_SUPPORT" = guessed; then
-	CFLAGS_ORIG=$CFLAGS
-	LIBS_ORIG=$LIBS
-	CFLAGS="$CFLAGS $X_CFLAGS"
-	LIBS="$LIB $X_LIBS"
-	AC_CHECK_LIB(Xm, main, MOTIF_SUPPORT="-DMOTIF_SUPPORT", MOTIF_SUPPORT="-UMOTIF_SUPPORT")
-	if test "$MOTIF_SUPPORT" = "-UMOTIF_SUPPORT"; then
-		AC_MSG_WARN([Cannot find Motif! You may install it.
-Motif flag is disabled.
-])
-	fi
-	LIBS=$LIBS_ORIG
-	CFLAGS=$CFLAGS_ORIG
-fi
-
-if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
-	CFLAGS_ORIG=$CFLAGS
-	LIBS_ORIG=$LIBS
-	CFLAGS="$CFLAGS $X_CFLAGS"
-	LIBS="$LIB $X_LIBS"
-	AC_CHECK_LIB(Xpm, main, MOTIF_SUPPORT="-DMOTIF_SUPPORT", MOTIF_SUPPORT="-UMOTIF_SUPPORT")
-	if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
-		libX="$X_LIBS -lXm -lXpm -lXt -lX11"
-	else
-		libX=""
-		AC_MSG_WARN([Cannot find libXpm! You may install it.
-Motif flag is disabled.
-])
-	fi
-	LIBS=$LIBS_ORIG
-	CFLAGS=$CFLAGS_ORIG
-else
-	libX=""
-fi
-
 dnl Substitutions
 AC_SUBST(GNUPLOT_SUPPORT)
 AC_SUBST(FORCE_GNUPLOT_PATH)
@@ -1218,6 +1202,7 @@ AC_SUBST(ICONV)
 AC_SUBST(SQLITE)
 AC_SUBST(OPENSSL)
 AC_SUBST(OPENMOTIF)
+AC_SUBST(BUILD_OPENMOTIF)
 AC_SUBST(SIGSEGV)
 AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)
@@ -1230,6 +1215,8 @@ AC_SUBST(NTL)
 AC_SUBST(COCOA)
 AC_SUBST(PARI)
 AC_SUBST(GIAC)
+AC_SUBST(INCMOTIF)
+AC_SUBST(LIBMOTIF)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)