| configure.ac (flex-2.6.3) | : | configure.ac (flex-2.6.4) |
|---|
| | |
| skipping to change at line 27 | | skipping to change at line 27 |
|---|
| # may be used to endorse or promote products derived from this software | | # may be used to endorse or promote products derived from this software |
| # without specific prior written permission. | | # without specific prior written permission. |
| | |
| # THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR | | # THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR |
| # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED | | # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED |
| # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | | # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| # PURPOSE. | | # PURPOSE. |
| | |
| # autoconf requirements and initialization | | # autoconf requirements and initialization |
| | |
|
| AC_INIT([the fast lexical analyser generator],[2.6.3],[flex-help@lists.sourcefor
ge.net],[flex]) | | AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourcefor
ge.net],[flex]) |
| AC_CONFIG_SRCDIR([src/scan.l]) | | AC_CONFIG_SRCDIR([src/scan.l]) |
| AC_CONFIG_AUX_DIR([build-aux]) | | AC_CONFIG_AUX_DIR([build-aux]) |
| LT_INIT | | LT_INIT |
|
| AM_INIT_AUTOMAKE([-Wno-portability foreign check-news std-options dist-lzip para
llel-tests subdir-objects 1.14.1]) | | AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lz
ip parallel-tests subdir-objects]) |
| AC_CONFIG_HEADER([src/config.h]) | | AC_CONFIG_HEADER([src/config.h]) |
| AC_CONFIG_LIBOBJ_DIR([lib]) | | AC_CONFIG_LIBOBJ_DIR([lib]) |
| AC_CONFIG_MACRO_DIR([m4]) | | AC_CONFIG_MACRO_DIR([m4]) |
| SHARED_VERSION_INFO="2:0:0" | | SHARED_VERSION_INFO="2:0:0" |
| AC_SUBST(SHARED_VERSION_INFO) | | AC_SUBST(SHARED_VERSION_INFO) |
| | |
| # checks for programs | | # checks for programs |
| | |
| AM_GNU_GETTEXT([external]) | | AM_GNU_GETTEXT([external]) |
|
| AM_GNU_GETTEXT_VERSION([0.19]) | | AM_GNU_GETTEXT_VERSION([0.18]) |
| AC_PROG_YACC | | AC_PROG_YACC |
|
| | AS_IF([test "$YACC" != 'bison -y'], [ |
| | YACC="\${top_srcdir}/build-aux/missing bison -y" |
| | AC_MSG_NOTICE(no bison program found: only required for maintainers) |
| | ]) |
| | AM_CONDITIONAL([HAVE_BISON], [test "$YACC" = 'bison -y']) |
| AM_PROG_LEX | | AM_PROG_LEX |
| AC_PROG_CC | | AC_PROG_CC |
|
| | AX_PROG_CC_FOR_BUILD |
| AC_PROG_CXX | | AC_PROG_CXX |
| AM_PROG_CC_C_O | | AM_PROG_CC_C_O |
| AC_PROG_LN_S | | AC_PROG_LN_S |
| AC_PROG_AWK | | AC_PROG_AWK |
| AC_PROG_INSTALL | | AC_PROG_INSTALL |
| | |
| # allow passing a variable `WARNINGFLAGS', | | # allow passing a variable `WARNINGFLAGS', |
| # either when invoking `configure', or when invoking `make' | | # either when invoking `configure', or when invoking `make' |
| # default to something useful if GCC was detected | | # default to something useful if GCC was detected |
| | |
| | |
| skipping to change at line 78 | | skipping to change at line 84 |
|---|
| | |
| # --disable-bootstrap is intended only to workaround problems with bootstrap | | # --disable-bootstrap is intended only to workaround problems with bootstrap |
| # (e.g. when cross-compiling flex or when bootstrapping has bugs). | | # (e.g. when cross-compiling flex or when bootstrapping has bugs). |
| # Ideally we should be able to bootstrap even when cross-compiling. | | # Ideally we should be able to bootstrap even when cross-compiling. |
| AC_ARG_ENABLE([bootstrap], | | AC_ARG_ENABLE([bootstrap], |
| [AS_HELP_STRING([--disable-bootstrap], | | [AS_HELP_STRING([--disable-bootstrap], |
| [don't perform a bootstrap when building flex])], | | [don't perform a bootstrap when building flex])], |
| [], [enable_bootstrap=yes]) | | [], [enable_bootstrap=yes]) |
| AM_CONDITIONAL([ENABLE_BOOTSTRAP], [test "x$enable_bootstrap" = xyes]) | | AM_CONDITIONAL([ENABLE_BOOTSTRAP], [test "x$enable_bootstrap" = xyes]) |
| | |
|
| AC_PATH_PROG([BISON], bison, no) | | AM_CONDITIONAL([CROSS], [test "x$cross_compiling" = xyes]) |
| AS_IF([test "$BISON" != no],[], | | |
| [ AC_SUBST([BISON], [\${top_srcdir}/build-aux/missing bison]) | | |
| AC_MSG_NOTICE(no bison program found: only required for maintainers) | | |
| ]) | | |
| | |
| AC_PATH_PROG([HELP2MAN], help2man, [\${top_srcdir}/build-aux/missing help2man]) | | AC_PATH_PROG([HELP2MAN], help2man, [\${top_srcdir}/build-aux/missing help2man]) |
| AS_IF([test "$HELP2MAN" = "\${top_srcdir}/build-aux/missing help2man"], | | AS_IF([test "$HELP2MAN" = "\${top_srcdir}/build-aux/missing help2man"], |
| AC_MSG_WARN(help2man: program not found: building man page will not work) | | AC_MSG_WARN(help2man: program not found: building man page will not work) |
| ) | | ) |
| | |
| AC_PATH_PROGS([TEXI2DVI], [gtexi2dvi texi2dvi], [\${top_srcdir}/build-aux/missin
g texi2dvi]) | | AC_PATH_PROGS([TEXI2DVI], [gtexi2dvi texi2dvi], [\${top_srcdir}/build-aux/missin
g texi2dvi]) |
| AS_IF([test "$TEXI2DVI" = "\${top_srcdir}/build-aux/missing texi2dvi"], | | AS_IF([test "$TEXI2DVI" = "\${top_srcdir}/build-aux/missing texi2dvi"], |
| AC_MSG_WARN(texi2dvi: program not found: building pdf version of manual will
not work) | | AC_MSG_WARN(texi2dvi: program not found: building pdf version of manual will
not work) |
| ) | | ) |
| | |
| skipping to change at line 105 | | skipping to change at line 107 |
|---|
| | |
| AC_CACHE_CHECK([for m4 that supports -P], [ac_cv_path_M4], | | AC_CACHE_CHECK([for m4 that supports -P], [ac_cv_path_M4], |
| [AC_PATH_PROGS_FEATURE_CHECK([M4], [gm4 gnum4 m4], | | [AC_PATH_PROGS_FEATURE_CHECK([M4], [gm4 gnum4 m4], |
| [[m4out=`echo 'm''4_divnum' | $ac_path_M4 -P`] | | [[m4out=`echo 'm''4_divnum' | $ac_path_M4 -P`] |
| [test "x$m4out" = x0 \ | | [test "x$m4out" = x0 \ |
| && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]], | | && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]], |
| [AC_MSG_ERROR([could not find m4 that supports -P])])]) | | [AC_MSG_ERROR([could not find m4 that supports -P])])]) |
| AC_SUBST([M4], [$ac_cv_path_M4]) | | AC_SUBST([M4], [$ac_cv_path_M4]) |
| AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the m4 executable name.]) | | AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the m4 executable name.]) |
| | |
|
| AC_PATH_PROG(INDENT, indent, indent) | | AC_PATH_PROG([INDENT], indent, [\${top_srcdir}/build-aux/missing indent]) |
| # if INDENT is set to 'indent' then we didn't find indent | | AC_MSG_CHECKING(if $INDENT is GNU indent) |
| if test "$INDENT" != indent ; then | | AS_IF([$INDENT --version 2>/dev/null | head -n 1 | grep "GNU indent" >/dev/nul |
| AC_MSG_CHECKING(if $INDENT is GNU indent) | | l], |
| if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; | | [AC_MSG_RESULT(yes)], |
| then | | [AC_MSG_RESULT(no) |
| AC_MSG_RESULT(yes) | | AC_MSG_WARN($INDENT does not appear to be GNU indent; 'make indent' may not |
| else | | function properly) |
| AC_MSG_RESULT(no) | | ]) |
| AC_MSG_WARN($INDENT does not appear to be GNU indent.) | | |
| fi | | |
| else | | |
| AC_MSG_WARN(no indent program found: make indent target will not function) | | |
| fi | | |
| | |
| # checks for headers | | # checks for headers |
| | |
|
| AC_CHECK_HEADERS([inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h r | | AC_CHECK_HEADERS([regex.h strings.h sys/stat.h sys/wait.h unistd.h], [], |
| egex.h unistd.h]) | | [AC_MSG_ERROR(required header not found on your system)]) |
| | |
| | AC_CHECK_HEADERS([inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h]) |
| | |
| # checks for libraries | | # checks for libraries |
| | |
| # The test test-pthread uses libpthread, so we check for it here, but | | # The test test-pthread uses libpthread, so we check for it here, but |
| # all we need is the preprocessor symbol defined since we don't need | | # all we need is the preprocessor symbol defined since we don't need |
| # LIBS to include libpthread for building flex. | | # LIBS to include libpthread for building flex. |
| | |
|
| | LIBPTHREAD='' |
| AC_CHECK_LIB(pthread, pthread_mutex_lock, | | AC_CHECK_LIB(pthread, pthread_mutex_lock, |
|
| AC_DEFINE([HAVE_LIBPTHREAD], 1, [pthread library] ), | | [AC_CHECK_HEADERS([pthread.h], [LIBPTHREAD=-lpthread], |
| AC_DEFINE([HAVE_LIBPTHREAD], 0, [pthread library] ) | | [AC_MSG_WARN([pthread tests will be skipped])])], |
| ) | | [AC_MSG_WARN([pthread tests will be skipped])]) |
| AC_CHECK_HEADERS([pthread.h]) | | AC_SUBST([LIBPTHREAD]) |
| AM_CONDITIONAL([want_pthread], [test "x$ac_cv_lib_pthread_pthread_mutex_lock" = | | |
| xyes]) | | |
| | |
| AC_CHECK_LIB(m, log10) | | AC_CHECK_LIB(m, log10) |
| | |
| # Checks for typedefs, structures, and compiler characteristics. | | # Checks for typedefs, structures, and compiler characteristics. |
| | |
| AC_HEADER_STDBOOL | | AC_HEADER_STDBOOL |
| AC_C_CONST | | AC_C_CONST |
| AC_TYPE_SIZE_T | | AC_TYPE_SIZE_T |
| | |
| # Checks for library functions. | | # Checks for library functions. |
| | |
| skipping to change at line 157 | | skipping to change at line 156 |
|---|
| AC_FUNC_FORK | | AC_FUNC_FORK |
| dnl Autoconf bug: AC_FUNC_MALLOC and AC_FUNC_REALLOC might not warn of cross | | dnl Autoconf bug: AC_FUNC_MALLOC and AC_FUNC_REALLOC might not warn of cross |
| dnl compilation. Workaround this. | | dnl compilation. Workaround this. |
| AC_FUNC_MALLOC | | AC_FUNC_MALLOC |
| AS_IF([test "$cross_compiling" = yes], | | AS_IF([test "$cross_compiling" = yes], |
| AC_MSG_WARN([result $ac_cv_func_malloc_0_nonnull guessed because of cross com
pilation])) | | AC_MSG_WARN([result $ac_cv_func_malloc_0_nonnull guessed because of cross com
pilation])) |
| AC_FUNC_REALLOC | | AC_FUNC_REALLOC |
| AS_IF([test "$cross_compiling" = yes], | | AS_IF([test "$cross_compiling" = yes], |
| AC_MSG_WARN([result $ac_cv_func_realloc_0_nonnull guessed because of cross co
mpilation])) | | AC_MSG_WARN([result $ac_cv_func_realloc_0_nonnull guessed because of cross co
mpilation])) |
| | |
|
| AC_CHECK_FUNCS(dup2 dnl | | AC_CHECK_FUNCS([dup2 dnl |
| memset dnl | | memset dnl |
|
| pow dnl | | |
| regcomp dnl | | regcomp dnl |
|
| setlocale dnl | | strcasecmp dnl |
| strchr dnl | | strchr dnl |
| strdup dnl | | strdup dnl |
|
| strtol) | | strtol dnl |
| | ], [], [AC_MSG_ERROR(required library function not found on your system)]) |
| | |
|
| AC_REPLACE_FUNCS(reallocarray) | | # Optional library functions |
| | AC_CHECK_FUNCS([dnl |
| | pow dnl Used only by "examples/manual/expr" |
| | setlocale dnl Needed only if NLS is enabled |
| | reallocarray dnl OpenBSD function. We have replacement if not available. |
| | ]) |
| | |
| AC_CONFIG_FILES( | | AC_CONFIG_FILES( |
| Makefile | | Makefile |
| doc/Makefile | | doc/Makefile |
| examples/Makefile | | examples/Makefile |
| examples/fastwc/Makefile | | examples/fastwc/Makefile |
| examples/manual/Makefile | | examples/manual/Makefile |
|
| lib/Makefile | | |
| po/Makefile.in | | po/Makefile.in |
| src/Makefile | | src/Makefile |
| tools/Makefile | | tools/Makefile |
| tests/Makefile | | tests/Makefile |
| ) | | ) |
| | |
| AC_OUTPUT | | AC_OUTPUT |
| | | |
| End of changes. 16 change blocks. |
|---|
| 36 lines changed or deleted | | 38 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 