Work around Makefile quoting problems

ticket: 2992
tags: pullup

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

6 files changed, 20 insertions, 5 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 2fc3cb46d..783f92643 100644
--- 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 1a4f1755e..98bfcf04e 100644
--- 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 00370a77e..4480d3158 100644
--- 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 16b7d5767..1306b7db4 100644
--- 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 aa492e401..eddec9724 100644
--- 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 ed6a752bd..cc80ad8e4 100644
--- 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