Changeset 946bc37

Timestamp:

Jan 15, 2013, 5:51:41 AM (11 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:

• 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}"
+        ],
+        [PKG_CHECK_MODULES([OPENSSL], [openssl],
+           [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}"
+            LIBS="${LIBS} ${OPENSSL_LIBS}"
+           ])])])
+
    AC_CHECK_LIB([zephyr], [ZGetSender],
    [LIBS="$LIBS -lzephyr"