head	1.19;
access;
symbols
	RELEASE_8_3_0:1.18
	RELEASE_9_0_0:1.18
	RELEASE_7_4_0:1.17
	RELEASE_8_2_0:1.17
	RELEASE_6_EOL:1.15
	RELEASE_8_1_0:1.15
	RELEASE_7_3_0:1.15
	RELEASE_8_0_0:1.15
	RELEASE_7_2_0:1.15
	RELEASE_7_1_0:1.15
	RELEASE_6_4_0:1.15
	RELEASE_5_EOL:1.15
	RELEASE_7_0_0:1.15
	RELEASE_6_3_0:1.15
	PRE_XORG_7:1.15
	RELEASE_4_EOL:1.15
	RELEASE_6_2_0:1.15
	RELEASE_6_1_0:1.14
	RELEASE_5_5_0:1.14
	RELEASE_6_0_0:1.13
	RELEASE_5_4_0:1.12
	RELEASE_4_11_0:1.12
	RELEASE_5_3_0:1.11
	RELEASE_4_10_0:1.9
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.5
	RELEASE_5_1_0:1.3;
locks; strict;
comment	@# @;


1.19
date	2013.01.06.18.42.44;	author svnexp;	state Exp;
branches;
next	1.18;

1.18
date	2011.09.24.09.13.35;	author ume;	state Exp;
branches;
next	1.17;

1.17
date	2011.02.06.07.41.12;	author ume;	state Exp;
branches;
next	1.16;

1.16
date	2011.02.05.06.55.32;	author miwi;	state Exp;
branches;
next	1.15;

1.15
date	2006.05.19.20.45.36;	author ume;	state Exp;
branches;
next	1.14;

1.14
date	2005.11.02.18.37.57;	author ume;	state Exp;
branches;
next	1.13;

1.13
date	2005.05.17.16.35.40;	author ume;	state Exp;
branches;
next	1.12;

1.12
date	2004.10.25.12.42.40;	author ume;	state Exp;
branches;
next	1.11;

1.11
date	2004.07.14.18.01.21;	author ume;	state Exp;
branches;
next	1.10;

1.10
date	2004.05.28.17.47.34;	author ume;	state Exp;
branches;
next	1.9;

1.9
date	2004.03.24.19.27.30;	author ume;	state Exp;
branches;
next	1.8;

1.8
date	2004.03.11.17.16.40;	author ume;	state Exp;
branches;
next	1.7;

1.7
date	2004.01.17.15.35.34;	author ume;	state Exp;
branches;
next	1.6;

1.6
date	2003.12.04.08.06.03;	author ume;	state Exp;
branches;
next	1.5;

1.5
date	2003.06.30.16.51.00;	author ume;	state Exp;
branches;
next	1.4;

1.4
date	2003.06.01.04.21.05;	author ume;	state Exp;
branches;
next	1.3;

1.3
date	2003.04.17.17.54.43;	author ume;	state Exp;
branches;
next	1.2;

1.2
date	2003.04.16.17.28.05;	author ume;	state Exp;
branches;
next	1.1;

1.1
date	2003.04.15.18.09.30;	author ume;	state Exp;
branches;
next	;


desc
@@


