proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-14 12:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from jku/build-fix

Browse Source 
build: gusb is required even without colorhug
This commit is contained in:
Richard Hughes 2015-06-30 18:17:06 +01:00
commit bd0a50b24e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -120,6 +120,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0)
PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= 0.103) PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= 0.103)
PKG_CHECK_MODULES(GCAB, libgcab-1.0) PKG_CHECK_MODULES(GCAB, libgcab-1.0)
PKG_CHECK_MODULES(APPSTREAM_GLIB, appstream-glib >= 0.3.5) PKG_CHECK_MODULES(APPSTREAM_GLIB, appstream-glib >= 0.3.5)
PKG_CHECK_MODULES(GUSB, gusb >= 0.2.2)
PKG_CHECK_MODULES(SQLITE, sqlite3) PKG_CHECK_MODULES(SQLITE, sqlite3)
AC_PATH_PROG(DOCBOOK2MAN, docbook2man) AC_PATH_PROG(DOCBOOK2MAN, docbook2man)
@ -127,7 +128,7 @@ AC_PATH_PROG(DOCBOOK2MAN, docbook2man)
AC_ARG_ENABLE(colorhug, AS_HELP_STRING([--enable-colorhug],[Enable ColorHug support]), AC_ARG_ENABLE(colorhug, AS_HELP_STRING([--enable-colorhug],[Enable ColorHug support]),
enable_colorhug=$enableval, enable_colorhug=yes) enable_colorhug=$enableval, enable_colorhug=yes)
if test x$enable_colorhug != xno; then if test x$enable_colorhug != xno; then
PKG_CHECK_MODULES(COLORHUG, colorhug >= 1.2.9 gusb >= 0.2.2) PKG_CHECK_MODULES(COLORHUG, colorhug >= 1.2.9)
AC_DEFINE(HAVE_COLORHUG,1,[Use ColorHug support]) AC_DEFINE(HAVE_COLORHUG,1,[Use ColorHug support])
fi fi
AM_CONDITIONAL(HAVE_COLORHUG, test x$enable_colorhug = xyes) AM_CONDITIONAL(HAVE_COLORHUG, test x$enable_colorhug = xyes)

2
src/Makefile.am
View File

@ -5,6 +5,7 @@ dist_introspection_DATA = \
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(APPSTREAM_GLIB_CFLAGS) \ $(APPSTREAM_GLIB_CFLAGS) \
$(COLORHUG_CFLAGS) \ $(COLORHUG_CFLAGS) \
$(GUSB_CFLAGS) \
$(GCAB_CFLAGS) \ $(GCAB_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
@ -116,6 +117,7 @@ fwupd_LDADD = \
$(FWUPD_LIBS) \ $(FWUPD_LIBS) \
$(APPSTREAM_GLIB_LIBS) \ $(APPSTREAM_GLIB_LIBS) \
$(COLORHUG_LIBS) \ $(COLORHUG_LIBS) \
$(GUSB_LIBS) \
$(GCAB_LIBS) \ $(GCAB_LIBS) \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GUDEV_LIBS) \ $(GUDEV_LIBS) \