File fix-detecting-qt4-on-windows.patch of Package mingw32-gwenhywfar

Overview Repositories Revisions Requests Users Attributes Meta

File fix-detecting-qt4-on-windows.patch of Package mingw32-gwenhywfar (Revision 7d0a04db61a0ba0a604101a671116645)

Currently displaying revision 7d0a04db61a0ba0a604101a671116645 , Show latest

--- a/m4/qt4.m4	2016-10-18 13:12:17.973324834 +0000
+++ b/m4/qt4.m4	2016-10-18 13:15:49.754847154 +0000
@@ -112,7 +112,7 @@
 # Shared library suffix. On linux this was set as
 # shrext_cmds='.so'; but on darwin it is actually a text command.
 eval std_shrext=\"$shrext_cmds\"
-if test -n "${std_shrext}"; then
+if test -z "${std_shrext}"; then
    std_shrext='.so'
 fi
 
@@ -121,6 +121,8 @@
 # This is the name of the qt library to search for.
 if test "x$OSYSTEM" = "xosx"; then
    qt_searchname="lib${qt_libname}.4.dylib"
+elif test "x$host" = "i686-w64-mingw32"; then
+   qt_searchname="lib${qt_libname}4.${std_shrext}"
 else
    qt_searchname="lib${qt_libname}${std_shrext}.4"
 fi
@@ -129,7 +131,11 @@
 if test -z "$qt4_libs"; then
    AQ_SEARCH_FOR_PATH([$qt_searchname],[$local_qt4_libs])
    if test -n "$found_dir" ; then
-     qt4_libs="-L$found_dir -l${qt_libname} -lQtCore"
+     if test "x$host" = "i686-w64-mingw32"; then
+       qt4_libs="-L$found_dir -l${qt_libname} -lQtCore4"
+     else
+       qt4_libs="-L$found_dir -l${qt_libname} -lQtCore"
+     fi
    fi
 fi

Places

File fix-detecting-qt4-on-windows.patch of Package mingw32-gwenhywfar (Revision 7d0a04db61a0ba0a604101a671116645)

Places