Changeset e2cbbbe for configure.ac

Timestamp:

Apr 8, 2010, 10:00:41 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

b094191

Parents:

8a5b5a1 (diff), 9a7b4f2 (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 branch 'refactor-zcrypt'

File:

• configure.ac (modified) (3 diffs)

configure.ac

@@ -65 +65 @@
 
 AC_CHECK_FUNCS([use_default_colors resizeterm])
-AC_CHECK_FUNCS([des_string_to_key des_key_sched des_ecb_encrypt])
-AC_CHECK_FUNCS([DES_string_to_key DES_ecb_encrypt DES_key_sched])
+AC_CHECK_FUNCS([des_string_to_key DES_string_to_key], [HAVE_DES_STRING_TO_KEY=1])
+AC_CHECK_FUNCS([des_ecb_encrypt DES_ecb_encrypt], [HAVE_DES_ECB_ENCRYPT=1])
+AC_CHECK_FUNCS([des_key_sched DES_key_sched], [HAVE_DES_KEY_SCHED=1])
 
 dnl Checks for header files.
@@ -118 +119 @@
 AC_DEFINE_UNQUOTED([DATADIR],["${prefix}/share/${PACKAGE}"],
                    [Package data directory])
+AC_DEFINE_UNQUOTED([BINDIR],["${prefix}/bin"],
+                   [Binary directory])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -126 +129 @@
 AX_C_CHECK_FLAG([-Wno-pointer-sign],[],[],
   [LIBFAIM_CFLAGS="$LIBFAIM_CFLAGS -Wno-pointer-sign"])
+
+AM_CONDITIONAL([ENABLE_ZCRYPT], [test "$HAVE_DES_STRING_TO_KEY" && dnl
+                                 test "$HAVE_DES_KEY_SCHED" && dnl
+                                 test "$HAVE_DES_ECB_ENCRYPT"])
 
 AC_SUBST([LIBFAIM_CFLAGS])