[patch] files/sope-r1660-configure.patch

sope-r1660-configure.patch (text/plain), 1.86 KB, created by steveb on 2009-12-04 10:31:56 UTC

--- configure.orig	2009-08-05 11:01:01.000000000 +0200
+++ configure	2009-11-24 19:45:01.286568538 +0100
@@ -15,7 +15,7 @@
 ARG_NOCREATE=0
 ARG_PREFIX=""
 ARG_FRAMEWORK_DIR=""
-ARG_GSMAKE="$GNUSTEP_MAKEFILES"
+ARG_GSMAKE=`gnustep-config --variable=GNUSTEP_MAKEFILES`
 ARG_CFGMAKE="$PWD/config.make"
 ARG_WITH_GNUSTEP=0
 ARG_WITH_DEBUG=1
@@ -389,6 +389,11 @@
   cd $tmpdir
   cp ../maintenance/dummytool.c .
   
+  local OLDLIBS="${OLDLIBS}"
+  for LIB in $1;do
+    LIBS="$LIBS -l${LIB}"
+  done
+
   tmpmake="GNUmakefile"
   echo  >$tmpmake "include ../config.make"
   echo >>$tmpmake "include \$(GNUSTEP_MAKEFILES)/common.make"
@@ -403,16 +408,24 @@
   LINK_RESULT=$?
   
   if test $LINK_RESULT = 0; then
-    echo "$2 library found: $1"
-    cfgwrite "HAS_LIBRARY_$1=yes"
+    for LIB in $1;do
+      echo "$2 library found: ${LIB}"
+      cfgwrite "HAS_LIBRARY_${LIB}=yes"
+    done
   else
     if test "x$2" = "xrequired"; then
-      echo "failed to link $2 library: $1"
+      for LIB in $1;do
+        echo "failed to link $2 library: ${LIB}"
+        cfgwrite "HAS_LIBRARY_${LIB}=no"
+      done
       rm ../config.make
       exit 1
     else
-      echo "failed to link $2 library: $1"
-      cfgwrite "HAS_LIBRARY_$1=no"
+      for LIB in $1;do
+        echo "failed to link $2 library: ${LIB}"
+        cfgwrite "HAS_LIBRARY_${LIB}=no"
+      done
+      LIBS="${OLDLIBS}"
     fi
   fi
   
@@ -425,7 +438,11 @@
   cfgwrite "# library dependencies"
   checkLinking "xml2"        optional;
   checkLinking "ldap"        optional;
-  checkLinking "ssl"         required; # TODO: make optional
+  if [ `uname` = "OpenBSD" ];then
+    checkLinking "ssl crypt"   required; # TODO: make optional
+  else
+    checkLinking "ssl"         required; # TODO: make optional
+  fi
   checkLinking "pq"          optional;
   checkLinking "sqlite3"     optional;
   checkLinking "mysqlclient" optional;