1.19
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310000
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310000 | ume | 2013-01-06 16:37:52 +0000 (Sun, 06 Jan 2013) | 2 lines
## SVN ##
## SVN ## Use proper krb5-config when using HEIMDAL in ports.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@Index: configure
diff -u configure.orig configure
--- configure.orig	2012-11-07 04:21:37.000000000 +0900
+++ configure	2013-01-06 17:10:15.920678021 +0900
@@@@ -2365,6 +2365,7 @@@@
 fi
 { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
+program_prefix=NONE
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@@@ -6329,6 +6330,7 @@@@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <stdio.h>
 #include <db.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
@@@@ -7156,6 +7158,7 @@@@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <stdio.h>
 #include <db.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
@@@@ -8700,6 +8703,8 @@@@
   SASLAUTHD_TRUE='#'
   SASLAUTHD_FALSE=
 fi
+SASLAUTHD_TRUE='#'
+SASLAUTHD_FALSE=
 
 { $as_echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
 $as_echo_n "checking if I should include saslauthd... " >&6; }
@@@@ -12552,6 +12557,7 @@@@
      gssapi_dir="${gssapi}/lib"
      GSSAPIBASE_LIBS="-L$gssapi_dir"
      GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
+     gssapi_bindir="${gssapi}/bin/"
   else
      # FIXME: This is only used for building cyrus, and then only as
      # a real hack.  it needs to be fixed.
@@@@ -12571,7 +12577,7 @@@@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
+LIBS="${GSSAPIBASE_LIBS} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@@@ -13047,7 +13053,7 @@@@
     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
   elif test "$gss_impl" = "heimdal"; then
     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `${gssapi_bindir}krb5-config --libs gssapi`"
     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
   elif test "$gss_impl" = "cybersafe03"; then
 # Version of CyberSafe with two libraries
@@@@ -14479,7 +14485,7 @@@@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpq  $LIBS"
+LIBS="-lpq $GSSAPIBASE_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@


1.18
log
@Update to 2.1.25.
@
text
@d3 2
a4 2
--- configure.orig	2011-09-07 22:29:25.000000000 +0900
+++ configure	2011-09-14 15:48:43.574171984 +0900
d21 1
a21 1
@@@@ -7139,6 +7141,7 @@@@
d29 1
a29 1
@@@@ -8666,6 +8669,8 @@@@
d38 9
a46 1
@@@@ -12537,7 +12542,7 @@@@
d51 1
a51 1
+LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS"
d55 1
a55 1
@@@@ -13013,7 +13018,7 @@@@
d60 1
a60 1
+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
d64 1
a64 1
@@@@ -14358,7 +14363,7 @@@@
@


1.17
log
@Backout previous commit.
Unfortunately, it broke GSSAPI when using heimdal in base.
I have no idea how to detect whether heimdal is in base or
from ports, now.

Feature safe:	yes
@
text
@d3 3
a5 3
--- configure.orig	Fri May 19 04:30:13 2006
+++ configure	Sat May 20 04:04:39 2006
@@@@ -1586,6 +1586,7 @@@@
d7 2
a8 2
 echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
d11 1
a11 1
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
d13 1
a13 10
@@@@ -5125,7 +5126,7 @@@@
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    cat >conftest.$ac_ext <<_ACEOF
@@@@ -5135,6 +5136,7 @@@@
d19 3
a21 12
 int
 main ()
@@@@ -5882,7 +5884,7 @@@@
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    cat >conftest.$ac_ext <<_ACEOF
@@@@ -5892,6 +5894,7 @@@@
d27 3
a29 3
 int
 main ()
@@@@ -7193,6 +7196,8 @@@@
d36 4
a39 4
 echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
 echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
@@@@ -10650,7 +10655,7 @@@@
   echo $ECHO_N "(cached) $ECHO_C" >&6
a44 1
 #line $LINENO "configure"
d46 2
a47 1
@@@@ -11060,7 +11065,7 @@@@
d56 2
a57 2
@@@@ -11898,7 +11903,7 @@@@
   echo $ECHO_N "(cached) $ECHO_C" >&6
a62 1
 #line $LINENO "configure"
d64 1
@


1.16
log
@* Fix GSSAPI when using heimdal from ports

PR:		152071
Submitted by:	Joerg Pulz <Joerg.Pulz@@frm2.tum.de>
Approved by:	maintainer timeout
Feature safe:	yes
@
text
@d1 4
a4 2
--- configure.orig	2009-05-07 16:24:25.000000000 +0200
+++ configure	2010-11-09 10:26:27.000000000 +0100
d13 1
a13 1
@@@@ -5147,7 +5148,7 @@@@
d22 1
a22 1
@@@@ -5157,6 +5158,7 @@@@
d30 1
a30 1
@@@@ -5904,7 +5906,7 @@@@
d39 1
a39 1
@@@@ -5914,6 +5916,7 @@@@
d47 1
a47 1
@@@@ -7215,6 +7218,8 @@@@
d56 1
a56 1
@@@@ -10672,7 +10677,7 @@@@
d65 1
a65 1
@@@@ -11082,7 +11087,7 @@@@
d74 1
a74 19
@@@@ -11119,7 +11124,7 @@@@
 # in gssapi\rfckrb5.h
 #
 if test "$gssapi" != "no"; then
-  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03" -o "$gss_impl" = "heimdal"; then
     cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@@@ -11190,7 +11195,7 @@@@
 
   fi
 
-  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03" -o "$gss_impl" = "heimdal"; then
     cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@@@ -11920,7 +11925,7 @@@@
@


1.15
log
@Update to 2.1.22.
@
text
@d1 2
a2 4
Index: configure
diff -u configure.orig configure
--- configure.orig	Fri May 19 04:30:13 2006
+++ configure	Sat May 20 04:04:39 2006
d11 1
a11 1
@@@@ -5125,7 +5126,7 @@@@
d20 1
a20 1
@@@@ -5135,6 +5136,7 @@@@
d28 1
a28 1
@@@@ -5882,7 +5884,7 @@@@
d37 1
a37 1
@@@@ -5892,6 +5894,7 @@@@
d45 1
a45 1
@@@@ -7193,6 +7196,8 @@@@
d54 1
a54 1
@@@@ -10650,7 +10655,7 @@@@
d63 1
a63 1
@@@@ -11060,7 +11065,7 @@@@
d72 19
a90 1
@@@@ -11898,7 +11903,7 @@@@
@


1.14
log
@make security/cyrus-sasl2-ldapdb buildable with OpenLDAP 2.3.

PR:		ports/88324
Submitted by:	skv
@
text
@d3 3
a5 3
--- configure.orig	Sun May 15 14:58:28 2005
+++ configure	Wed Nov  2 19:11:22 2005
@@@@ -1583,6 +1583,7 @@@@
d13 1
a13 1
@@@@ -5124,7 +5125,7 @@@@
d22 1
a22 1
@@@@ -5134,6 +5135,7 @@@@
d30 1
a30 1
@@@@ -5881,7 +5883,7 @@@@
d39 1
a39 1
@@@@ -5891,6 +5893,7 @@@@
d47 1
a47 28
@@@@ -6512,7 +6515,7 @@@@
 echo "$as_me: WARNING: Disabling SASL authentication database support" >&2;}
             SASL_DB_BACKEND="db_none.lo"
     SASL_DB_BACKEND_STATIC="db_none.o"
