luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add GLIB_COMPILE_RESOURCES to glib m4 macros

Browse Source
This commit is contained in:
Alexander Larsson 2012-01-12 21:09:15 +01:00
parent ac51c338ed
commit 186e2d2078
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4macros/glib-2.0.m4
View File

@ -64,6 +64,7 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
@ -200,6 +201,7 @@ main ()
GLIB_GENMARSHAL="" GLIB_GENMARSHAL=""
GOBJECT_QUERY="" GOBJECT_QUERY=""
GLIB_MKENUMS="" GLIB_MKENUMS=""
GLIB_COMPILE_RESOURCES=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
@ -207,5 +209,6 @@ main ()
AC_SUBST(GLIB_GENMARSHAL) AC_SUBST(GLIB_GENMARSHAL)
AC_SUBST(GOBJECT_QUERY) AC_SUBST(GOBJECT_QUERY)
AC_SUBST(GLIB_MKENUMS) AC_SUBST(GLIB_MKENUMS)
AC_SUBST(GLIB_COMPILE_RESOURCES)
rm -f conf.glibtest rm -f conf.glibtest
]) ])