Changeset 946bc37


Ignore:
Timestamp:
Jan 15, 2013, 5:51:41 AM (9 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Parents:
05adccf (diff), 58b6ce5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge 58b6ce5427395fc8c1887a2a8c69ea459a1fc9e5 into 05adccf169f26130f56cd69a12829a9d80043a75
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r290e2d0 r58b6ce5  
    4141
    4242AS_IF([test "x$with_zephyr" != xno],
    43   [AS_IF([test "x$with_krb4" != "xno"],
     43  [have_krb4=no
     44
     45   AS_IF([test "x$with_krb4" != "xno"],
    4446   [AC_MSG_CHECKING([for Kerberos IV])
    4547    AS_IF([krb5-config krb4 --libs >/dev/null 2>&1],
    4648      [AC_MSG_RESULT([yes])
     49       have_krb4=yes
    4750       AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
    4851       AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`"
     
    5154      [AC_MSG_RESULT([no])
    5255       AS_IF([test "x$with_krb4" = "xyes"],
    53              [AC_MSG_ERROR([Kerberos IV requested but not found])])
    54        PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
    55        AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
    56        LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
    57      ])])
     56             [AC_MSG_ERROR([Kerberos IV requested but not found])])])])
     57
     58   AS_IF([test "x$have_krb4" != xyes],
     59     [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto],
     60        [AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
     61         LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
     62        ],
     63        [PKG_CHECK_MODULES([OPENSSL], [openssl],
     64           [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}"
     65            LIBS="${LIBS} ${OPENSSL_LIBS}"
     66           ])])])
     67
    5868   AC_CHECK_LIB([zephyr], [ZGetSender],
    5969   [LIBS="$LIBS -lzephyr"
Note: See TracChangeset for help on using the changeset viewer.