summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Liddell <chris.liddell@artifex.com>2016-10-18 08:57:57 +0100
committerChris Liddell <chris.liddell@artifex.com>2016-10-21 15:15:09 +0100
commitffc02ce675b63787effd748aea911d4bf953460e (patch)
tree357d89915f8284818673570e58a200846dab0c11
parent6a4f0cb2aad9f263b8118d5f8818010a60bcdcb5 (diff)
downloadghostpdl-CCAUX-configure.tar.gz
Refine the solution for avoiding the extra makefileCCAUX-configure
The first pass relied on the 'echo' command understanding the '-e' option, which isn't universally true. This version doesn't have that requirement.
-rw-r--r--configure.ac26
1 files changed, 17 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index e72247774..f4322fbce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,15 +105,14 @@ AC_PROG_CC
AC_PROG_CPP
CFLAGS="$save_cflags"
-AUXFLAGS_MAK_CONTENTS=\
-"CCAUX=@CC@\n\
-GCFLAGSAUX=@CPPFLAGS@ @GCFLAGS@ @CFLAGS@\n\
-CAPOPTAUX=\n\
-CFLAGSAUX_STANDARD=@OPT_CFLAGS@\n\
-CFLAGSAUX_DEBUG=@DBG_CFLAGS@\n\
-CFLAGSAUX_PROFILE=-pg @OPT_CFLAGS@\n\
-LDFLAGSAUX=@LDFLAGS@\n\
-AUXEXTRALIBS=@LIBS@"
+AUXFLAGS_MAK_LINE00="CCAUX=@CC@"
+AUXFLAGS_MAK_LINE01="GCFLAGSAUX=@CPPFLAGS@ @GCFLAGS@ @CFLAGS@"
+AUXFLAGS_MAK_LINE02="CAPOPTAUX="
+AUXFLAGS_MAK_LINE03="CFLAGSAUX_STANDARD=@OPT_CFLAGS@"
+AUXFLAGS_MAK_LINE04="CFLAGSAUX_DEBUG=@DBG_CFLAGS@"
+AUXFLAGS_MAK_LINE05="CFLAGSAUX_PROFILE=-pg @OPT_CFLAGS@"
+AUXFLAGS_MAK_LINE06="LDFLAGSAUX=@LDFLAGS@"
+AUXFLAGS_MAK_LINE07="AUXEXTRALIBS=@LIBS@"
GCFLAGSAUXTMP="\$(GCFLAGS)"
CAPOPTAUXTMP="\$(CAPOPT)"
@@ -138,6 +137,15 @@ if test x"$CCAUX" != x"" ; then
mkdir $CONFAUXDIR
cd $CONFAUXDIR
echo -e $AUXFLAGS_MAK_CONTENTS > $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE00 > $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE01 >> $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE02 >> $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE03 >> $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE04 >> $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE05 >> $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in
+ echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in
+
../$0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers=""
status=$?
cp config.log ../configaux.log