Changeset 35a9ec7 for configure.ac

Timestamp:

Jan 15, 2013, 5:51:27 AM (10 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

1f121cb

Parents:

05adccf

git-author:

Anders Kaseorg <andersk@mit.edu> (12/21/12 16:58:50)

git-committer:

Anders Kaseorg <andersk@mit.edu> (01/15/13 05:51:27)

Message:

configure: Look for libcrypto even when configuring --without-krb4

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -41 +41 @@
 
 AS_IF([test "x$with_zephyr" != xno],
-  [AS_IF([test "x$with_krb4" != "xno"],
+  [have_krb4=no
+
+   AS_IF([test "x$with_krb4" != "xno"],
    [AC_MSG_CHECKING([for Kerberos IV])
     AS_IF([krb5-config krb4 --libs >/dev/null 2>&1],
       [AC_MSG_RESULT([yes])
+       have_krb4=yes
        AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
        AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`"
@@ -51 +54 @@
       [AC_MSG_RESULT([no])
        AS_IF([test "x$with_krb4" = "xyes"],
-             [AC_MSG_ERROR([Kerberos IV requested but not found])])
-       PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
-       AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
-       LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
-     ])])
+             [AC_MSG_ERROR([Kerberos IV requested but not found])])])])
+
+   AS_IF([test "x$have_krb4" != xyes],
+     [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
+      AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
+      LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
+     ])
+
    AC_CHECK_LIB([zephyr], [ZGetSender],
    [LIBS="$LIBS -lzephyr"