--- rpl/tools/Attic/Makefile.in	2011/09/15 19:46:42	1.59
+++ rpl/tools/Attic/Makefile.in	2011/09/16 14:14:12	1.60
@@ -55,6 +55,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BSH_PATH = @BSH_PATH@
+BUILD_OPENMOTIF = @BUILD_OPENMOTIF@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -101,6 +102,7 @@ GSL = @GSL@
 GV = @GV@
 HOST = @HOST@
 ICONV = @ICONV@
+INCMOTIF = @INCMOTIF@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -110,6 +112,7 @@ IPCS_SYSV = @IPCS_SYSV@
 IPV6 = @IPV6@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
+LIBMOTIF = @LIBMOTIF@
 LIBOBJS = @LIBOBJS@
 LIBRPLCAS = @LIBRPLCAS@
 LIBS = @LIBS@
@@ -217,7 +220,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
 sysconfdir = @sysconfdir@
 target = @target@
@@ -231,7 +234,7 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
 		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
 		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
-		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz \
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \
 		@NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
 		@NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \
 		@NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \
@@ -240,7 +243,9 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \
 		@NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \
 		@NCURSES@-20110723.patch.gz @NCURSES@-20110730.patch.gz \
-		@NCURSES@-20110807.patch.gz
+		@NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \
+		@NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \
+		@NCURSES@-20110910.patch.gz
 
 all: all-am
 
@@ -443,6 +448,16 @@ all:
 			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
 		fi; \
 	fi
+	touch openmotif.lib && rm openmotif.lib;
+	if [ x@BUILD_OPENMOTIF@ = x ]; then \
+		echo LD_MOTIF_ > openmotif.lib; \
+		echo LD_MOTIF_ >> openmotif.lib; \
+	else \
+		echo -n LD_MOTIF_ > openmotif.lib; \
+		grep "^LIBS=" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
+		echo -n LD_MOTIF_ >> openmotif.lib; \
+		grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
+	fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \