diff options
| author | Guillem Jover <guillem@hadrons.org> | 2013-03-22 12:29:25 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-03-22 12:37:53 +0100 |
| commit | cf5c87492bf1fe647abe3e7edf065fd0bf266fbb (patch) | |
| tree | 68ca78687e0b7b67612866221d8332b3544a10b2 /configure.ac | |
| parent | a9a26b27c924000233a90a03a2687a7d3e64c68a (diff) | |
| download | neard-cf5c87492bf1fe647abe3e7edf065fd0bf266fbb.tar.gz neard-cf5c87492bf1fe647abe3e7edf065fd0bf266fbb.tar.bz2 neard-cf5c87492bf1fe647abe3e7edf065fd0bf266fbb.zip | |
build: Generate correct dependencies for the pkg-config file
This fixes the bogus libnl dependency in the pkg-config file, and
centralizes all dependencies in configure.ac, to replace them at
configure time so that they accurately define the ones detected.
This also makes the build system future-proof against changing
dependencies in one place and not the other.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 35ec5bd..0361cc6 100644 --- a/configure.ac +++ b/configure.ac @@ -59,34 +59,45 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, +GLIB_DEPS="glib-2.0 >= 2.28" +PKG_CHECK_MODULES(GLIB, [${GLIB_DEPS}], dummy=yes, AC_MSG_ERROR(GLib >= 2.28 is required)) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +AC_SUBST(GLIB_DEPS) -PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.2, dummy=yes, +DBUS_DEPS="dbus-1 >= 1.2" +PKG_CHECK_MODULES(DBUS, [${DBUS_DEPS}], dummy=yes, AC_MSG_ERROR(D-Bus >= 1.2 is required)) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) +AC_SUBST(DBUS_DEPS) -PKG_CHECK_MODULES(LIBNL3, libnl-3.0 libnl-genl-3.0, [ +LIBNL3_DEPS="libnl-3.0 libnl-genl-3.0" +PKG_CHECK_MODULES(LIBNL3, [${LIBNL3_DEPS}], [ NETLINK_CFLAGS=${LIBNL3_CFLAGS} NETLINK_LIBS=${LIBNL3_LIBS} + NETLINK_DEPS=${LIBNL3_DEPS} ], [ - PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [ + LIBNL2_DEPS="libnl-2.0" + PKG_CHECK_MODULES(LIBNL2, [${LIBNL2_DEPS}], [ NETLINK_CFLAGS=${LIBNL2_CFLAGS} NETLINK_LIBS=${LIBNL2_LIBS} + NETLINK_DEPS=${LIBNL2_DEPS} ], [ - PKG_CHECK_MODULES(LIBNL1, libnl-1, dummy=yes, + LIBNL1_DEPS="libnl-1" + PKG_CHECK_MODULES(LIBNL1, [${LIBNL1_DEPS}], dummy=yes, AC_MSG_ERROR(Netlink library is required)) AC_DEFINE(NEED_LIBNL_COMPAT, 1, [Define to 1 if you need libnl-1 compat functions.]) NETLINK_CFLAGS=${LIBNL1_CFLAGS} NETLINK_LIBS=${LIBNL1_LIBS} + NETLINK_DEPS=${LIBNL1_DEPS} ]) ]) AC_SUBST(NETLINK_CFLAGS) AC_SUBST(NETLINK_LIBS) +AC_SUBST(NETLINK_DEPS) AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [enable test/example scripts]), |