-    SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
+    SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_none.c"
     SASL_DB_UTILS=""
     SASL_DB_MANS=""
     SASL_DB_LIB=""
@@@@ -6521,7 +6524,7 @@@@
 
 if test "$enable_static" = yes; then
     if test "$dblib" != "none"; then
-      SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
+      SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
       SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
 
 cat >>confdefs.h <<\_ACEOF
@@@@ -6530,7 +6533,7 @@@@
 
     else
       SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
-      SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
+      SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
     fi
 fi
 
@@@@ -7167,6 +7170,8 @@@@
d56 1
a56 1
@@@@ -10564,7 +10569,7 @@@@
d65 2
a66 2
@@@@ -10914,7 +10919,7 @@@@
     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
d74 1
a74 1
@@@@ -11752,7 +11757,7 @@@@
a82 9
@@@@ -12253,6 +12258,8 @@@@
 char *__openldap_compat = "2.1.27 or better okay";
 #elif LDAP_VENDOR_VERSION_MAJOR == 2  && LDAP_VENDOR_VERSION_MINOR == 2 && LDAP_VENDOR_VERSION_PATCH > 5
 char *__openldap_compat = "2.2.6 or better okay";
+#elif LDAP_VENDOR_VERSION_MAJOR == 2  && LDAP_VENDOR_VERSION_MINOR > 2
+char *__openldap_compat = "2.3.0 or better okay";
 #endif
 
 _ACEOF
@


1.13
log
@Update to 2.1.21.
LDAPDB auxprop plugin was added since this version.  Unfortunately,
we cannot simply enable it in ports tree to avoid dependency loop
with OpenLDAP port.  So, I'll add separete port for it later.
@
text
@d4 1
a4 1
+++ configure	Wed May 18 00:40:41 2005
d110 9
@


1.12
log
@Update to 2.1.20.

  * Fixes to cram plugin to avoid attempting to canonify uninitialized data.
  * NTLM portability fixes.
  * Avoid potential attack using SASL_PATH when sasl is used in a setuid
    environment.
  * A trivial number of small bugfixes.
