(AC_PROG_CPP): If CPP is already set, use that as

the value and set the cache variable to it.

diff --git a/acspecific.m4 b/acspecific.m4
index 25b4112c03048d3133a420270105dbc139fb7616..21d44f0c7c597e02fd1de1ada1961280b4f75508 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -281,8 +281,10 @@ Syntax Error], ,
   AC_TRY_CPP([#include <assert.h>
 Syntax Error], , CPP=/lib/cpp))
   ac_cv_prog_CPP="$CPP"])dnl
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
 fi
-CPP="$ac_cv_prog_CPP"
 AC_MSG_RESULT($CPP)
 AC_SUBST(CPP)dnl
 ])

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 25b4112c03048d3133a420270105dbc139fb7616..21d44f0c7c597e02fd1de1ada1961280b4f75508 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -281,8 +281,10 @@ Syntax Error], ,
   AC_TRY_CPP([#include <assert.h>
 Syntax Error], , CPP=/lib/cpp))
   ac_cv_prog_CPP="$CPP"])dnl
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
 fi
-CPP="$ac_cv_prog_CPP"
 AC_MSG_RESULT($CPP)
 AC_SUBST(CPP)dnl
 ])