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