@
text
@d3 3
a5 3
--- configure.orig	Mon Oct 25 05:21:08 2004
+++ configure	Mon Oct 25 21:24:23 2004
@@@@ -1578,6 +1578,7 @@@@
d13 1
a13 1
@@@@ -5129,7 +5130,7 @@@@
d17 2
a18 2
-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d22 1
a22 1
@@@@ -5139,6 +5140,7 @@@@
d30 1
a30 9
@@@@ -5161,6 +5163,7 @@@@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
+  break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@@@ -5885,7 +5888,7 @@@@
d34 2
a35 2
-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d39 1
a39 1
@@@@ -5895,6 +5898,7 @@@@
d47 28
a74 9
@@@@ -5917,6 +5921,7 @@@@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
+  break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@@@ -7089,6 +7094,8 @@@@
d83 1
a83 1
@@@@ -10084,7 +10091,7 @@@@
d87 2
a88 2
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
+LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
d92 1
a92 1
@@@@ -10434,7 +10441,7 @@@@
d101 1
a101 1
@@@@ -11229,7 +11236,7 @@@@
@


1.11
log
@Update to 2.1.19.
@
text
@d3 3
a5 3
--- configure.orig	Sat Jul  3 04:39:54 2004
+++ configure	Thu Jul 15 02:37:58 2004
@@@@ -1577,6 +1577,7 @@@@
d13 1
a13 2
@@@@ -5127,7 +5128,7 @@@@
 	    BDB_LIBADD=""
d16 1
d20 8
a27 8
             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
@@@@ -5151,11 +5152,11 @@@@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+#include <db.h>
d30 9
a38 8
 {
-db_create ();
+db_create (0, 0, 0);
   ;
   return 0;
 }
@@@@ -5930,7 +5931,7 @@@@
 	    BDB_LIBADD=""
d41 1
d45 8
a52 8
             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
@@@@ -5954,11 +5955,11 @@@@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+#include <db.h>
d55 9
a63 7
 {
-db_create ();
+db_create (0, 0, 0);
   ;
   return 0;
 }
@@@@ -7182,6 +7183,8 @@@@
d72 1
a72 1
@@@@ -10170,7 +10173,7 @@@@
d81 1
a81 2
@@@@ -10519,7 +10522,7 @@@@
     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
d84 1
d90 1
a90 1
@@@@ -11291,7 +11294,7 @@@@
@


1.10
log
@Add WITH_SQLITE option to support sql plugin with SQLite
using nork's patch.
His patch was already merged into cyrus-sasl2 and will be
included in next release.

Requested by:	nork
@
text
@d3 3
a5 12
--- configure.orig	Thu Mar 11 00:56:10 2004
+++ configure	Fri May 28 18:13:50 2004
@@@@ -309,7 +309,7 @@@@
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all saslauthd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB LIBTOOL PURECOV PURIFY JAVAC JAVAH JAVADOC JAVA_TRUE JAVA_FALSE JAVA_INCLUDES JAVAROOT SAMPLE_TRUE SAMPLE_FALSE LIB_SOCKET EGREP SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB NO_SASL_DB_MANS_TRUE NO_SASL_DB_MANS_FALSE SASL_DL_LIB NM SASLAUTHD_TRUE SASLAUTHD_FALSE PWCHECKMETH PWCHECK_TRUE PWCHECK_FALSE IPCTYPE LIB_DES OTP_LIBS SRP_LIBS SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS PLAIN_LIBS NTLM_LIBS LIB_MYSQL LIB_PGSQL SASL_MECHS SASL_STATIC_OBJS SASL_STATIC_LIBS plugindir MACOSX_TRUE MACOSX_FALSE DMALLOC_LIBS SFIO_INC_FLAGS SFIO_LIB_FLAGS SMTPTEST_PROGRAM SASL_UTIL_LIBS_EXTRA SASL_UTIL_HEADERS_EXTRA LIBOBJS GETSUBOPT SNPRINTFOBJS LTSNPRINTFOBJS GETADDRINFOOBJS LTGETADDRINFOOBJS GETNAMEINFOOBJS LTGETNAMEINFOOBJS LTLIBOBJS DIRS subdirs'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB LIBTOOL PURECOV PURIFY JAVAC JAVAH JAVADOC JAVA_TRUE JAVA_FALSE JAVA_INCLUDES JAVAROOT SAMPLE_TRUE SAMPLE_FALSE LIB_SOCKET EGREP SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB NO_SASL_DB_MANS_TRUE NO_SASL_DB_MANS_FALSE SASL_DL_LIB NM SASLAUTHD_TRUE SASLAUTHD_FALSE PWCHECKMETH PWCHECK_TRUE PWCHECK_FALSE IPCTYPE LIB_DES OTP_LIBS SRP_LIBS SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS PLAIN_LIBS NTLM_LIBS LIB_MYSQL LIB_PGSQL LIB_SQLITE SASL_MECHS SASL_STATIC_OBJS SASL_STATIC_LIBS plugindir MACOSX_TRUE MACOSX_FALSE DMALLOC_LIBS SFIO_INC_FLAGS SFIO_LIB_FLAGS SMTPTEST_PROGRAM SASL_UTIL_LIBS_EXTRA SASL_UTIL_HEADERS_EXTRA LIBOBJS GETSUBOPT SNPRINTFOBJS LTSNPRINTFOBJS GETADDRINFOOBJS LTGETADDRINFOOBJS GETNAMEINFOOBJS LTGETNAMEINFOOBJS LTLIBOBJS DIRS subdirs'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@@@ -1576,6 +1576,7 @@@@
d13 1
a13 1
@@@@ -5126,7 +5127,7 @@@@
d22 1
a22 1
@@@@ -5150,11 +5151,11 @@@@
d36 1
a36 1
@@@@ -5929,7 +5930,7 @@@@
d45 1
a45 1
@@@@ -5953,11 +5954,11 @@@@
d59 1
a59 1
@@@@ -7181,6 +7182,8 @@@@
d68 1
a68 1
@@@@ -10167,7 +10170,7 @@@@
d77 1
a77 1
@@@@ -10516,7 +10519,7 @@@@
d86 1
a86 1
@@@@ -11224,7 +11227,7 @@@@
d90 2
a91 2
-LIBS="-lpq $LIB_PGSQL_DIR $LIBS"
+LIBS="-lpq $LIB_PGSQL_DIR $GSSAPIBASE_LIBS $LIBS"
a94 32
@@@@ -11288,7 +11291,22 @@@@
 esac
 
 
