mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-04-24 05:40:42 +02:00
consolidate with_gnome sections
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2138 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
08d82adf5b
commit
92405a6422
1 changed files with 9 additions and 11 deletions
20
configure.in
20
configure.in
|
|
@ -201,6 +201,15 @@ if test x"$with_gnome" != xno; then
|
|||
[Enable notifications with libnotify])
|
||||
fi
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
|
||||
AC_SUBST(LIBGNOMEUI_CFLAGS)
|
||||
AC_SUBST(LIBGNOMEUI_LIBS)
|
||||
|
||||
PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no])
|
||||
if test "$have_libgnome_2_14" = "yes"; 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'
|
||||
|
||||
|
|
@ -230,17 +239,6 @@ else
|
|||
fi
|
||||
AM_CONDITIONAL(WITH_GCRYPT, test x"$ac_gcrypt" != xno)
|
||||
|
||||
if test x"$with_gnome" != xno; then
|
||||
PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
|
||||
AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before
|
||||
AC_SUBST(LIBGNOMEUI_LIBS)
|
||||
|
||||
PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no])
|
||||
if test "$have_libgnome_2_14" = "yes"; then
|
||||
AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
|
||||
fi
|
||||
fi
|
||||
|
||||
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
|
||||
AC_SUBST(GLIB_GENMARSHAL)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue