--- rpl/Attic/configure	2011/09/15 20:58:06	1.79
+++ rpl/Attic/configure	2011/09/16 14:42:01	1.80
@@ -562,6 +562,7 @@ PACKAGE_STRING='rpl 4.1.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
+enable_option_checking=no
 ac_default_prefix=/usr/local
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -599,11 +600,12 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+LIBMOTIF
+INCMOTIF
 GIAC
 PARI
 COCOA
@@ -615,6 +617,7 @@ EXT_SQL
 DATE_FR
 FINAL_ENCODING
 SIGSEGV
+BUILD_OPENMOTIF
 OPENMOTIF
 OPENSSL
 SQLITE
@@ -638,7 +641,6 @@ C_STANDARD
 OS
 HOST
 GNUPLOT_COMPILATION
-subdirs
 EGREP
 GREP
 libPgSQLlib
@@ -669,6 +671,7 @@ RANLIB
 LN_S
 RUNPATH
 PROFILAGE
+subdirs
 LIBRPLCAS
 RPLCAS
 ABI
@@ -822,7 +825,9 @@ FC
 FCFLAGS
 XMKMF
 CPP'
-ac_subdirs_all='tools/$GNUPLOT
+ac_subdirs_all='tools/$LIBXPM
+tools/$OPENMOTIF
+tools/$GNUPLOT
 tools/$NCURSES
 tools/$READLINE
 tools/$GSL
@@ -3259,6 +3264,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
@@ -6096,68 +6102,44 @@ fi
 fi
 
 
+libX=""
+LIBMOTIF=""
+INCMOTIF=""
+BUILD_OPENMOTIF=""
+
 # Check whether --enable-motif was given.
 if test "${enable_motif+set}" = set; then :
   enableval=$enable_motif;
 if test "$enableval" = "no"; then
 	MOTIF_SUPPORT="-UMOTIF_SUPPORT"
 else
-	CFLAGS_ORIG=$CFLAGS
-	LIBS_ORIG=$LIBS
-	CFLAGS="$CFLAGS $X_CFLAGS"
-	LIBS="$LIB $X_LIBS"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXm" >&5
-$as_echo_n "checking for main in -lXm... " >&6; }
-if ${ac_cv_lib_Xm_main+:} false; then :
-  $as_echo_n "(cached) " >&6
+	MOTIF_SUPPORT="-DMOTIF_SUPPORT"
+fi
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xm_main=yes
+  if test "$have_x" == "yes"; then
+	MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 else
-  ac_cv_lib_Xm_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+	MOTIF_SUPPORT="-UMOTIF_SUPPORT"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_main" >&5
-$as_echo "$ac_cv_lib_Xm_main" >&6; }
-if test "x$ac_cv_lib_Xm_main" = xyes; then :
-  MOTIF_SUPPORT="-DMOTIF_SUPPORT"
-else
-  MOTIF_SUPPORT="-UMOTIF_SUPPORT"
 fi
 
-	if test "$MOTIF_SUPPORT" = "-UMOTIF_SUPPORT"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find Motif! You may install it.
-Motif flag is disabled.
-" >&5
-$as_echo "$as_me: WARNING: Can not find Motif! You may install it.
-Motif flag is disabled.
-" >&2;}
-	fi
-	LIBS=$LIBS_ORIG
-	CFLAGS=$CFLAGS_ORIG
-fi
-else
-  MOTIF_SUPPORT=guessed
-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"
 
 
+subdirs="$subdirs tools/$LIBXPM"
+
+	subdirs="$subdirs tools/$OPENMOTIF"
+
+fi
+
 # Check whether --enable-experimental was given.
 if test "${enable_experimental+set}" = set; then :
   enableval=$enable_experimental;
@@ -6249,6 +6231,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 -)
@@ -6927,117 +6917,6 @@ else
 	fi
 fi
 
-if test "$MOTIF_SUPPORT" = guessed; then
-	CFLAGS_ORIG=$CFLAGS
-	LIBS_ORIG=$LIBS
-	CFLAGS="$CFLAGS $X_CFLAGS"
-	LIBS="$LIB $X_LIBS"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXm" >&5
-$as_echo_n "checking for main in -lXm... " >&6; }
-if ${ac_cv_lib_Xm_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xm_main=yes
-else
-  ac_cv_lib_Xm_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_main" >&5
-$as_echo "$ac_cv_lib_Xm_main" >&6; }
-if test "x$ac_cv_lib_Xm_main" = xyes; then :
-  MOTIF_SUPPORT="-DMOTIF_SUPPORT"
-else
-  MOTIF_SUPPORT="-UMOTIF_SUPPORT"
-fi
-
-	if test "$MOTIF_SUPPORT" = "-UMOTIF_SUPPORT"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find Motif! You may install it.
-Motif flag is disabled.
-" >&5
-$as_echo "$as_me: WARNING: Cannot find Motif! You may install it.
-Motif flag is disabled.
-" >&2;}
-	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"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXpm" >&5
-$as_echo_n "checking for main in -lXpm... " >&6; }
-if ${ac_cv_lib_Xpm_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXpm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xpm_main=yes
-else
-  ac_cv_lib_Xpm_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_main" >&5
-$as_echo "$ac_cv_lib_Xpm_main" >&6; }
-if test "x$ac_cv_lib_Xpm_main" = xyes; then :
-  MOTIF_SUPPORT="-DMOTIF_SUPPORT"
-else
-  MOTIF_SUPPORT="-UMOTIF_SUPPORT"
-fi
-
-	if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
-		libX="$X_LIBS -lXm -lXpm -lXt -lX11"
-	else
-		libX=""
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find libXpm! You may install it.
-Motif flag is disabled.
-" >&5
-$as_echo "$as_me: WARNING: Cannot find libXpm! You may install it.
-Motif flag is disabled.
-" >&2;}
-	fi
-	LIBS=$LIBS_ORIG
-	CFLAGS=$CFLAGS_ORIG
-else
-	libX=""
-fi
-
 
 
 
@@ -9194,9 +9073,7 @@ if test "$MYGNUPLOT" = "yes"; then
 		gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \
 				(cd "$srcdir/tools" && tar -xf -)
 	fi
-
-
-subdirs="$subdirs tools/$GNUPLOT"
+	subdirs="$subdirs tools/$GNUPLOT"
 
 	GNUPLOT_COMPILATION=$GNUPLOT
 else
@@ -9424,6 +9301,9 @@ esac
 
 
 
+
+
+