pullup from trunk

ticket: 2992
version_fixed: 1.4.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17171 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index af6063232dffcce36b3f7d80a44b61174d1ccf2d..979a91ed9599082b28ca43789e228e0de9ff7eff 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 ce4dfdcea20dbfa13697481defa3946ee278ba5a..a7d997b8897b6ff27b54fb2d7b75a110957d5674 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 e49be6ba37b802d8ca7e47fc42ac9c9e89f087d8..edcd9a2fecc301a1999c7d43d2c111aa389fe11f 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-01-13 Jeffrey Altman <jaltman@mit.edu>
 
         * init_sec_context.c, acquire_cred.c: fix calls to 

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index ae58e65e345e26d1a64395a080348be75495ff44..37b6307c23d2067ccead5dcc30f3fbc2206f6821 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