From 03abfb2cbc1fea0f8dc86498fdd5646ddab2f8f5 Mon Sep 17 00:00:00 2001 From: "David D. Zuhn" Date: Wed, 15 Sep 1993 02:11:35 +0000 Subject: [PATCH] fix replacement of multiline values for CC and CXX --- configure | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/configure b/configure index 5bbd7b0e12b..9dcc2946166 100755 --- a/configure +++ b/configure @@ -796,6 +796,11 @@ EOF echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile} fi + # make sure that some sort of reasonable default exists for these + # two variables + CXX=${CXX-"g++ -O"} + CC=${CC-cc} + # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. if [ -z "${subdirs}" ]; then @@ -808,6 +813,24 @@ EOF fi sed -e "s:^prefix[ ]*=.*$:prefix = ${prefix}:" \ -e "s:^exec_prefix[ ]*=.*$:exec_prefix = ${exec_prefix}:" \ + -e "/^CC[ ]*=/{ + b chkcc + :contcc + N + :chkcc + s/\\\\$// + t contcc + s/^CC[ ]*=.*$/CC = ${CC}/ + }" \ + -e "/^CXX[ ]*=/{ + b chkcxx + :contcxx + N + :chkcxx + s/\\\\$// + t contcxx + s/^CXX[ ]*=.*$/CXX = ${CXX}/ + }" \ -e "s:^srcdir[ ]*=.*$:srcdir = ${makesrcdir}:" \ -e "s/ //" \ -e "s:^program_prefix[ ]*=.*$:program_prefix = ${program_prefix}:" \ -- 2.30.2