Changeset 2c270e6

Timestamp:

Jun 28, 2009, 6:34:25 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

0982901

Parents:

94af438

git-author:

Nelson Elhage <nelhage@mit.edu> (06/28/09 13:46:57)

git-committer:

Nelson Elhage <nelhage@mit.edu> (06/28/09 18:34:25)

Message:

configure: Support an explicit --with{out,}-zephyr option.

File:

• configure.ac (modified) (1 diff)

configure.ac

@@ -64 +64 @@
 AC_CHECK_LIB(des425, des_cbc_encrypt,,AC_CHECK_LIB(crypto,DES_cbc_encrypt))
 AC_CHECK_LIB(resolv, res_search)
-dnl AC_CHECK_LIB(zephyr, ZGetSender,, AC_MSG_ERROR(No zephyr library found.))
-AC_CHECK_LIB(zephyr, ZGetSender)
-AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
+
+AC_ARG_WITH([zephyr],
+  [AS_HELP_STRING([--with-libzephyr],
+    [Disable Zephyr support])],
+  [],
+  [with_zephyr=check])
+
+AS_IF([test "x$with_zephyr" != xno],
+  [AC_CHECK_LIB([zephyr], [ZGetSender],
+   [AC_DEFINE([HAVE_LIBZEPHYR], [1],
+                [Define if you have libzephyr])
+    AC_CHECK_LIB([zephyr], [ZInitLocationInfo],
+      AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [1],
+                [Have ZInitLocationInfo]),)
+   ],
+   [if test "x$with_zephyr" != xcheck; then
+      AC_MSG_FAILURE(
+        [--with-libzephyr was given, but libzephyr does not seem to be available.])
+    fi
+   ])])
 
 AC_ARG_ENABLE([athstatic], AS_HELP_STRING([--enable-athstatic],