diff options
| author | Robert Love <rml@novell.com> | 2006-07-18 16:13:32 +0000 |
|---|---|---|
| committer | Robert Love <rlove@rlove.org> | 2006-07-18 16:13:32 +0000 |
| commit | 7a28c6914f5abab18c0e2100bc9da75a1521528e (patch) | |
| tree | 21c72c3d0ec4d92ac35aab2ca4417cdb1311475c | |
| parent | 5310ee828ac2f0dd224b686e3baf15b30936cb5f (diff) | |
| download | NetworkManager-7a28c6914f5abab18c0e2100bc9da75a1521528e.tar.gz | |
2006-07-18 Robert Love <rml@novell.com>
* configure.in: Add "--with-notify" option to allow disabling of
libnotify support.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1889 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 14 |
2 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2006-07-18 Robert Love <rml@novell.com> + + * configure.in: Add "--with-notify" option to allow disabling of + libnotify support. + 2006-07-13 Dan Williams <dcbw@redhat.com> Patch from Thiago Bauermann <thiago.bauermann@gmail.com> diff --git a/configure.in b/configure.in index ba35b0f508..681dc29629 100644 --- a/configure.in +++ b/configure.in @@ -151,6 +151,8 @@ PKG_CHECK_MODULES(HAL, hal >= 0.5.0) AC_SUBST(HAL_CFLAGS) AC_SUBST(HAL_LIBS) +AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto) + if test x"$with_gnome" != xno; then PKG_CHECK_MODULES(GTK, gtk+-2.0) AC_SUBST(GTK_CFLAGS) @@ -172,11 +174,13 @@ if test x"$with_gnome" != xno; then AC_SUBST(GNOME_KEYRING_CFLAGS) AC_SUBST(GNOME_KEYRING_LIBS) - PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes], - [enable_notify=no]) - if test "x$enable_notify" != "xno"; then - AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1], - [Enable notifications with libnotify]) + if test x"$enable_notify" != xno; then + PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes], + [enable_notify=no]) + if test "x$enable_notify" != "xno"; then + AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1], + [Enable notifications with libnotify]) + fi fi fi AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if' |