Changeset e2cbbbe for configure.ac


Ignore:
Timestamp:
Apr 8, 2010, 10:00:41 PM (11 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r2d3ed95 re2cbbbe  
    6565
    6666AC_CHECK_FUNCS([use_default_colors resizeterm])
    67 AC_CHECK_FUNCS([des_string_to_key des_key_sched des_ecb_encrypt])
    68 AC_CHECK_FUNCS([DES_string_to_key DES_ecb_encrypt DES_key_sched])
     67AC_CHECK_FUNCS([des_string_to_key DES_string_to_key], [HAVE_DES_STRING_TO_KEY=1])
     68AC_CHECK_FUNCS([des_ecb_encrypt DES_ecb_encrypt], [HAVE_DES_ECB_ENCRYPT=1])
     69AC_CHECK_FUNCS([des_key_sched DES_key_sched], [HAVE_DES_KEY_SCHED=1])
    6970
    7071dnl Checks for header files.
     
    118119AC_DEFINE_UNQUOTED([DATADIR],["${prefix}/share/${PACKAGE}"],
    119120                   [Package data directory])
     121AC_DEFINE_UNQUOTED([BINDIR],["${prefix}/bin"],
     122                   [Binary directory])
    120123
    121124dnl Checks for typedefs, structures, and compiler characteristics.
     
    126129AX_C_CHECK_FLAG([-Wno-pointer-sign],[],[],
    127130  [LIBFAIM_CFLAGS="$LIBFAIM_CFLAGS -Wno-pointer-sign"])
     131
     132AM_CONDITIONAL([ENABLE_ZCRYPT], [test "$HAVE_DES_STRING_TO_KEY" && dnl
     133                                 test "$HAVE_DES_KEY_SCHED" && dnl
     134                                 test "$HAVE_DES_ECB_ENCRYPT"])
    128135
    129136AC_SUBST([LIBFAIM_CFLAGS])
Note: See TracChangeset for help on using the changeset viewer.