comparison configure.ac @ 22875:4f6040bb6f7a

Update configure.ac to properly detect Network Manager (via NetworkManager.h instead of libnm_glib). Also, change the code so that if NetworkManager is dead, we'll assume we're connected to the network and try anyway.

22874:790c606ff8a9

dnl #######################################################################
dnl # Check for D-Bus libraries
dnl #######################################################################

AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable D-Bus support])], , enable_dbus=yes)
AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (buggy) (requires D-Bus)])], enable_libnm=$enableval, enable_libnm=no)

if test "x$enable_dbus" = "xyes" ; then
	AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
fi

		AC_MSG_ERROR([
D-Bus development headers not found.
Use --disable-dbus if you do not need D-Bus support.
])])

dnl Check for libnm_glib; if we don't have it, oh well
	if test "x$enable_libnm" = "xyes" ; then
		LIBNM_CFLAGS=""
		LIBNM_LIBS=""
		PKG_CHECK_MODULES(LIBNM, libnm_glib,
		[
			AC_DEFINE(HAVE_LIBNM, 1, [Define if you have NetworkManager])
			enable_libnm=yes
		],
		[
			AC_MSG_RESULT(no)
			AC_MSG_ERROR([
NetworkManager development headers not found.
Use --disable-nm if you do not need NetworkManager support.
])])
		AC_SUBST(LIBNM_CFLAGS)
		AC_SUBST(LIBNM_LIBS)
	fi
else
	enable_libnm=no
fi

dnl #######################################################################
dnl # Check for Python
dnl #######################################################################

echo Build with GStreamer support.. : $enable_gst
echo Build with D-Bus support...... : $enable_dbus
if test "x$enable_dbus" = "xyes" ; then
	eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
fi
echo Build with NetworkManager..... : $enable_libnm
echo SSL Library/Libraries......... : $msg_ssl
echo Build with Cyrus SASL support. : $enable_cyrus_sasl
echo Use kerberos 4 with zephyr.... : $kerberos
echo Use external libzephyr........ : $zephyr
echo Install pixmaps............... : $enable_pixmaps

22875:4f6040bb6f7a

dnl #######################################################################
dnl # Check for D-Bus libraries
dnl #######################################################################

AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable D-Bus support])], , enable_dbus=yes)
AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes)

if test "x$enable_dbus" = "xyes" ; then
	AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
fi

		AC_MSG_ERROR([
D-Bus development headers not found.
Use --disable-dbus if you do not need D-Bus support.
])])

dnl Check for NetworkManager.h; if we don't have it, oh well
	if test "x$enable_nm" = "xyes" ; then
		AC_CHECK_HEADERS(NetworkManager/NetworkManager.h, [], enable_nm=no)
	fi
else
	enable_nm=no
fi

dnl #######################################################################
dnl # Check for Python
dnl #######################################################################

echo Build with GStreamer support.. : $enable_gst
echo Build with D-Bus support...... : $enable_dbus
if test "x$enable_dbus" = "xyes" ; then
	eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
fi
echo Build with NetworkManager..... : $enable_nm
echo SSL Library/Libraries......... : $msg_ssl
echo Build with Cyrus SASL support. : $enable_cyrus_sasl
echo Use kerberos 4 with zephyr.... : $kerberos
echo Use external libzephyr........ : $zephyr
echo Install pixmaps............... : $enable_pixmaps