X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/eded5b68bcd36be4920327cedd0e16e900cdf22f..070d1949d1c386a25d07ac8ac370de9c87698607:/configure.in

diff --git a/configure.in b/configure.in
index 80ff7ead17..7686b43c64 100644
--- a/configure.in
+++ b/configure.in
@@ -54,6 +54,9 @@ AC_DEFINE(KERBEROS5)])
 AC_ARG_WITH(hesiod,
 [  --with-hesiod           support Hesiod to get the POP server host],
 [AC_DEFINE(HESIOD)])
+AC_ARG_WITH(gssapi,
+[  --with-gssapi           support GSSAPI-authenticated POP],
+[AC_DEFINE(GSSAPI)])
 dnl This should be the last --with option, because --with-x is
 dnl added later on when we find the path of X, and it's best to
 dnl keep them together visually.
@@ -89,7 +92,7 @@ case "${srcdir}" in
     ## We may be able to use the $PWD environment variable to make this
     ## absolute.  But sometimes PWD is inaccurate.
     ## Make sure CDPATH doesn't affect cd (in case PWD is relative).
-    CDPATH=
+    unset CDPATH
     if test "${PWD}" != "" && test "`(cd ${PWD} ; sh -c pwd)`" = "`pwd`"  ;
     then
       srcdir="$PWD"
@@ -452,7 +455,7 @@ case "${canonical}" in
       *.B8.* ) machine=hp9000s300 opsys=hpux8 ;;
       *.08.* ) machine=hp9000s300 opsys=hpux8 ;;
       *.09.* ) machine=hp9000s300 opsys=hpux9 ;;
-      *.10.* ) machine=hp9000s300 opsys=hpux9shr ;;
+      *.1[0-9].* ) machine=hp9000s300 opsys=hpux9shr ;;
       *) machine=hp9000s300 opsys=hpux ;;
     esac
   ;;
@@ -470,7 +473,7 @@ case "${canonical}" in
   hppa*-hp-hpux9* )
     machine=hp800 opsys=hpux9
   ;;
-  hppa*-hp-hpux10* )
+  hppa*-hp-hpux1[0-9]* )
     machine=hp800 opsys=hpux10
   ;;
 
@@ -483,7 +486,7 @@ case "${canonical}" in
       *.B8.* ) machine=hp800 opsys=hpux8 ;;
       *.08.* ) machine=hp800 opsys=hpux8 ;;
       *.09.* ) machine=hp800 opsys=hpux9 ;;
-      *) machine=hp800 opsys=hpux ;;
+      *) machine=hp800 opsys=hpux10 ;;
     esac
   ;;
   hppa*-*-nextstep* )
@@ -820,7 +823,7 @@ case "${canonical}" in
 		RANLIB="ar -ts"
 		;;
       *-sunos5* | *-solaris* )
-		opsys=sol2-4
+		opsys=sol2-5
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		;;
       *			  ) opsys=bsd4-2   ;;
@@ -1083,7 +1086,7 @@ dnl checks for Unix variants
 AC_AIX
 
 dnl checks for header files
-AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h linux/version.h sys/systeminfo.h termios.h limits.h)
+AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h linux/version.h sys/systeminfo.h termios.h limits.h string.h)
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_DECL_SYS_SIGLIST
@@ -1623,7 +1626,11 @@ if test "${with_kerberos+set}" = set; then
   AC_CHECK_LIB(com_err, com_err)
   AC_CHECK_LIB(crypto, mit_des_cbc_encrypt)
   AC_CHECK_LIB(krb5, krb5_init_context)
-  if test "${with_kerberos5+set}" != set; then
+  if test "${with_kerberos5+set}" = set; then
+    if test "${with_gssapi+set}" = set; then
+      AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context)
+    fi
+  else
     AC_CHECK_LIB(des, des_cbc_encrypt,,
 		 AC_CHECK_LIB(des425, des_cbc_encrypt))
     AC_CHECK_LIB(krb, krb_get_cred,,
@@ -1643,6 +1650,11 @@ if test "${with_kerberos+set}" = set; then
   AC_CHECK_HEADERS(com_err.h)
 fi
 
+if test "${with_gssapi+set}" = set; then
+  AC_CHECK_LIB(gssapi, gss_init_sec_context)
+  AC_CHECK_HEADERS(gssapi.h)
+fi
+
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
 AC_CHECK_LIB(intl, dgettext)