X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.ac;h=fb9b182558a7d8e7723e42fe722e316c6ea9fd48;hb=refs%2Fheads%2Fupstream;hp=522949e39e50207dbb7df6d28724fd73796b6e24;hpb=d54d9ee8883cd106868e1c798542ce4de593f627;p=fastq-tools.git diff --git a/configure.ac b/configure.ac index 522949e..fb9b182 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT( [fastq-tools], [0.2], [dcjones@cs.washington.ed] ) +AC_INIT( [fastq-tools], [0.6], [dcjones@cs.washington.edu] ) AM_INIT_AUTOMAKE( [foreign -Wall -Werror] ) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -8,8 +8,16 @@ AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC AM_PROG_CC_C_O -opt_CFLAGS="--std=c99 -Wall -Wextra -pedantic -g -O3" -dbg_CFLAGS="--std=c99 -Wall -Wextra -pedantic -g -O0" +m4_ifdef([AC_TYPE_UINT8_T], [AC_TYPE_UINT8_T]) +m4_ifdef([AC_TYPE_UINT16_T], [AC_TYPE_UINT16_T]) +m4_ifdef([AC_TYPE_INT32_T], [AC_TYPE_INT32_T]) +m4_ifdef([AC_TYPE_UINT32_T], [AC_TYPE_UINT32_T]) +m4_ifdef([AC_TYPE_UINT64_T], [AC_TYPE_UINT64_T]) +m4_ifdef([AC_TYPE_SIZE_T], [AC_TYPE_SIZE_T]) +m4_ifdef([AC_HEADER_STDBOOL], [AC_HEADER_STDBOOL]) + +opt_CFLAGS="--std=c99 -Wall -Wextra -pedantic -g -O3 -D_C99_SOURCE" +dbg_CFLAGS="--std=c99 -Wall -Wextra -pedantic -g -O0 -D_C99_SOURCE" AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], @@ -28,9 +36,6 @@ AC_PROG_LIBTOOL AC_CHECK_FUNC(fileno, , AC_MSG_ERROR([The 'fileno' function is missing.])) -# check zlib -AX_CHECK_ZLIB - # check pcre AC_CHECK_PROG(HAVE_PCRE, pcre-config, yes, no) if test "x$HAVE_PCRE" = "xno" @@ -46,10 +51,12 @@ AC_CHECK_HEADER(getopt.h, , AC_MSG_ERROR([The posix getopt.h header is needed.])) +LIBS+="-lm" CXXFLAGS=$CFLAGS AC_CONFIG_FILES([Makefile src/Makefile + tests/Makefile doc/Makefile src/version.h])