← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
297
297
        fi
298
298
        AC_SUBST(QT_CFLAGS)
299
299
        AC_SUBST(QT_LIBS)
 
300
        # Check for moc-qt4 and if not found then moc
 
301
        QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
 
302
        AC_CHECK_PROGS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH])
300
303
fi
301
304
AM_CONDITIONAL(WITH_QT, test "${enable_qt}" = "yes")
302
305
 
309
312
fi
310
313
AC_SUBST(UDEV_BASE_DIR)
311
314
 
312
 
# systemd
 
315
# systemd unit support
313
316
AC_ARG_WITH([systemdsystemunitdir],
314
317
 AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
315
318
 [],
319
322
fi
320
323
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
321
324
 
322
 
dnl
323
 
dnl Disable ConsoleKit support
324
 
dnl
325
 
AC_ARG_WITH(ck, AS_HELP_STRING([--without-ck], [Build NetworkManager without ConsoleKit session tracking support]))
326
 
AM_CONDITIONAL(WITH_CONSOLEKIT, test x"$with_ck" != xno)
327
 
no_ck=0
328
 
if test x"$with_ck" = x"no"; then
329
 
        no_ck="1"
330
 
else
331
 
        with_ck="yes"
 
325
AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd], [Build NetworkManager with specific session tracking support]))
 
326
if test "z$with_session_tracking" = "z"; then
 
327
    # Default to ConsoleKit session tracking like we used before
 
328
    with_session_tracking=ck
332
329
fi
333
 
AC_DEFINE_UNQUOTED(NO_CONSOLEKIT, $no_ck, [Define to disable use of ConsoleKit])
 
330
 
 
331
case $with_session_tracking in
 
332
    ck|none) ;;
 
333
    systemd)
 
334
        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
 
335
        ;;
 
336
    *)
 
337
        AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
 
338
        ;;
 
339
esac
 
340
AC_SUBST(SYSTEMD_CFLAGS)
 
341
AC_SUBST(SYSTEMD_LIBS)
 
342
AM_CONDITIONAL(SESSION_TRACKING_CK, test "x$with_session_tracking" = "xck")
 
343
AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "x$with_session_tracking" = "xsystemd")
 
344
 
334
345
 
335
346
have_libnl="no"
336
347
PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=yes], [have_libnl3=no])
774
785
fi
775
786
 
776
787
if test -n "${with_systemdsystemunitdir}"; then
777
 
        echo systemd support: ${with_systemdsystemunitdir}
 
788
        echo systemd unit support: ${with_systemdsystemunitdir}
778
789
else
779
 
        echo systemd support: no
 
790
        echo systemd unit support: no
780
791
fi
781
792
 
782
793
if test "${enable_polkit}" = "yes"; then
785
796
        echo PolicyKit support: no
786
797
fi
787
798
 
788
 
if test -n "${with_ck}"; then
789
 
        echo ConsoleKit support: ${with_ck}
790
 
else
791
 
        echo ConsoleKit support: no
792
 
fi
 
799
        echo Session tracking: ${with_session_tracking}
793
800
 
794
801
if test "${enable_wimax}" = "yes"; then
795
802
        echo WiMAX support: yes