diff options
| author | Craig Davison <craig65535@gmail.com> | 2016-08-11 21:37:13 -0600 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-09-05 08:49:56 +0200 |
| commit | 46398941e45b6fd67efb70ee27e5693d8686a4f8 (patch) | |
| tree | e6eadcdc4f96b7f522986d0332773c80e9985d8b /acinclude.m4 | |
| parent | 4b86113f5ed66270364738a351ebb5bb23cd0882 (diff) | |
| download | curl-46398941e45b6fd67efb70ee27e5693d8686a4f8.tar.gz | |
configure: make the cpp -P detection not clobber CPPFLAGS
CPPPFLAGS is now CPPPFLAG. Fixes CURL_CHECK_DEF.
Fixes #958
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fa621b5bd..312efcb47 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -32,8 +32,8 @@ dnl actually be a single double-quoted string concatenating all them. AC_DEFUN([CURL_CHECK_DEF], [ AC_REQUIRE([CURL_CPP_P])dnl OLDCPPFLAGS=$CPPFLAGS - # CPPPFLAGS comes from CURL_CPP_P - CPPFLAGS="$CPPPFLAGS" + # CPPPFLAG comes from CURL_CPP_P + CPPFLAGS="$CPPFLAGS $CPPPFLAG" AS_VAR_PUSHDEF([ac_HaveDef], [curl_cv_have_def_$1])dnl AS_VAR_PUSHDEF([ac_Def], [curl_cv_def_$1])dnl if test -z "$SED"; then @@ -3187,12 +3187,15 @@ TEST EINVAL TEST if test "x$cpp_p" = "xno"; then AC_MSG_WARN([failed to figure out cpp -P alternative]) # without -P - CPPPFLAGS=$OLDCPPFLAGS + CPPPFLAG="" else # with -P - CPPPFLAGS=$CPPFLAGS + CPPPFLAG="-P" fi dnl restore CPPFLAGS CPPFLAGS=$OLDCPPFLAGS + else + # without -P + CPPPFLAG="" fi ]) |