Changeset 14515f6


Ignore:
Timestamp:
Nov 17, 2013, 3:44:13 AM (8 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Branches:
release-1.9
Children:
a4f7b99
Parents:
990772c
git-author:
Anders Kaseorg <andersk@mit.edu> (12/21/12 16:58:50)
git-committer:
Anders Kaseorg <andersk@mit.edu> (11/17/13 03:44:13)
Message:
configure: Look for libcrypto even when configuring --without-krb4

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit 35a9ec77205b3cd3470878d2b3329d40f19eb242)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r489df88 r14515f6  
    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
    5864   AC_CHECK_LIB([zephyr], [ZGetSender],
    5965   [LIBS="$LIBS -lzephyr"
Note: See TracChangeset for help on using the changeset viewer.