From 7655fc2a3c64fce46517d4a2af047d4c6e663f50 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 4 Feb 2018 23:58:06 -0800 Subject: Cleanup after rebase on master: gperf detection macros no longer needed, gperf is not used anymore. Signed-off-by: Alexey Neyman diff --git a/configure.ac b/configure.ac index e3ca4ae..e7feec5 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,6 @@ AC_PROG_RANLIB CTNG_PATH_TOOL_REQ([OBJCOPY], [gobjcopy objcopy], [objcopy]) CTNG_PATH_TOOL_REQ([OBJDUMP], [gobjdump objdump], [objdump]) CTNG_PATH_TOOL_REQ([READELF], [greadelf readelf], [readelf]) -CTNG_PATH_TOOL_REQ([GPERF], [gperf], [gperf]) CTNG_CHECK_PROGS_REQ([bison], [bison]) CTNG_CHECK_PROGS_REQ([flex], [flex]) @@ -224,8 +223,6 @@ CTNG_PROG_VERSION([M4], ['\(GNU M4\) ([2-9]\.|1\.[5-9]|1\.[1-4][0-9]|1\.4\.[2-9][0-9]|1\.4\.1[2-9])'], [gnu_m4_1_4_12_or_newer]) -CTNG_PROG_GPERF - AC_SUBST([kconfig_options]) AC_CHECK_PROGS([cvs], [cvs]) diff --git a/m4/ctng_gperf.m4 b/m4/ctng_gperf.m4 deleted file mode 100644 index 3873028..0000000 --- a/m4/ctng_gperf.m4 +++ /dev/null @@ -1,21 +0,0 @@ -# Check for GNU perf location and the type it uses in the prototypes -AC_DEFUN([CTNG_PROG_GPERF], - [AX_REQUIRE_DEFINED([CTNG_CHECK_TOOL_REQ]) - CTNG_CHECK_TOOL_REQ([GPERF], [gperf], [gperf]) - # Gperf 3.1 started generating functions with size_t rather than unsigned int - AC_MSG_CHECKING([for the type used in gperf declarations]) - cat > conftest.gperf.c <<_ASEOF -#include " -const char * in_word_set(const char *, GPERF_LEN_TYPE); -_ASEOF - echo foo,bar | ${GPERF} -L ANSI-C >> conftest.gperf.c - AS_IF([${CC} -c -o /dev/null conftest.gperf.c -DGPERF_LEN_TYPE='size_t' >/dev/null 2>&1], - [AC_MSG_RESULT([size_t]) - GPERF_LEN_TYPE='size_t'], - [${CC} -c -o /dev/null conftest.gperf.c -DGPERF_LEN_TYPE='unsigned int' >/dev/null 2>&1], - [AC_MSG_RESULT([unsigned int]) - GPERF_LEN_TYPE='unsigned int'], - [AC_MSG_ERROR([unable to determine gperf len type])]) - rm -f conftest.gperf.c - AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], $GPERF_LEN_TYPE, [String length type used by gperf]) -]) -- cgit v0.10.2-6-g49f6