* Makefile.in (check-unix): Invoke t_krbconf instead of struggling

	with differing versions of make's quoting of \ and $.

	* t_krbconf: Small shell script to test krb5-config.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c330861dc9aa51690b59b8bcaeaf9b2cedc9810..d936dd164c62cc9cb0a880cdb1fc0337354ab074 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-14  Ezra Peisach  <epeisach@bu.edu>
+
+       * Makefile.in (check-unix): Invoke t_krbconf instead of struggling
+       with differing versions of make's quoting of \ and $.
+
+       * t_krbconf: Small shell script to test krb5-config.
+
 2003-01-13  Ezra Peisach  <epeisach@bu.edu>
 
        * Makefile.in (check-unix): Test to see if krb5-config outputs

diff --git a/src/Makefile.in b/src/Makefile.in
index 284986a5495fb2ffb976c023e677729af3c5ae33..ad53c7e2341314b6996fa3ef9e06b220359fab88 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -571,13 +571,4 @@ krb5-config: $(srcdir)/krb5-config.in $(thisconfigdir)/config.status
 # Test to ensure that krb5-config does not spit out things like
 # $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
 check-unix:: krb5-config
-       @echo "Testing if krb5-config outputs shell variables"
-       @if `./krb5-config --libs kdb | egrep -s '\\$$'`; then \
-          echo "Error './krb5-config --libs kdb' contains shell variables"; \
-          exit 1; \
-        fi
-       @if `./krb5-config --cflags | egrep -s '\\$$'`; then \
-          echo "Error './krb5-config --cflags' contains shell variables"; \
-          exit 1; \
-        fi
-       @echo "krb5-config appears ok"
+       $(SHELL) $(srcdir)/t_krbconf

diff --git a/src/t_krbconf b/src/t_krbconf
new file mode 100644 (file)
index 0000000..caca81d
--- /dev/null
+++ b/src/t_krbconf
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Copyright 2003 by the Massachusetts Institute of Technology.
+# All Rights Reserved.
+#
+# Export of this software from the United States of America may
+#   require a specific license from the United States Government.
+#   It is the responsibility of any person or organization contemplating
+#   export to obtain such a license before exporting.
+# 
+# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+# distribute this software and its documentation for any purpose and
+# without fee is hereby granted, provided that the above copyright
+# notice appear in all copies and that both that copyright notice and
+# this permission notice appear in supporting documentation, and that
+# the name of M.I.T. not be used in advertising or publicity pertaining
+# to distribution of the software without specific, written prior
+# permission.  Furthermore if you modify this software you must label
+# your software as modified software and not distribute it in such a
+# fashion that it might be confused with the original M.I.T. software.
+# M.I.T. makes no representations about the suitability of
+# this software for any purpose.  It is provided "as is" without express
+# or implied warranty.
+
+echo "Testing if krb5-config outputs shell variables"
+echo "  Testing --libs argument"
+if `./krb5-config --libs kdb | egrep -s '\\$'`; then 
+       echo "Error './krb5-config --libs kdb' contains shell variables"; 
+       exit 1; 
+fi
+
+echo "  Testing --cflags argument"
+if `./krb5-config --cflags | egrep -s '\\$'`; then \
+       echo "Error './krb5-config --cflags' contains shell variables"; \
+       exit 1; \
+fi
+echo "krb5-config tests pass"
+exit 0