cyrus-sasl-ac25x.patch

   1 --- cyrus-sasl-1.5.28/configure.in.orig Fri Oct 15 12:47:12 2004
   2 +++ cyrus-sasl-1.5.28/configure.in      Fri Oct 15 12:52:00 2004
   3 @@ -164,10 +164,12 @@
   4                         BERKELEY_DB_CHK_LIB()
   5                         if test "$dblib" = "berkeley"; then
   6                           AC_DEFINE(HAVE_DB3_DB_H)
   7 -                       fi,
   8 -               AC_CHECK_HEADER(db.h,
   9 -                                      BERKELEY_DB_CHK_LIB(),
  10 -                               dblib="no"))
  11 +                       fi, db3dbhnotfound="yes")
  12 +       if test "$db3dbhnotfound" = "yes"; then
  13 +              AC_CHECK_HEADER(db.h,
  14 +                              BERKELEY_DB_CHK_LIB(),
  15 +                              dblib="no")
  16 +       fi
  17  ])
  18
  19  case "$dblib" in
  20 @@ -184,8 +186,8 @@
  21         dnl We want to attempt to use -lndbm if we can, just in case
  22         dnl there's some version of it installed and overriding libc
  23         AC_CHECK_HEADER(ndbm.h,
  24 -                       AC_CHECK_LIB(ndbm, dbm_open, SASL_DB_LIB="-lndbm",
  25 -                               AC_CHECK_FUNC(dbm_open,,dblib="no")),
  26 +                       [AC_CHECK_LIB(ndbm, dbm_open, SASL_DB_LIB="-lndbm",
  27 +                               [AC_CHECK_FUNC(dbm_open,,dblib="no")])],
  28                                 dblib="no")
  29         ;;
  30    auto_detect)
  31 @@ -288,8 +290,8 @@
  32    fi
  33    cmu_save_LIBS="$LIBS"
  34    AC_CHECK_LIB(pam, pam_start,
  35 -         AC_CHECK_HEADER(security/pam_appl.h,,
  36 -                         with_pam=no),
  37 +         [AC_CHECK_HEADER(security/pam_appl.h,,
  38 +                         with_pam=no)],
  39                 with_pam=no, $SASL_DL_LIB)
  40    LIBS="$cmu_save_LIBS"
  41  fi
  42 @@ -483,10 +485,10 @@
  43                   cmu_have_rsaref=no)
  44
  45      AC_CHECK_LIB(crypto, des_pcbc_encrypt,
  46 -       AC_CHECK_HEADER(openssl/des.h, [AC_DEFINE(WITH_SSL_DES)
  47 +       [AC_CHECK_HEADER(openssl/des.h, [AC_DEFINE(WITH_SSL_DES)
  48                                         LIB_DES="-lcrypto";
  49                                         with_des=yes],
  50 -                       with_des=no),
  51 +                       with_des=no)],
  52          with_des=no, $LIB_RSAREF)
  53    fi
  54  fi
  55 @@ -599,7 +601,7 @@
  56       LDFLAGS="$LDFLAGS -L$gssapi/lib"
  57    fi
  58    AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H),
  59 -    AC_CHECK_HEADER(gssapi/gssapi.h,, AC_WARN(Disabling GSSAPI); gssapi=no))
  60 +    [AC_CHECK_HEADER(gssapi/gssapi.h,, AC_WARN(Disabling GSSAPI); gssapi=no)])
  61  fi
  62
  63  if test "$gssapi" != no; then
  64 @@ -780,7 +782,7 @@
  65  sasl_cv_getsubopt=no
  66  AC_CHECK_FUNC(getsubopt, [AC_DEFINE(HAVE_GETSUBOPT)], [sasl_cv_getsubopt=yes])
  67  if test $sasl_cv_getsubopt = yes; then
  68 -       LIBOBJS="$LIBOBJS getsubopt.o"
  69 +       AC_LIBOBJ([getsubopt])
  70         GETSUBOPT="getsubopt.lo"
  71  fi
  72  AC_SUBST(GETSUBOPT)
  73 @@ -791,12 +793,12 @@
  74  AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)], [sasl_cv_snprintf=yes])
  75  AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF)], [sasl_cv_snprintf=yes])
  76  if test $sasl_cv_snprintf = yes; then
  77 -       LIBOBJS="$LIBOBJS snprintf.o"
  78 +       AC_LIBOBJ([snprintf])
  79          SNPRINTFOBJS="snprintf.o"
  80  fi
  81  AC_SUBST(SNPRINTFOBJS)
  82
  83 -LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
  84 +LTLIBOBJS=`echo "$LIB@&t@OBJS" | sed 's/\.o/.lo/g'`
  85  AC_SUBST(LTLIBOBJS)
  86
  87  AC_CHECK_HEADERS(getopt.h unistd.h crypt.h pwd.h shadow.h paths.h)