Work around Makefile quoting problems

ticket: 2992
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17170 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 2fc3cb46da4e77677860c2692d29cc6de37c4c15..783f92643307febfe8839c629a06d4382f90843d 100644 (file)
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-07  Tom Yu  <tlyu@mit.edu>
+
+       * configure.in: Use awk to work around Makefile quoting problems.
+
 2005-02-08  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (LIBINITFUNC, LIBFINIFUNC): Define.

diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index 1a4f1755e5d51c869886595a8bb408adb201f0c5..98bfcf04e7df541bd4afc17df420501ba45a3000 100644 (file)
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -7,11 +7,12 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_HEADER(stdint.h,[
-       include_stdint="\\#include <stdint.h>"], )
+       include_stdint='awk '\''END{printf("%cinclude <stdint.h>\n", 35);}'\'' < /dev/null'],
+       include_stdint='echo "/* no stdint.h */"')
 AC_SUBST(include_stdint)
 AC_CHECK_HEADER(xom.h,[
-       include_xom="\\#include <xom.h>"],[
-       include_xom="/* no xom.h */"])
+       include_xom='awk '\''END{printf("%cinclude <xom.h>\n", 35);}'\'' < /dev/null'], [
+       include_xom='echo "/* no xom.h */"'])
 AC_SUBST(include_xom)
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 00370a77e45633c803c273fb98107517469c8ec7..4480d3158f1c160c3a31d49c7387def454fb38eb 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-07  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (gssapi.h): Use awk hack to work around quoting
+       problem.
+
 2005-02-02  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (gssapi.h): Change SIZEOF symbols to start with GSS_

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 16b7d5767343ebaaaea571891f5722740b0ea442..1306b7db402a309825f4f17fce26b03a6efbd14f 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -45,7 +45,7 @@ gssapi.h: gssapi.hin
        (echo "/* This is the gssapi.h prologue. */"; \
        echo "/* It contains some choice pieces of autoconf.h */"; \
        sed -n "/SIZEOF/s//GSS_&/p" < $(BUILDTOP)/include/krb5/autoconf.h; \
-       echo "$(include_xom)"; \
+       $(include_xom); \
        echo "/* End of gssapi.h prologue. */"; \
        cat $(srcdir)/gssapi.hin )> $$h && \
        (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index aa492e4016d2dd5eaed3e9ed190c3fb301ba643c..eddec9724be91817e22cb6920ca6c2af4f869941 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-07  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (gssapi_krb5.h): Use awk hack to work around quoting
+       problem.
+
 2005-03-25  Ken Raeburn  <raeburn@mit.edu>
 
        * import_name.c (krb5_gss_import_name): Use k5_getpwuid_r.

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index ed6a752bdce308aab365823a78ce6ebc4a7d5107..cc80ad8e433f0d58a9f36c2433d2364b24554e7a 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -210,7 +210,7 @@ gssapi_krb5.h: gssapi_krb5.hin
        @echo "Creating gssapi.h" ; \
        h=gss$$$$; $(RM) $$h; \
        (echo "/* This is the gssapi_krb5.h prologue. */"; \
-       echo "$(include_stdint)" ; \
+       $(include_stdint) ; \
        echo "/* End of gssapi_krb5.h prologue. */"; \
        cat $(srcdir)/gssapi_krb5.hin )> $$h && \
        (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e