patch-ac_qt5_m4 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. $OpenBSD: patch-ac_qt5_m4,v 1.5 2016/12/31 08:11:59 ajacoutot Exp $
  2. Workaround for OpenBSD's pkg-config.
  3. --- ac/qt5.m4.orig Tue Dec 27 17:01:56 2016
  4. +++ ac/qt5.m4 Fri Dec 30 02:34:26 2016
  5. @@ -127,25 +127,23 @@ if test x"$enable_qt" = "xyes" -a \
  6. fi
  7. if test $ok = 1 -a "x$with_qt_pkg_config" = xyes; then
  8. - with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/ /,/g'`"
  9. if test x"$with_qt_pkg_config_modules" != x ; then
  10. - with_qt_pkg_config_modules="$with_qt_pkg_config_modules,"
  11. + with_qt_pkg_config_modules="$with_qt_pkg_config_modules"
  12. fi
  13. - with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Core,Qt5Gui,Qt5Widgets,Qt5Network,Qt5Concurrent"
  14. + with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Core Qt5Gui Qt5Widgets Qt5Network Qt5Concurrent"
  15. if test x"$MINGW" = x1; then
  16. - with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5WinExtras"
  17. + with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5WinExtras"
  18. fi
  19. PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],,[ok=0])
  20. - PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5PlatformSupport"])
  21. + PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5PlatformSupport"])
  22. if test $ok = 0; then
  23. AC_MSG_RESULT(no: not found by pkg-config)
  24. fi
  25. - with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
  26. QT_CFLAGS="`$PKG_CONFIG --cflags $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
  27. QT_LIBS="`$PKG_CONFIG --libs $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
  28. fi