-if test "$sql" = yes -a "$with_pgsql" = no -a "$with_mysql" = no; then
+LIB_SQLITE=""
+
+case "$with_sqlite" in
+    no) true;;
+    *)
+     LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib -lsqlite"
+     CPPFLAGS="${CPPFLAGS} -I${with_sqlite}/include"
+
+     cat >>confdefs.h <<\_ACEOF
+#define HAVE_SQLITE
+_ACEOF
+    ;;
+esac
+
+
+if test "$sql" = yes -a "$with_pgsql" = no -a "$with_mysql" = no -a "$with_sqlite" = no; then
     { { echo "$as_me:$LINENO: error: --enable-sql chosen but neither Postgres nor MySQL found" >&5
 echo "$as_me: error: --enable-sql chosen but neither Postgres nor MySQL found" >&2;}
    { (exit 1); exit 1; }; }
@@@@ -15021,6 +15039,7 @@@@
 s,@@NTLM_LIBS@@,$NTLM_LIBS,;t t
 s,@@LIB_MYSQL@@,$LIB_MYSQL,;t t
 s,@@LIB_PGSQL@@,$LIB_PGSQL,;t t
+s,@@LIB_SQLITE@@,$LIB_SQLITE,;t t
 s,@@SASL_MECHS@@,$SASL_MECHS,;t t
 s,@@SASL_STATIC_OBJS@@,$SASL_STATIC_OBJS,;t t
 s,@@SASL_STATIC_LIBS@@,$SASL_STATIC_LIBS,;t t
@


1.9
log
@PGSQL may be built with GSSAPI.

Reported by:	"Wolfram A. Kraushaar" <wak@@prioris.dstm.de>
@
text
@d4 10
a13 1
+++ configure	Thu Mar 25 04:11:41 2004
d104 32
@


1.8
log
@Update to 2.1.18.
@
text
@d4 1
a4 1
+++ configure	Fri Mar 12 00:26:13 2004
d86 9
@


