[xlibs-commit] xlibs ChangeLog,1.1,1.2 build-em,1.5,1.6

[Carl Worth]

Committed by: cworth

Update of /cvs/xlibs//xlibs
In directory pdx:/tmp/cvs-serv814

Modified Files:
	ChangeLog build-em 
Log Message:

        * build-em: Add "set -e" to reduce "|| exit 0".
        (PACKAGES): Only re-run ./autogen.sh if there are arguments to
        build-em OR if configure.ac or Makefile.am are newer than
        config.status.


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs//xlibs/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	11 Nov 2003 18:23:35 -0000	1.1
+++ ChangeLog	11 Nov 2003 19:10:03 -0000	1.2
@@ -1,5 +1,10 @@
 2003-11-11  Carl Worth  <cworth@east.isi.edu>
 
+	* build-em: Add "set -e" to reduce "|| exit 0".
+	(PACKAGES): Only re-run ./autogen.sh if there are arguments to
+	build-em OR if configure.ac or Makefile.am are newer than
+	config.status.
+
 	* build-em (PACKAGES): Remove unnecessary check of CVSROOT as it
 	will get picked up from CVS/Root anyway.
 	(BUILD_EM_SUDO): Allow the user to specify use of "sudo make

Index: build-em
===================================================================
RCS file: /cvs/xlibs//xlibs/build-em,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build-em	11 Nov 2003 18:23:35 -0000	1.5
+++ build-em	11 Nov 2003 19:10:03 -0000	1.6
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -e
+
 # export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
 ## Uncomment this to perform the "make install" step using sudo
@@ -32,8 +34,17 @@
 done`
 for i in $PACKAGES; do
 	echo "Checking out package $i"
-	cvs co $i || exit 1
-	(cd $i && ./autogen.sh "$@" && make -j2 && $BUILD_EM_SUDO make install) || exit 1
+	cvs co $i
+	cwd=`pwd`
+	cd $i
+	if  [ $# -gt 0 ] ||
+	    [ configure.ac -nt config.status ] ||
+	    [ Makefile.am -nt config.status ]; then
+	    ./autogen.sh "$@"
+	fi
+	make -j2
+	$BUILD_EM_SUDO make install
+	cd $cwd
 done
 
 echo "Completed build-em successfully!"