[build] defining libpostal .so version in configure.ac, removing dependency on mmap and sparkey

This commit is contained in:
Al
2017-03-31 03:24:19 -04:00
parent f7b695c642
commit f8d7bdf364

View File

@@ -1,7 +1,11 @@
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT([libpostal], [0.3.3]) m4_define(LIBPOSTAL_MAJOR_VERSION, [1])
m4_define(LIBPOSTAL_MINOR_VERSION, [0])
m4_define(LIBPOSTAL_PATCH_VERSION, [0])
AC_INIT([libpostal], LIBPOSTAL_MAJOR_VERSION.LIBPOSTAL_MINOR_VERSION.LIBPOSTAL_PATCH_VERSION)
AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_MACRO_DIRS([m4])
@@ -18,9 +22,6 @@ AC_PROG_INSTALL
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
# Checks for libraries. # Checks for libraries.
AC_SEARCH_LIBS([snappy_compress],
[snappy],,[AC_MSG_ERROR([Could not find snappy])
])
AC_SEARCH_LIBS([log], AC_SEARCH_LIBS([log],
[m],,[AC_MSG_ERROR([Could not find math library])]) [m],,[AC_MSG_ERROR([Could not find math library])])
@@ -47,13 +48,11 @@ AC_TYPE_UINT8_T
AC_CHECK_TYPES([ptrdiff_t]) AC_CHECK_TYPES([ptrdiff_t])
# Checks for library functions. # Checks for library functions.
AC_FUNC_MMAP AC_CHECK_FUNCS([malloc realloc getcwd gettimeofday memmove memset regcomp setlocale sqrt strdup strndup])
AC_CHECK_FUNCS([malloc realloc getcwd gettimeofday memmove memset munmap regcomp setlocale sqrt strdup strndup])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
libpostal.pc libpostal.pc
src/Makefile src/Makefile
src/sparkey/Makefile
test/Makefile]) test/Makefile])
AC_CHECK_PROG([FOUND_SHUF], [shuf], [yes]) AC_CHECK_PROG([FOUND_SHUF], [shuf], [yes])
@@ -103,5 +102,6 @@ AC_ARG_WITH(cflags-scanner-extra, [AS_HELP_STRING([--with-cflags-scanner-extra@<
AC_MSG_NOTICE([extra cflags for scanner.c: $CFLAGS_SCANNER_EXTRA]) AC_MSG_NOTICE([extra cflags for scanner.c: $CFLAGS_SCANNER_EXTRA])
AC_SUBST(CFLAGS_SCANNER_EXTRA) AC_SUBST(CFLAGS_SCANNER_EXTRA)
AC_SUBST(LIBPOSTAL_SO_VERSION, LIBPOSTAL_MAJOR_VERSION:LIBPOSTAL_MINOR_VERSION:LIBPOSTAL_PATCH_VERSION)
AC_OUTPUT AC_OUTPUT