$OpenBSD: patch-configure,v 1.13 2021/07/14 09:49:09 sebastia Exp $

Index: configure
--- configure.orig
+++ configure
@@ -172,6 +172,13 @@ fi
 STRIP="strip"
 echo
 
+if [ "$SYSS" = "OpenBSD" ]; then
+LIBDIRS="/usr/lib /usr/X11R6/lib"
+INCDIRS="/usr/include"
+LIBDIRS_ALL="/usr/lib /usr/X11R6/lib /usr/local/lib"
+INCDIRS_ALL="/usr/include /usr/local/include"
+fi
+
 echo "Checking for zlib (libz/zlib.h) ..."
 for i in $INCDIRS; do
    if [ -f "$i/zlib.h" ]; then
@@ -269,13 +276,13 @@ if [ "$SSL_IPATH" = "/usr/include" ]; then
 fi
 
 echo "Checking for gcrypt (libgcrypt/gpg-error.h) ..."
-for i in $LIBDIRS ; do
+for i in $LIBDIRS_ALL ; do
     if [ -f "$i/libgcrypt.so" -o -f "$i/libgcrypt.dylib" -o -f "$i/libgcrypt.a" -o -f "$i/libgcrypt.dll.a" -o -f "$i/libgcrypt.la" ]; then
 	  HAVE_GCRYPT="y"
     fi
 done
 
-for i in $INCDIRS ; do
+for i in $INCDIRS_ALL ; do
     if [ "X" = "X$GPGERROR_IPATH" ]; then
         TMP_PATH=`/bin/ls $i/$SYSM*/gpg-error.h 2> /dev/null`
         if [ -n "$TMP_PATH" ]; then
@@ -296,7 +303,7 @@ else
 fi
 
 echo "Checking for idn (libidn) ..."
-for i in $LIBDIRS ; do
+for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$IDN_PATH" ]; then
         if [ -f "$i/libidn.so" -o -f "$i/libidn.dylib" -o -f "$i/libidn.a" -o -f "$i/libidn.dll.a" -o -f "$i/libidn.la" ]; then
             IDN_PATH="$i"
@@ -309,7 +316,7 @@ for i in $LIBDIRS ; do
         fi
     fi
 done
-for i in $INCDIRS ; do
+for i in $INCDIRS_ALL ; do
     if [ "X" != "X$IDN_PATH" ]; then
         if [ -f "$i/stringprep.h" ]; then
             IDN_IPATH="$i"
@@ -381,7 +388,7 @@ if [ "X" = "X$CURSES_PATH" -o "X" = "X$CURSES_IPATH" ]
 fi
 
 echo "Checking for pcre (libpcre/pcre.h) ..."
-for i in $LIBDIRS ; do
+for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$PCRE_PATH" ]; then
         if [ -f "$i/libpcre.so" -o -f "$i/libpcre.dylib" -o -f "$i/libpcre.a"   ]; then
             PCRE_PATH="$i"
@@ -400,7 +407,7 @@ for i in $LIBDIRS ; do
         fi
     fi
 done
-for i in $INCDIRS ; do
+for i in $INCDIRS_ALL ; do
     if [ "X" != "X$PCRE_PATH" ]; then
         if [ -f "$i/pcre.h" ]; then
             PCRE_IPATH="$i"
@@ -426,7 +433,7 @@ echo "Checking for Postgres (libpq/libpq-fe.h) ..."
 #    POSTGRES_PATH=""
 #    POSTGRES_IPATH=""
 #else
-  for i in $LIBDIRS ; do
+  for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$POSTGRES_PATH" ]; then
         if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" -o -f "$i/libpq.a" ]; then
             POSTGRES_PATH="$i"
@@ -446,7 +453,7 @@ echo "Checking for Postgres (libpq/libpq-fe.h) ..."
     fi
   done
   POSTGRES_IPATH=
-  for i in $INCDIRS \
+  for i in $INCDIRS_ALL \
     /opt/p*sql*/include /usr/*p*sql*/include /usr/local/*psql*/include /mingw64/include
   do
     if [ "X" = "X$POSTGRES_IPATH" ]; then
@@ -650,7 +657,7 @@ if [ "X" = "X$FIREBIRD_PATH" -o "X" = "X$FIREBIRD_IPAT
 fi
 
 echo "Checking for MYSQL client (libmysqlclient/math.h) ..."
-for i in $LIBDIRS ; do
+for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$MYSQL_PATH" ]; then
         if [ -f "$i/libmysqlclient.so" -o -f "$i/libmysqlclient.dylib" -o -f "$i/libmysqlclient.a" ]; then
             MYSQL_PATH="$i"
@@ -670,7 +677,7 @@ for i in $LIBDIRS ; do
     fi
 done
 MYSQLINSUBDIR=""
-for i in $INCDIRS ; do
+for i in $INCDIRS_ALL ; do
     if [ "X" != "X$MYSQL_PATH" ]; then
         if [ -f "$i/mysql/mysql.h" ]; then
             MYSQL_IPATH="$i/mysql"
@@ -821,7 +828,7 @@ if [ "$SAPR3_IPATH" = "/usr/include" ]; then
 fi
 
 echo "Checking for libssh (libssh/libssh.h) ..."
-for i in $LIBDIRS ; do
+for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$SSH_PATH" ]; then
         if [ -f "$i/libssh.so" -o -f "$i/libssh.dylib" -o -f "$i/libssh.a"  ]; then
             SSH_PATH="$i"
@@ -840,7 +847,7 @@ for i in $LIBDIRS ; do
         fi
     fi
 done
-for i in $INCDIRS ; do
+for i in $INCDIRS_ALL ; do
     if [ "X" = "X$SSH_IPATH" ]; then
         if [ -f "$i/libssh/libssh.h" ]; then
             SSH_IPATH="$i"
@@ -973,7 +980,7 @@ fi
 
 echo "Checking for Memcached (libmemcached/memcached.h) ..."
 
-  for i in $LIBDIRS ; do
+  for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$MCACHED_PATH" ]; then
         if [ -f "$i/libmemcached.so" -o -f "$i/libmemcached.dylib" -o -f "$i/libmemcached.a" ]; then
             MCACHED_PATH="$i"
@@ -994,7 +1001,7 @@ echo "Checking for Memcached (libmemcached/memcached.h
   done
 
   MCACHED_IPATH=
-  for i in $INCDIRS ; do
+  for i in $INCDIRS_ALL ; do
     if [ "X" = "X$MCACHED_IPATH" ]; then
         if [ -f "$i/memcached.h" ]; then
             MCACHED_IPATH="$i"
@@ -1023,7 +1030,7 @@ fi
 
 echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/libwinpr3/winpr.h) ..."
 
