Mercurial > pidgin
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.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 10 May 2008 03:32:58 +0000 |
parents | ac12e2598a03 |
children | 0bd86dae2734 |
comparison
equal
deleted
inserted
replaced
22874:790c606ff8a9 | 22875:4f6040bb6f7a |
---|---|
1200 dnl ####################################################################### | 1200 dnl ####################################################################### |
1201 dnl # Check for D-Bus libraries | 1201 dnl # Check for D-Bus libraries |
1202 dnl ####################################################################### | 1202 dnl ####################################################################### |
1203 | 1203 |
1204 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable D-Bus support])], , enable_dbus=yes) | 1204 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable D-Bus support])], , enable_dbus=yes) |
1205 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (buggy) (requires D-Bus)])], enable_libnm=$enableval, enable_libnm=no) | 1205 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes) |
1206 | 1206 |
1207 if test "x$enable_dbus" = "xyes" ; then | 1207 if test "x$enable_dbus" = "xyes" ; then |
1208 AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) | 1208 AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) |
1209 fi | 1209 fi |
1210 | 1210 |
1217 AC_MSG_ERROR([ | 1217 AC_MSG_ERROR([ |
1218 D-Bus development headers not found. | 1218 D-Bus development headers not found. |
1219 Use --disable-dbus if you do not need D-Bus support. | 1219 Use --disable-dbus if you do not need D-Bus support. |
1220 ])]) | 1220 ])]) |
1221 | 1221 |
1222 dnl Check for libnm_glib; if we don't have it, oh well | 1222 dnl Check for NetworkManager.h; if we don't have it, oh well |
1223 if test "x$enable_libnm" = "xyes" ; then | 1223 if test "x$enable_nm" = "xyes" ; then |
1224 LIBNM_CFLAGS="" | 1224 AC_CHECK_HEADERS(NetworkManager/NetworkManager.h, [], enable_nm=no) |
1225 LIBNM_LIBS="" | |
1226 PKG_CHECK_MODULES(LIBNM, libnm_glib, | |
1227 [ | |
1228 AC_DEFINE(HAVE_LIBNM, 1, [Define if you have NetworkManager]) | |
1229 enable_libnm=yes | |
1230 ], | |
1231 [ | |
1232 AC_MSG_RESULT(no) | |
1233 AC_MSG_ERROR([ | |
1234 NetworkManager development headers not found. | |
1235 Use --disable-nm if you do not need NetworkManager support. | |
1236 ])]) | |
1237 AC_SUBST(LIBNM_CFLAGS) | |
1238 AC_SUBST(LIBNM_LIBS) | |
1239 fi | 1225 fi |
1240 else | 1226 else |
1241 enable_libnm=no | 1227 enable_nm=no |
1242 fi | 1228 fi |
1243 | 1229 |
1244 dnl ####################################################################### | 1230 dnl ####################################################################### |
1245 dnl # Check for Python | 1231 dnl # Check for Python |
1246 dnl ####################################################################### | 1232 dnl ####################################################################### |
2409 echo Build with GStreamer support.. : $enable_gst | 2395 echo Build with GStreamer support.. : $enable_gst |
2410 echo Build with D-Bus support...... : $enable_dbus | 2396 echo Build with D-Bus support...... : $enable_dbus |
2411 if test "x$enable_dbus" = "xyes" ; then | 2397 if test "x$enable_dbus" = "xyes" ; then |
2412 eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR | 2398 eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR |
2413 fi | 2399 fi |
2414 echo Build with NetworkManager..... : $enable_libnm | 2400 echo Build with NetworkManager..... : $enable_nm |
2415 echo SSL Library/Libraries......... : $msg_ssl | 2401 echo SSL Library/Libraries......... : $msg_ssl |
2416 echo Build with Cyrus SASL support. : $enable_cyrus_sasl | 2402 echo Build with Cyrus SASL support. : $enable_cyrus_sasl |
2417 echo Use kerberos 4 with zephyr.... : $kerberos | 2403 echo Use kerberos 4 with zephyr.... : $kerberos |
2418 echo Use external libzephyr........ : $zephyr | 2404 echo Use external libzephyr........ : $zephyr |
2419 echo Install pixmaps............... : $enable_pixmaps | 2405 echo Install pixmaps............... : $enable_pixmaps |