From 2b290d8ebdfa73b8f4665847fb689884eceee269 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Fri, 19 May 2017 10:22:44 +0200 Subject: scanner: Use reallocarr() when available. NetBSD had a crash during build. Since the provided substitute for reallocarray() wasn't working, use NetBSD's reallocarr(). Let configure choose that function whenever it is available. Use reallocarray if available. Still fallback if neither is available. Fixes #219 --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 55e774b..d0f3b7d 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,7 @@ strtol dnl AC_CHECK_FUNCS([dnl pow dnl Used only by "examples/manual/expr" setlocale dnl Needed only if NLS is enabled +reallocarr dnl NetBSD function. Use reallocarray if not available. reallocarray dnl OpenBSD function. We have replacement if not available. ]) -- cgit v1.2.3 From 2ae437ad54624883ecec3812bd225239a882954e Mon Sep 17 00:00:00 2001 From: Will Estes Date: Fri, 19 May 2017 08:03:48 -0400 Subject: build: remove automake check-news --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d0f3b7d..880c73b 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourcefor AC_CONFIG_SRCDIR([src/scan.l]) AC_CONFIG_AUX_DIR([build-aux]) LT_INIT -AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects]) +AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign std-options dist-lzip parallel-tests subdir-objects]) AC_CONFIG_HEADER([src/config.h]) AC_CONFIG_LIBOBJ_DIR([lib]) AC_CONFIG_MACRO_DIR([m4]) -- cgit v1.2.3 From 19cffb0ff001e24a278ab979ac7a49f788ab2eba Mon Sep 17 00:00:00 2001 From: Will Estes Date: Thu, 13 Jul 2017 15:14:58 -0400 Subject: build: require automake, gettext versions as per maintainer dev setup --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 880c73b..d9aab34 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourcefor AC_CONFIG_SRCDIR([src/scan.l]) AC_CONFIG_AUX_DIR([build-aux]) LT_INIT -AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign std-options dist-lzip parallel-tests subdir-objects]) +AM_INIT_AUTOMAKE([1.15 -Wno-portability foreign std-options dist-lzip parallel-tests subdir-objects]) AC_CONFIG_HEADER([src/config.h]) AC_CONFIG_LIBOBJ_DIR([lib]) AC_CONFIG_MACRO_DIR([m4]) @@ -38,7 +38,7 @@ AC_SUBST(SHARED_VERSION_INFO) # checks for programs AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18]) +AM_GNU_GETTEXT_VERSION([0.19.7]) AC_PROG_YACC AS_IF([test "$YACC" != 'bison -y'], [ YACC="\${top_srcdir}/build-aux/missing bison -y" -- cgit v1.2.3 From c1ed5df2f61abcb201b770e29cea1082a117d0f9 Mon Sep 17 00:00:00 2001 From: Tyler Slabinski Date: Wed, 23 Aug 2017 21:33:51 -0400 Subject: Create libfl.pc target for pkgconfig --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d9aab34..8882016 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,9 @@ AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + # allow passing a variable `WARNINGFLAGS', # either when invoking `configure', or when invoking `make' # default to something useful if GCC was detected @@ -180,6 +183,7 @@ po/Makefile.in src/Makefile tools/Makefile tests/Makefile +libfl.pc ) AC_OUTPUT -- cgit v1.2.3 From 7e06407175ed235378624d8b75aa24179a27b876 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Sun, 27 Aug 2017 00:17:57 +0800 Subject: Move libfl.pc.in to src subdirectory. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8882016..c6f12d6 100644 --- a/configure.ac +++ b/configure.ac @@ -180,10 +180,10 @@ examples/Makefile examples/fastwc/Makefile examples/manual/Makefile po/Makefile.in +src/libfl.pc src/Makefile tools/Makefile tests/Makefile -libfl.pc ) AC_OUTPUT -- cgit v1.2.3 From 24fd0551333e7eded87b64dd36062da3df2f6380 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Mon, 4 Sep 2017 10:47:33 +0800 Subject: build: AC_USE_SYSTEM_EXTENSIONS in configure.ac. This would, e.g. define _GNU_SOURCE in config.h, enabling the reallocarray() prototype in glibc 2.26+ on Linux systems with that version of glibc. Fixes #241. --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c6f12d6..3c977a4 100644 --- a/configure.ac +++ b/configure.ac @@ -25,8 +25,10 @@ # autoconf requirements and initialization AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex]) +AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([src/scan.l]) AC_CONFIG_AUX_DIR([build-aux]) +AC_USE_SYSTEM_EXTENSIONS LT_INIT AM_INIT_AUTOMAKE([1.15 -Wno-portability foreign std-options dist-lzip parallel-tests subdir-objects]) AC_CONFIG_HEADER([src/config.h]) -- cgit v1.2.3