-  for i in $LIBDIRS ; do
+  for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$FREERDP3_PATH" ]; then
         if [ -f "$i/libfreerdp3.so" -o -f "$i/libfreerdp3.dylib" -o -f "$i/libfreerdp3.a" -o -f "$i/libfreerdp3.dll.a" ]; then
             FREERDP3_PATH="$i"
@@ -1038,7 +1045,7 @@ echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/lib
   done
 
   FREERDP3_IPATH=
-  for i in $INCDIRS ; do
+  for i in $INCDIRS_ALL ; do
     if [ "X" = "X$FREERDP3_IPATH" ]; then
         if [ -f "$i/freerdp/freerdp.h" ]; then
             FREERDP3_IPATH="$i/freerdp3"
@@ -1049,7 +1056,7 @@ echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/lib
     fi
   done
 
- for i in $LIBDIRS ; do
+ for i in $LIBDIRS_ALL ; do
     if [ "X" = "X$WINPR3_PATH" ]; then
         if [ -f "$i/libwinpr3.so" -o -f "$i/libwinpr3.dylib" -o -f "$i/libwinpr3.a" ]; then
             WINPR3_PATH="$i"
@@ -1064,7 +1071,7 @@ echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/lib
   done
 
   WINPR3_IPATH=
-  for i in $INCDIRS ; do
+  for i in $INCDIRS_ALL ; do
     if [ "X" = "X$WINPR3_IPATH" ]; then
         if [ -f "$i/winpr.h" ]; then
             WINPR3_IPATH="$i"
@@ -1096,7 +1103,7 @@ echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/lib
   if [ "X" = "X$FREERDP3_PATH" -o "X" = "X$FREERDP3_IPATH" -o "X" = "X$WINPR3_PATH" -o "X" = "X$WINPR3_IPATH" ]; then
     echo "Checking for Freerdp2 (libfreerdp2/freerdp.h/libwinpr2/winpr.h) ..."
 
-    for i in $LIBDIRS ; do
+    for i in $LIBDIRS_ALL ; do
         if [ "X" = "X$FREERDP2_PATH" ]; then
             if [ -f "$i/libfreerdp2.so" -o -f "$i/libfreerdp2.dylib" -o -f "$i/libfreerdp2.a" -o -f "$i/libfreerdp2.dll.a" ]; then
                 FREERDP2_PATH="$i"
@@ -1111,7 +1118,7 @@ echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/lib
     done
 
     FREERDP2_IPATH=
-    for i in $INCDIRS ; do
+    for i in $INCDIRS_ALL ; do
         if [ "X" = "X$FREERDP2_IPATH" ]; then
             if [ -f "$i/freerdp/freerdp.h" ]; then
                 FREERDP2_IPATH="$i/freerdp2"
@@ -1122,14 +1129,14 @@ echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/lib
         fi
     done
 
-    for i in $LIBDIRS ; do
+    for i in $LIBDIRS_ALL ; do
         if [ "X" = "X$WINPR2_PATH" ]; then
             if [ -f "$i/libwinpr2.so" -o -f "$i/libwinpr2.dylib" -o -f "$i/libwinpr2.a" ]; then
                 WINPR2_PATH="$i"
             fi
         fi
         if [ "X" = "X$WINPR2_PATH" ]; then
-            TMP_LIB=`/bin/ls $i/libwinpr2.dll.a 2> /dev/null | grep winpr`
+            TMP_LIB=`/bin/ls $i/libwinpr2.so.* $i/libwinpr2.dll.a 2> /dev/null | grep winpr`
             if [ -n "$TMP_LIB" ]; then
             WINPR2_PATH="$i"
             fi
@@ -1137,7 +1144,7 @@ echo "Checking for Freerdp3 (libfreerdp3/freerdp.h/lib
     done
 
     WINPR2_IPATH=
-    for i in $INCDIRS ; do
+    for i in $INCDIRS_ALL ; do
         if [ "X" = "X$WINPR2_IPATH" ]; then
             if [ -f "$i/winpr.h" ]; then
                 WINPR2_IPATH="$i"
@@ -1431,7 +1438,7 @@ if [ -n "$FIREBIRD_PATH" -o \
             XLIBPATHS="-L/usr/lib -L/usr/local/lib"
         fi
     else
-        XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
+        XLIBPATHS="-L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib -L/lib"
     fi
 fi
 if [ -n "$MYSQL_IPATH" ]; then
