Create correct pkconfig file for zbar-qt5
Although zbar supports Qt5, the created pkgconfig file always requested the Qt(4) components. Fixes issue #62.
This commit is contained in:
parent
bc96ea16a5
commit
cac1fffce8
13
configure.ac
13
configure.ac
@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"],
|
||||
CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS"
|
||||
dnl -fPIC has no effect on Windows and breaks windres
|
||||
AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])
|
||||
AC_MSG_NOTICE([using Qt version $QT_VERSION])],
|
||||
AC_MSG_NOTICE([using Qt version $QT_VERSION])
|
||||
qt_pkgconfig_file="zbar-qt5.pc"
|
||||
],
|
||||
|
||||
[MOC=`$PKG_CONFIG QtGui --variable=moc_location`
|
||||
AC_MSG_NOTICE([using moc from $MOC])
|
||||
QT_VERSION=`$PKG_CONFIG QtGui --modversion`
|
||||
AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
|
||||
AC_MSG_NOTICE([using Qt version $QT_VERSION])
|
||||
qt_pkgconfig_file="zbar-qt.pc"
|
||||
]))
|
||||
|
||||
AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
|
||||
|
||||
AM_COND_IF([HAVE_QT],
|
||||
[AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])]
|
||||
)
|
||||
|
||||
dnl Java
|
||||
have_java="maybe"
|
||||
|
||||
@ -820,7 +828,6 @@ java/Makefile
|
||||
zbar/Makefile
|
||||
zbar.pc
|
||||
zbar-gtk.pc
|
||||
zbar-qt.pc
|
||||
doc/doxygen.conf])
|
||||
|
||||
AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh])
|
||||
|
||||
12
zbar-qt5.pc.in
Normal file
12
zbar-qt5.pc.in
Normal file
@ -0,0 +1,12 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: zbar-qt
|
||||
Description: bar code scanning and decoding Qt5 widget
|
||||
URL: http://zbar.sourceforge.net
|
||||
Version: @VERSION@
|
||||
Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5
|
||||
Libs: -L${libdir} -lzbarqt
|
||||
Cflags: -I${includedir}
|
||||
Loading…
Reference in New Issue
Block a user