diff options
| author | David Lamparter <equinox@diac24.net> | 2019-01-30 18:11:54 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-01-30 19:13:51 +0100 |
| commit | fdbd8086b1e1c4844570d902ce093ce73c524664 (patch) | |
| tree | c70c224a77272fd310789e73e7d04b244605931f /configure.ac | |
| parent | 68626e08f76939f4e01976c02837033eed4c77f2 (diff) | |
build: fix a whole bunch of *FLAGS
- some target_CFLAGS that needed to include AM_CFLAGS didn't do so
- libyang/sysrepo/sqlite3/confd CFLAGS + LIBS weren't used at all
- consistently use $(FOO_CFLAGS) instead of @FOO_CFLAGS@
- 2 dependencies were missing for clippy
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 97482dbd1a..0c15b501f0 100755 --- a/configure.ac +++ b/configure.ac @@ -1600,18 +1600,21 @@ AC_SUBST([SNMP_CFLAGS]) dnl --------------- dnl libyang dnl --------------- -PKG_CHECK_MODULES([libyang], [libyang >= 0.16.7], , [ +PKG_CHECK_MODULES([LIBYANG], [libyang >= 0.16.7], , [ AC_MSG_ERROR([libyang (>= 0.16.7) was not found on your system.]) ]) +ac_cflags_save="$CFLAGS" +CFLAGS="$CFLAGS $LIBYANG_CFLAGS" AC_CHECK_MEMBER([struct lyd_node.priv], [], [ AC_MSG_ERROR([m4_normalize([ libyang needs to be compiled with ENABLE_LYD_PRIV=ON. See http://docs.frrouting.org/projects/dev-guide/en/latest/building-libyang.html for details.]) ]) ], [[#include <libyang/libyang.h>]]) +CFLAGS="$ac_cflags_save" ac_libs_save="$LIBS" -LIBS="$LIBS $libyang_LIBS" +LIBS="$LIBS $LIBYANG_LIBS" AC_CHECK_FUNC([ly_register_types], [ libyang_ext_builtin=true AC_DEFINE([LIBYANG_EXT_BUILTIN], [1], [have ly_register_types()]) @@ -1633,7 +1636,7 @@ dnl configuration rollbacks dnl --------------- SQLITE3=false if test "$enable_config_rollbacks" = "yes"; then - PKG_CHECK_MODULES([sqlite3], [sqlite3], [ + PKG_CHECK_MODULES([SQLITE3], [sqlite3], [ AC_DEFINE([HAVE_CONFIG_ROLLBACKS], [1], [Enable configuration rollbacks]) AC_DEFINE([HAVE_SQLITE3], [1], [Enable sqlite3 database]) SQLITE3=true @@ -1661,7 +1664,7 @@ dnl --------------- dnl sysrepo dnl --------------- if test "$enable_sysrepo" = "yes"; then - PKG_CHECK_MODULES([sysrepo], [libsysrepo], + PKG_CHECK_MODULES([SYSREPO], [libsysrepo], [AC_DEFINE([HAVE_SYSREPO], [1], [Enable sysrepo integration]) SYSREPO=true], [SYSREPO=false |