[gs-cvs] rev 7985 - branches/gs-esp-gpl-merger/src

[till at ghostscript.com]

Author: till
Date: 2007-05-18 04:56:47 -0700 (Fri, 18 May 2007)
New Revision: 7985

Modified:
   branches/gs-esp-gpl-merger/src/configure.ac
Log:
Fixed "--disable-contrib" configure option, it would also exclude the "cups" device which is part of core Ghostscript now.


Modified: branches/gs-esp-gpl-merger/src/configure.ac
===================================================================
--- branches/gs-esp-gpl-merger/src/configure.ac	2007-05-17 15:42:30 UTC (rev 7984)
+++ branches/gs-esp-gpl-merger/src/configure.ac	2007-05-18 11:56:47 UTC (rev 7985)
@@ -760,10 +760,10 @@
 
 # Remove contributed drivers if requested and make sure we don't have any 
 # duplicates in there, add $(DD)foo.dev constructs
-	PRINTERS=`(for i in $P_DEVS; do d='$(DD)'${i}.dev; if ( grep -q '^'$d src/*.mak ) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+	noncontribmakefiles=`find . -name '*.mak' -print | grep -v '^\./contrib/'`
+	PRINTERS=`(for i in $P_DEVS; do d='$(DD)'${i}.dev; if ( grep -q '^'$d $noncontribmakefiles ) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
 fi
 if test -n "$F_DEVS"; then
-	noncontribmakefiles=`find . -name '*.mak' -print | grep -v '^\./contrib/'`
 	FILES=`(for i in $F_DEVS; do d='$(DD)'${i}.dev; if ( grep -q '^'$d $noncontribmakefiles ) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
 fi
 AC_SUBST(PRINTERS)