$OpenBSD: patch-configure_ac,v 1.7 2019/03/11 11:16:05 bentley Exp $

Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -32,7 +32,7 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PATH_PROG(SH, sh)
 AC_PATH_PROG(RSVG, rsvg-convert)
-AC_PATH_PROG(CSI, csi)
+AC_PATH_PROG(CSI, )
 AC_PATH_PROGS(MD5, md5 md5sum)
 AC_PATH_PROGS(SHA1, sha1 sha1sum)
 AC_PATH_PROGS(SED, sed gsed)
@@ -971,15 +971,10 @@ if test "x$with_qt" = xyes; then
   fi
   UIC=$HOST_UIC
 
-  # GUESS plugins dir for immodule installation
-  AC_MSG_CHECKING(for qt-immodule plugins dir)
-  if test ! -d "$QTDIR/plugins"; then
-    AC_MSG_RESULT(no)
-  else
-    QT_PLUGINSDIR=$QTDIR/plugins
-    AC_MSG_RESULT($QT_PLUGINSDIR)
-    AC_SUBST(QT_PLUGINSDIR)
-  fi
+  # set plugins dir for immodule installation
+  QT_PLUGINSDIR=$QTPLUGINSDIR
+  AC_MSG_RESULT($QT_PLUGINSDIR)
+  AC_SUBST(QT_PLUGINSDIR)
 
   # Process for compiler & linker flags
   QT_CXXFLAGS="-I${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
@@ -991,13 +986,10 @@ if test "x$with_qt" = xyes; then
   LDFLAGS="$LDFLAGS $QT_LDFLAGS"
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
-  AC_CHECK_LIB(qt, main, QT_LIB=-lqt,
-      AC_CHECK_LIB(qt-mt, main, QT_LIB=-lqt-mt,
-          AC_MSG_ERROR([Cannot find QT libraries.])))
+  AC_CHECK_LIB(qt-mt, main, QT_LIB='-pthread -lqt-mt',
+    AC_MSG_ERROR([Cannot find QT libraries.]), -pthread)
 
-  if test "$QT_LIB" = "-lqt-mt"; then
-    QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
-  fi
+  QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
 
   LDFLAGS=$_SAVE_LDFLAGS
   QT_LIBS="$X_LIBS $QT_LDFLAGS $QT_LIB -lXext -lX11"
