diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-03 14:04:42 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-03 18:43:13 +0100 |
| commit | 29fd6a1df9f6c80d155a7a73b8514a68dc9cd22d (patch) | |
| tree | 9dc15a3e19a6ff36ae9ee3d38c7b8190b73f0a72 /configure.ac | |
| parent | 16871a3615edcf358d688a8d079b1e7b20053fb1 (diff) | |
| parent | 076fd1e66e7f1bc3b2bd91f3efb84080da26fb9c (diff) | |
Merge branch 'master' into next-3.14
This patch includes changes to adapt this branch to the library
rename that happened in the master branch.
Conflicts:
src/Makefile.am
src/expr/cmp.c
src/expr/ct.c
src/expr/data_reg.c
src/expr/meta.c
tests/jsonfiles/01-table.json
tests/jsonfiles/02-table.json
tests/jsonfiles/64-ruleset.json
tests/xmlfiles/01-table.xml
tests/xmlfiles/02-table.xml
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index b023755..f95b268 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to create configure. -AC_INIT([libnftables], [1.0.0]) +AC_INIT([libnftnl], [1.0.0]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) @@ -16,18 +16,18 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Dependencies PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.0]) AC_ARG_WITH([xml-parsing], - AS_HELP_STRING([--with-xml-parsing], [XML parsing support]), - [with_xml_parsing="yes"], [with_xml_parsing="no"]) + AS_HELP_STRING([--with-xml-parsing], [XML parsing support])) AC_ARG_WITH([json-parsing], - AS_HELP_STRING([--with-json-parsing], [JSON parsing support]), - [with_json_parsing="yes"], [with_json_parsing="no"]) - -AS_IF([test "x$with_xml_parsing" = "xyes"], [ - PKG_CHECK_MODULES([LIBXML], [mxml >= 2.6]) -]) -AS_IF([test "x$with_json_parsing" = "xyes"], [ - PKG_CHECK_MODULES([LIBJSON], [jansson >= 2.3]) -]) + AS_HELP_STRING([--with-json-parsing], [JSON parsing support])) + +AS_IF([test "x$with_xml_parsing" = "xyes"], + [PKG_CHECK_MODULES([LIBXML], [mxml >= 2.6])], + [with_xml_parsing="no"] +) +AS_IF([test "x$with_json_parsing" = "xyes"], + [PKG_CHECK_MODULES([LIBJSON], [jansson >= 2.3])], + [with_json_parsing="no"] +) AC_PROG_CC AM_PROG_CC_C_O AC_EXEEXT @@ -52,10 +52,10 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wformat=2 -pipe" AC_SUBST([regular_CPPFLAGS]) AC_SUBST([regular_CFLAGS]) -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libnftables/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile tests/Makefile libnftables.pc doxygen.cfg]) +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libnftnl/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile tests/Makefile libnftnl.pc doxygen.cfg]) AC_OUTPUT echo " -libnftables configuration: +libnftnl configuration: XML support: ${with_xml_parsing} JSON support: ${with_json_parsing}" |