1.7
log
@Support Berkeley DB 4.2.
Since our db42 requires to include db.h to use. existing configure
script cannot detect our db42.  AC_CHECK_LIB() simply test if a
function exists. :(

Requested by:	Dmitry Sorokin <dmitry_sorokin@@yahoo.ca>
@
text
@d3 3
a5 3
--- configure.orig	Tue Dec  2 01:35:06 2003
+++ configure	Sat Jan 17 23:21:19 2004
@@@@ -1575,6 +1575,7 @@@@
d13 1
a13 1
@@@@ -5132,7 +5133,7 @@@@
d17 2
a18 2
-        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d22 1
a22 1
@@@@ -5156,11 +5157,11 @@@@
d36 1
a36 1
@@@@ -5935,7 +5936,7 @@@@
d40 2
a41 2
-        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d45 1
a45 1
@@@@ -5959,11 +5960,11 @@@@
d59 1
a59 1
@@@@ -7187,6 +7188,8 @@@@
d68 1
a68 1
@@@@ -10136,7 +10139,7 @@@@
d77 1
a77 1
@@@@ -10485,7 +10488,7 @@@@
@


1.6
log
@Update to 2.1.17.
@
text
@d4 1
a4 1
+++ configure	Tue Dec  2 12:15:15 2003
d22 14
d45 14
@


1.5
log
@Update to 2.1.14.
@
text
@d3 11
a13 3
--- configure.orig	Sat Jun 28 06:21:13 2003
+++ configure	Tue Jul  1 01:09:52 2003
@@@@ -2654,7 +2654,7 @@@@
d20 3
a22 3
             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
 echo "configure:2661: checking for db_create in -l$dbname" >&5
@@@@ -3045,7 +3045,7 @@@@
d29 3
a31 3
             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
 echo "configure:3052: checking for db_create in -l$dbname" >&5
@@@@ -3791,6 +3791,8 @@@@
d37 5
a41 5
 echo $ac_n "checking if I should include saslauthd""... $ac_c" 1>&6
 echo "configure:3796: checking if I should include saslauthd" >&5
 echo "$ac_t""$with_saslauthd" 1>&6
@@@@ -5487,7 +5489,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
d43 2
a44 2
   ac_save_LIBS="$LIBS"
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
d46 6
a51 6
 cat > conftest.$ac_ext <<EOF
 #line 5493 "configure"
 #include "confdefs.h"
@@@@ -5568,7 +5570,7 @@@@
      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
d53 5
a57 5
-     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
   elif test "$gss_impl" = "seam"; then
      GSSAPIBASE_LIBS=-lgss
@


1.4
log
@- Make saslauthd a separate port to avoid dependency loop between
  cyrus-sasl2 and openldap.
- Stop using configuration menu.  I believe it ease to maintain
  consistency with other SASL related ports.
@
text
@d3 3
a5 3
--- configure.orig	Tue Apr 15 03:07:48 2003
+++ configure	Tue May 27 17:29:16 2003
@@@@ -2652,7 +2652,7 @@@@
d9 2
a10 2
-        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
d13 2
a14 2
 echo "configure:2659: checking for db_create in -l$dbname" >&5
@@@@ -3043,7 +3043,7 @@@@
d18 2
a19 2
-        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
d22 2
a23 2
 echo "configure:3050: checking for db_create in -l$dbname" >&5
@@@@ -3761,6 +3761,8 @@@@
d30 1
a30 1
 echo "configure:3766: checking if I should include saslauthd" >&5
d32 1
a32 1
@@@@ -5456,7 +5458,7 @@@@
d39 1
a39 1
 #line 5462 "configure"
d41 1
a41 1
@@@@ -5494,7 +5496,7 @@@@
d48 2
a49 2
   else
      gssapi="no"
@


1.3
log
@- The pidfile of saslauthd was changed.
- The configure script should select correct version of Berkeley DB.

PR:		ports/51041
Submitted by:	Oliver Eikemeier <eikemeier@@fillmore-labs.com>
@
text
@d1 4
a4 2
--- configure.orig	Mon Apr 14 20:07:48 2003
+++ configure	Tue Apr 15 01:39:33 2003
d23 10
a32 1
@@@@ -5456,7 +5456,7 @@@@
d41 1
a41 1
@@@@ -5494,7 +5494,7 @@@@
@


1.2
log
@make configure script pickking up the Heimdal Kerberos that's
in FreeBSD's base.

Submitted by:	Graeme Mathieson <mathie@@wossname.org.uk>
@
text
@d8 1
a8 1
+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
d17 1
a17 1
+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
@


1.1
log
@add missing files which should be committed by previous committed.
@
text
@d21 18
@

