From 8e908029ffa03d21662030d3111dcf556b722e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Mon, 10 Oct 2022 14:30:41 +0200 Subject: build,qt: Explicitly namespace a few Qt variables for Qt5 m4/qt.m4: Rename to m4/qt5.m4: this. (FIND_QT): Rename to FIND_QT5. (GPGME_QT): Change variable prefix to GPGME_QT5. (GPGME_QTTEST: Change variable prefix to GPGME_QT5TEST. configure.ac, lang/qt/src/Makefile.am, lang/qt/tests/Makefile.am: Adjust accordingly. -- In preparation to adding support for building qgpgme for Qt6, add the version number to a few variables to avoid confusion. --- m4/qt.m4 | 80 --------------------------------------------------------------- m4/qt5.m4 | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 m4/qt.m4 create mode 100644 m4/qt5.m4 (limited to 'm4') diff --git a/m4/qt.m4 b/m4/qt.m4 deleted file mode 100644 index 62579d55..00000000 --- a/m4/qt.m4 +++ /dev/null @@ -1,80 +0,0 @@ -dnl qt.m4 -dnl Copyright (C) 2016 Intevation GmbH -dnl -dnl This file is part of gpgme and is provided under the same license as gpgme - -dnl Autoconf macro to find either Qt4 or Qt5 -dnl -dnl sets GPGME_QT_LIBS and GPGME_QT_CFLAGS -dnl -dnl if QT5 was found have_qt5_libs is set to yes - -AC_DEFUN([FIND_QT], -[ - have_qt5_libs="no"; - - PKG_CHECK_MODULES(GPGME_QT, - Qt5Core >= 5.0.0, - [have_qt5_libs="yes"], - [have_qt5_libs="no"]) - - PKG_CHECK_MODULES(GPGME_QTTEST, - Qt5Test >= 5.0.0, - [have_qt5test_libs="yes"], - [have_qt5test_libs="no"]) - - if ! test "$have_w32_system" = yes; then - if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then - GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fpic" - fi - fi - if test "$have_qt5_libs" = "yes"; then - AC_CHECK_TOOL(MOC, moc) - AC_MSG_CHECKING([moc version]) - mocversion=`$MOC -v 2>&1` - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - AC_MSG_RESULT([no]) - # moc was not the qt5 one, try with moc-qt5 - AC_CHECK_TOOL(MOC2, moc-qt5) - mocversion=`$MOC2 -v 2>&1` - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - AC_CHECK_TOOL(QTCHOOSER, qtchooser) - qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` - mocversion=`$qt5tooldir/moc -v 2>&1` - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - # no valid moc found - have_qt5_libs="no"; - else - MOC=$qt5tooldir/moc - fi - else - MOC=$MOC2 - fi - fi - AC_MSG_RESULT([$mocversion]) - dnl Check that a binary can actually be build with this qt. - dnl pkg-config may be set up in a way that it looks also for libraries - dnl of the build system and not only for the host system. In that case - dnl we check here that we can actually compile / link a qt application - dnl for host. - OLDCPPFLAGS=$CPPFLAGS - CPPFLAGS=$GPGME_QT_CFLAGS - OLDLIBS=$LIBS - LIBS=$GPGME_QT_LIBS - AC_LANG_PUSH(C++) - AC_MSG_CHECKING([whether a simple qt program can be built]) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main (int argc, char **argv) { - QCoreApplication app(argc, argv); - app.exec(); - }])], [have_qt5_libs='yes'], [have_qt5_libs='no']) - AC_MSG_RESULT([$have_qt5_libs]) - AC_LANG_POP() - CPPFLAGS=$OLDCPPFLAGS - LIBS=$OLDLIBS - fi -]) diff --git a/m4/qt5.m4 b/m4/qt5.m4 new file mode 100644 index 00000000..db32e686 --- /dev/null +++ b/m4/qt5.m4 @@ -0,0 +1,80 @@ +dnl qt5.m4 +dnl Copyright (C) 2016 Intevation GmbH +dnl +dnl This file is part of gpgme and is provided under the same license as gpgme + +dnl Autoconf macro to find Qt5 +dnl +dnl sets GPGME_QT5_LIBS and GPGME_QT5_CFLAGS +dnl +dnl if QT5 was found have_qt5_libs is set to yes + +AC_DEFUN([FIND_QT5], +[ + have_qt5_libs="no"; + + PKG_CHECK_MODULES(GPGME_QT5, + Qt5Core >= 5.0.0, + [have_qt5_libs="yes"], + [have_qt5_libs="no"]) + + PKG_CHECK_MODULES(GPGME_QT5TEST, + Qt5Test >= 5.0.0, + [have_qt5test_libs="yes"], + [have_qt5test_libs="no"]) + + if ! test "$have_w32_system" = yes; then + if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then + GPGME_QT5_CFLAGS="$GPGME_QT5_CFLAGS -fpic" + fi + fi + if test "$have_qt5_libs" = "yes"; then + AC_CHECK_TOOL(MOC, moc) + AC_MSG_CHECKING([moc version]) + mocversion=`$MOC -v 2>&1` + mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` + if test x"$mocversiongrep" != x"$mocversion"; then + AC_MSG_RESULT([no]) + # moc was not the qt5 one, try with moc-qt5 + AC_CHECK_TOOL(MOC2, moc-qt5) + mocversion=`$MOC2 -v 2>&1` + mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` + if test x"$mocversiongrep" != x"$mocversion"; then + AC_CHECK_TOOL(QTCHOOSER, qtchooser) + qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` + mocversion=`$qt5tooldir/moc -v 2>&1` + mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` + if test x"$mocversiongrep" != x"$mocversion"; then + # no valid moc found + have_qt5_libs="no"; + else + MOC=$qt5tooldir/moc + fi + else + MOC=$MOC2 + fi + fi + AC_MSG_RESULT([$mocversion]) + dnl Check that a binary can actually be build with this qt. + dnl pkg-config may be set up in a way that it looks also for libraries + dnl of the build system and not only for the host system. In that case + dnl we check here that we can actually compile / link a qt application + dnl for host. + OLDCPPFLAGS=$CPPFLAGS + CPPFLAGS=$GPGME_QT5_CFLAGS + OLDLIBS=$LIBS + LIBS=$GPGME_QT5_LIBS + AC_LANG_PUSH(C++) + AC_MSG_CHECKING([whether a simple qt program can be built]) + AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include + int main (int argc, char **argv) { + QCoreApplication app(argc, argv); + app.exec(); + }])], [have_qt5_libs='yes'], [have_qt5_libs='no']) + AC_MSG_RESULT([$have_qt5_libs]) + AC_LANG_POP() + CPPFLAGS=$OLDCPPFLAGS + LIBS=$OLDLIBS + fi +]) -- cgit v1.2.3