JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #67: Geoclue should pull in Glib as dependency

Browse Source 
Add checks in configure.ac for Glib and pull in through Makefile.am when
Geoclue support is enabled.
This commit is contained in:
Jon Lund Steffensen
2014-04-20 19:36:03 +02:00
parent e5b3daf298
commit 254b1e2a57
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+3 -1
View File
@@ -17,12 +17,14 @@ AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
PKG_CHECK_MODULES([DRM], [libdrm], [have_drm=yes], [have_drm=no]) PKG_CHECK_MODULES([DRM], [libdrm], [have_drm=yes], [have_drm=no])
PKG_CHECK_MODULES([X11], [x11], [have_x11=yes], [have_x11=no]) PKG_CHECK_MODULES([X11], [x11], [have_x11=yes], [have_x11=no])
PKG_CHECK_MODULES([XF86VM], [xxf86vm], [have_xf86vm=yes], [have_xf86vm=no]) PKG_CHECK_MODULES([XF86VM], [xxf86vm], [have_xf86vm=yes], [have_xf86vm=no])
PKG_CHECK_MODULES([XCB], [xcb], [have_xcb=yes], [have_xcb=no]) PKG_CHECK_MODULES([XCB], [xcb], [have_xcb=yes], [have_xcb=no])
PKG_CHECK_MODULES([XCB_RANDR], [xcb-randr], PKG_CHECK_MODULES([XCB_RANDR], [xcb-randr],
[have_xcb_randr=yes], [have_xcb_randr=no]) [have_xcb_randr=yes], [have_xcb_randr=no])
PKG_CHECK_MODULES([GLIB], [glib-2.0 gobject-2.0], [have_glib=yes], [have_glib=no])
PKG_CHECK_MODULES([GEOCLUE], [geoclue], [have_geoclue=yes], [have_geoclue=no]) PKG_CHECK_MODULES([GEOCLUE], [geoclue], [have_geoclue=yes], [have_geoclue=no])
AC_CHECK_HEADER([windows.h], [have_windows_h=yes], [have_windows_h=no]) AC_CHECK_HEADER([windows.h], [have_windows_h=yes], [have_windows_h=no])
@@ -133,7 +135,7 @@ AC_ARG_ENABLE([geoclue], [AC_HELP_STRING([--enable-geoclue],
[enable Geoclue location provider])], [enable Geoclue location provider])],
[enable_geoclue=$enableval],[enable_geoclue=maybe]) [enable_geoclue=$enableval],[enable_geoclue=maybe])
AS_IF([test "x$enable_geoclue" != xno], [ AS_IF([test "x$enable_geoclue" != xno], [
AS_IF([test "x$have_geoclue" = xyes], [ AS_IF([test "x$have_geoclue" = xyes -a "x$have_glib" = xyes], [
AC_DEFINE([ENABLE_GEOCLUE], 1, AC_DEFINE([ENABLE_GEOCLUE], 1,
[Define to 1 to enable Geoclue location provider]) [Define to 1 to enable Geoclue location provider])
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
src/Makefile.am
+4 -1
View File
@@ -59,7 +59,10 @@ endif
if ENABLE_GEOCLUE if ENABLE_GEOCLUE
redshift_SOURCES += location-geoclue.c location-geoclue.h redshift_SOURCES += location-geoclue.c location-geoclue.h
AM_CFLAGS += $(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) AM_CFLAGS += \
$(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) \
$(GLIB_CFLAGS) $(GLIB_LIBS)
redshift_LDADD += \ redshift_LDADD += \
$(GEOCLUE_LIBS) $(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) $(GEOCLUE_CFLAGS)
$(GLIB_LIBS) $(GLIB_CFLAGS)
endif endif