Changeset 1bdbcb1


Ignore:
Timestamp:
Jun 25, 2011, 3:11:06 PM (13 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
bad4496 (diff), 708837d (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 708837dc090b1b2239157de1d0aef4e269cf0e55 into bad44968701bd819226d18137988f6234af2bcb4
Files:
1 added
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rf2a96c0 r708837d  
    1717
    1818AS_IF([test "x$with_stack_protector" != xno],
    19   [AX_CHECK_COMPILE_FLAG([-fstack-protector],
     19  [AX_C_CHECK_FLAG([-fstack-protector],[],[],
    2020    [AM_CFLAGS="$AM_CFLAGS -fstack-protector"],
    2121    [if test "x$with_stack_protector" != xcheck; then
     
    129129
    130130AX_CFLAGS_WARN_ALL([AM_CFLAGS])
    131 AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes -Wwrite-strings],[AM_CFLAGS])
     131AX_C_CHECK_FLAG([-Wstrict-prototypes],[],[],[AM_CFLAGS="$AM_CFLAGS -Wstrict-prototypes"])
     132AX_C_CHECK_FLAG([-Wwrite-strings],[],[],[AM_CFLAGS="$AM_CFLAGS -Wwrite-strings"])
    132133
    133134dnl Shut gcc up about zero-length format strings; the warning's apparently for
    134135dnl efficiency reasons, which is bogus for custom functions.
    135 AX_APPEND_COMPILE_FLAGS([-Wno-format-zero-length],[AM_CFLAGS])
     136AX_C_CHECK_FLAG([-Wno-format-zero-length],[],[],[AM_CFLAGS="$AM_CFLAGS -Wno-format-zero-length"])
    136137
    137 AX_APPEND_COMPILE_FLAGS([-Wno-pointer-sign -Wno-empty-body -Wno-unused-value],[LIBFAIM_CFLAGS])
     138m4_foreach([myflag],
     139  [[-Wno-pointer-sign],[-Wno-empty-body],[-Wno-unused-value]],
     140  [AX_C_CHECK_FLAG([myflag],[],[],[LIBFAIM_CFLAGS="$LIBFAIM_CFLAGS myflag"])])
    138141
    139142AM_CONDITIONAL([ENABLE_ZCRYPT], [test "$HAVE_DES_STRING_TO_KEY" && dnl
Note: See TracChangeset for help on using the changeset viewer.