system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 09:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

2006-12-02 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from Christian Persch <chpe@gnome.org>

	* configure.in
		- Check for GTK+ 2.10 in preparation for GtkStatusIcon patch


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2139 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-12-03 03:33:09 +00:00
parent 92405a6422
commit 60c85e9373
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-12-02 Dan Williams <dcbw@redhat.com>
Patch from Christian Persch <chpe@gnome.org>
* configure.in
- Check for GTK+ 2.10 in preparation for GtkStatusIcon patch
2006-11-29 Tambet Ingo <tambet@ximian.com>
Patch by Timo Hoenig <thoenig@suse.de>:

16
configure.in
View file

@ -193,8 +193,20 @@ if test x"$with_gnome" != xno; then
AC_SUBST(GNOME_KEYRING_CFLAGS)
AC_SUBST(GNOME_KEYRING_LIBS)
LIBNOTIFY_REQUIRED=0.3.0
# Building with GTK+ >= 2.10 will use the GtkStatusIcon applet
# implementation. Earlier versions of GTK+ will use the EggTrayIcon
# applet implementation.
PKG_CHECK_EXISTS([gtk+-2.0 >= 2.10],[have_gtk_2_10=yes LIBNOTIFY_REQUIRED=0.4.3],[have_gtk_2_10=no])
if test x"$have_gtk_2_10" != xno; then
AC_DEFINE_UNQUOTED([HAVE_STATUS_ICON], [1],
[Use GtkStatusIcon for the applet's icon rather than an EggTrayIcon])
fi
if test x"$enable_notify" != xno; then
PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
PKG_CHECK_MODULES([NOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], [enable_notify=yes],
[enable_notify=no])
if test "x$enable_notify" != "xno"; then
AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1],
@ -211,7 +223,9 @@ if test x"$with_gnome" != xno; then
AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
fi
fi
AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
AM_CONDITIONAL([HAVE_GTK_2_10],[test "$have_gtk_2_10" = "yes"])
PKG_CHECK_MODULES(LIBNL, libnl-1)
AC_SUBST(LIBNL_CFLAGS)