Re: [PATCH] Update nm requirements for Glib and PolicyKit.



On Sat, 2008-08-02 at 19:38 +0300, Ahmed S. Darwish wrote:
> Hi all,
> 
> Require a glib version above 2.16 since nm uses g_warn_if_fail().

Fixed that in trunk (svn3891).  Thanks for bringing it up!

Dan

> Since PolicyKit's commit 2a35667777841f7ea1ef2912963962f04955f9e6, 
> libpolkit-dbus has been merged to the main PolicyKit tree and its
> pkg-config file has been renamed from 'polkit' to 'polkit-1'. Modify
> nm not to explicitly require libpolkit-dbus and to recognize the new
> package name.
> 
> Signed-off-by: Ahmed S. Darwish <darwish 07 gmail com>
> ---
> 
> Index: configure.in
> ===================================================================
> --- configure.in	(revision 3889)
> +++ configure.in	(working copy)
> @@ -210,7 +210,7 @@
>  AC_SUBST(GTHREAD_CFLAGS)
>  AC_SUBST(GTHREAD_LIBS)
>  
> -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.10)
> +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16)
>  AC_SUBST(GLIB_CFLAGS)
>  AC_SUBST(GLIB_LIBS)
>  
> @@ -241,10 +241,10 @@
>  AC_SUBST(LIBNL_CFLAGS)
>  AC_SUBST(LIBNL_LIBS)
>  
> -PKG_CHECK_MODULES(POLKIT, polkit-dbus)
> +PKG_CHECK_MODULES(POLKIT, polkit-1)
>  
>  ##### Find out the version of PolicyKit we're using
> -polkit_version=`pkg-config --modversion polkit`
> +polkit_version=`pkg-config --modversion polkit-1`
>  POLKIT_VERSION_MAJOR=`echo $polkit_version | awk -F. '{print $1}'`
>  POLKIT_VERSION_MINOR=`echo $polkit_version | awk -F. '{print $2}'`
>  POLKIT_VERSION_MICRO=`echo $polkit_version | awk -F. '{print $3}'`
> 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]