[Cvs-cvs] ccvs ./ChangeLog ./NEWS ./configure m4/ChangeLo...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/27 18:42:25

Modified files:
        .              : ChangeLog NEWS configure 
        m4             : ChangeLog acx_with_gssapi.m4 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1295&tr2=1.1296&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/NEWS.diff?tr1=1.352&tr2=1.353&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?tr1=1.445&tr2=1.446&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/ChangeLog.diff?tr1=1.165&tr2=1.166&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/acx_with_gssapi.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1295 ccvs/ChangeLog:1.1296
--- ccvs/ChangeLog:1.1295       Tue Apr 25 20:02:45 2006
+++ ccvs/ChangeLog      Thu Apr 27 18:42:25 2006
@@ -1,3 +1,7 @@
+2006-04-27  Derek Price  <address@hidden>
+
+       * NEWS: Note that GSSAPI builds under HP-UX.
+
 2006-04-25  Derek Price  <address@hidden>
 
        * configure.in: Move GNU function attribute protection from src/cvs.h.
Index: ccvs/NEWS
diff -u ccvs/NEWS:1.352 ccvs/NEWS:1.353
--- ccvs/NEWS:1.352     Tue Mar 28 15:31:08 2006
+++ ccvs/NEWS   Thu Apr 27 18:42:25 2006
@@ -17,6 +17,8 @@
 
 BUG FIXES
 
+* The GSSAPI server should now build under HP-UX.
+
 * `cvs rtag' now correctly tags files that have been removed from the trunk.
 
 * Code efficiency has been improved slightly.
Index: ccvs/configure
diff -u ccvs/configure:1.445 ccvs/configure:1.446
--- ccvs/configure:1.445        Tue Apr 25 20:02:45 2006
+++ ccvs/configure      Thu Apr 27 18:42:25 2006
@@ -43208,12 +43208,17 @@
 
 
   #
+  # gss                        This may be the only lib needed under HP-UX, so 
find it
+  #                    first.
+  #
   # gssapi_krb5                Only lib needed with MIT K5 v1.2.1, so find it 
first in
   #                    order to prefer MIT Kerberos.  If both MIT & Heimdal
   #                    Kerberos are installed and in the path, this will leave
   #                    some of the libraries above in LIBS unnecessarily, but
   #                    noone would ever do that, right?
   #
+  # gss                        HP-UX                   ???
+  #
   # gssapi_krb5                MIT K5 v1.2.2-beta1     -lkrb5
   #
   # gssapi             Heimdal K 0.3d          -lkrb5
@@ -43278,7 +43283,7 @@
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_gss_import_name" = no; then
-  for ac_lib in gssapi_krb5 gssapi; do
+  for ac_lib in gss gssapi_krb5 gssapi; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
Index: ccvs/m4/ChangeLog
diff -u ccvs/m4/ChangeLog:1.165 ccvs/m4/ChangeLog:1.166
--- ccvs/m4/ChangeLog:1.165     Tue Apr 25 14:50:23 2006
+++ ccvs/m4/ChangeLog   Thu Apr 27 18:42:25 2006
@@ -1,3 +1,8 @@
+2006-04-27  Derek Price  <address@hidden>
+
+       * acx_with_gssapi.m4 (ACX_WITH_GSSAPI): Detect libgss for HP-UX.
+       (Report from Larry Jones <address@hidden>.)
+
 2006-04-25  Derek Price  <address@hidden>
 
        * extensions.m4, getcwd-path-max.m4, getlogin_r.m4, getpass.m4,
Index: ccvs/m4/acx_with_gssapi.m4
diff -u ccvs/m4/acx_with_gssapi.m4:1.2 ccvs/m4/acx_with_gssapi.m4:1.3
--- ccvs/m4/acx_with_gssapi.m4:1.2      Mon Sep 26 23:44:30 2005
+++ ccvs/m4/acx_with_gssapi.m4  Thu Apr 27 18:42:25 2006
@@ -271,16 +271,21 @@
   AC_SEARCH_LIBS([krb5_free_context], [krb5])
 
   #
+  # gss                        This may be the only lib needed under HP-UX, so 
find it
+  #                    first.
+  #
   # gssapi_krb5                Only lib needed with MIT K5 v1.2.1, so find it 
first in
   #                    order to prefer MIT Kerberos.  If both MIT & Heimdal
   #                    Kerberos are installed and in the path, this will leave
   #                    some of the libraries above in LIBS unnecessarily, but
   #                    noone would ever do that, right?
   #
+  # gss                        HP-UX                   ???
+  #
   # gssapi_krb5                MIT K5 v1.2.2-beta1     -lkrb5
   #
   # gssapi             Heimdal K 0.3d          -lkrb5
   #
-  AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi])
+  AC_SEARCH_LIBS([gss_import_name], [gss gssapi_krb5 gssapi])
 fi
 ])dnl