[SCM] GNU gsasl branch, master, updated. gsasl-1-4-1-36-gf638d06

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=f638d0632641ee837b7abac760667a222d074700

The branch, master has been updated
       via  f638d0632641ee837b7abac760667a222d074700 (commit)
       via  6fb9a1a196f72ce12926193f6397a257c47cbdda (commit)
      from  a198fcf549b7c8597e53ed15a86937a43df127b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f638d0632641ee837b7abac760667a222d074700
Author: Simon Josefsson <address@hidden>
Date:   Fri Mar 12 21:27:09 2010 +0100

    Don't pollute CFLAGS/LIBS with GSS-API stuff.

commit 6fb9a1a196f72ce12926193f6397a257c47cbdda
Author: Simon Josefsson <address@hidden>
Date:   Fri Mar 12 18:46:34 2010 +0100

    Fix typo.

-----------------------------------------------------------------------

Summary of changes:
 lib/configure.ac       |   26 +++++++++++++++-----------
 lib/gs2/Makefile.am    |    5 ++++-
 lib/gssapi/Makefile.am |    7 ++++---
 tests/gs2-krb5.c       |    2 +-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lib/configure.ac b/lib/configure.ac
index 6d240d8..b0a6f1e 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -192,9 +192,6 @@ else
   AC_MSG_NOTICE([checking for GSS implementation ($gssapi_impl)])
 fi
 
-save_CPPFLAGS="$CPPFLAGS"
-save_LIBS="$LIBS"
-
 if test "$gssapi_impl" = "gss"; then
   AC_MSG_NOTICE([trying GSS])
   AC_LIB_HAVE_LINKFLAGS(gss,, [#include <gss.h>], [gss_check_version (0);])
@@ -206,8 +203,8 @@ elif test "$gssapi_impl" = "mit"; then
   AC_MSG_NOTICE([trying MIT])
   AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
   if test "$KRB5_CONFIG" != "no" ; then
-    CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags`"
-    LIBS="$LIBS `$KRB5_CONFIG --libs gssapi`"
+    GSS_CFLAGS="`$KRB5_CONFIG --cflags`"
+    GSS_LIBS="`$KRB5_CONFIG --libs gssapi`"
   else
     AC_MSG_WARN([MIT Kerberos krb5-config not found, disabling GSSAPI])
     gssapi_impl=no
@@ -216,8 +213,8 @@ elif test "$gssapi_impl" = "heimdal"; then
   AC_MSG_NOTICE([trying Heimdal])
   AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
   if test "$KRB5_CONFIG" != "no" ; then
-    CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags`"
-    LIBS="$LIBS `$KRB5_CONFIG --libs gssapi`"
+    GSS_CFLAGS="`$KRB5_CONFIG --cflags`"
+    GSS_LIBS="`$KRB5_CONFIG --libs gssapi`"
   else
     AC_MSG_WARN([Heimdal krb5-config not found, disabling GSSAPI])
     gssapi_impl=no
@@ -239,8 +236,8 @@ elif test "$gssapi_impl" != "no"; then
     AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
     if test "$KRB5_CONFIG" != "no" ; then
       AC_MSG_NOTICE([MIT/Heimdal found])
-      CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags`"
-      LIBS="$LIBS `$KRB5_CONFIG --libs gssapi`"
+      GSS_CFLAGS="`$KRB5_CONFIG --cflags`"
+      GSS_LIBS="`$KRB5_CONFIG --libs gssapi`"
       gssapi_impl=mitheimdal
     else
       gssapi_impl=no
@@ -249,16 +246,23 @@ elif test "$gssapi_impl" != "no"; then
   fi
 fi
 
+AC_SUBST([GSS_CFLAGS])
+AC_SUBST([GSS_LIBS])
+
 if test "$gssapi_impl" = "mit" -o \
    "$gssapi_impl" = "heimdal" -o \
    "$gssapi_impl" = "mitheimdal"; then
+  save_CPPFLAGS="$CPPFLAGS"
+  save_LIBS="$LIBS"
+  CPPFLAGS="$CPPFLAGS $GSS_CFLAGS"
+  LIBS="$LIBS $GSS_LIBS"
   AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
   if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
     gssapi_impl=no
     AC_MSG_WARN([Cannot find gssapi.h or gssapi/gssapi.h, disabling GSSAPI])
-    CPPFLAGS="$save_CPPFLAGS"
-    LIBS="$save_LIBS"
   fi
+  CPPFLAGS="$save_CPPFLAGS"
+  LIBS="$save_LIBS"
 fi
 
 # Disable GSSAPI/GS2 if we can't find GSS-API implementation
diff --git a/lib/gs2/Makefile.am b/lib/gs2/Makefile.am
index d4dd9ce..329e0bd 100644
--- a/lib/gs2/Makefile.am
+++ b/lib/gs2/Makefile.am
@@ -20,7 +20,8 @@
 
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CFLAGS += $(CFLAG_VISIBILITY)
-AM_CPPFLAGS = -I$(srcdir)/../src -I../src -I$(srcdir)/../gl -I../gl
+AM_CPPFLAGS = -I$(srcdir)/../src -I../src -I$(srcdir)/../gl -I../gl \
+       $(GSS_CFLAGS)
 
 EXTRA_DIST = README
 
@@ -36,3 +37,5 @@ endif
 if SERVER
 libgsasl_gs2_la_SOURCES += server.c
 endif
+
+libgsasl_gs2_la_LIBADD = $(LTLIBGSS) $(GSS_LIBS)
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index a75dc6d..815b543 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon 
Josefsson
 #
 # This file is part of GNU SASL Library.
 #
@@ -18,7 +18,8 @@
 # MA 02110-1301, USA.
 
 AM_CFLAGS = $(CFLAG_VISIBILITY)
-AM_CPPFLAGS = -I$(srcdir)/../src -I../src -I$(srcdir)/../gl -I../gl
+AM_CPPFLAGS = -I$(srcdir)/../src -I../src -I$(srcdir)/../gl -I../gl \
+       $(GSS_CFLAGS)
 
 noinst_LTLIBRARIES = libgsasl-gssapi.la
 libgsasl_gssapi_la_SOURCES = x-gssapi.h mechinfo.c
@@ -31,4 +32,4 @@ if SERVER
 libgsasl_gssapi_la_SOURCES += server.c
 endif
 
-libgsasl_gssapi_la_LIBADD = $(LTLIBGSS)
+libgsasl_gssapi_la_LIBADD = $(LTLIBGSS) $(GSS_LIBS)
diff --git a/tests/gs2-krb5.c b/tests/gs2-krb5.c
index 1bd69d7..13e1acc 100644
--- a/tests/gs2-krb5.c
+++ b/tests/gs2-krb5.c
@@ -109,7 +109,7 @@ doit (void)
       || !gsasl_server_support_p (ctx, "GS2-KRB5"))
     {
       gsasl_done (ctx);
-      fail("No support for GSSAPI.\n");
+      fail("No support for GS2-KRB5.\n");
       exit(77);
     }
 


hooks/post-receive
-- 
GNU gsasl