svn commit: r1084983 - /commons/sandbox/runtime/trunk/src/main/native/configure

[mt...@apache.org]

Author: mturk
Date: Thu Mar 24 15:05:43 2011
New Revision: 1084983

URL: http://svn.apache.org/viewvc?rev=1084983&view=rev
Log:
Do not link to the optional libs. We will dynload them at runtime

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=1084983&r1=1084982&r2=1084983&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Thu Mar 24 15:05:43 2011
@@ -1148,42 +1148,10 @@ test ".$sizeof_long_double" != .0 && hav
 test ".$sizeof_off64_t" != .0 && have_off64_t=1
 
 PS=/
-have_uuid_uuid=`have_include uuid/uuid`
-if [ ".$have_uuid_uuid" = .1 ]; then
-    ok=`have_library uuid uuid_generate`
-    if [ ".$ok" = .1 ]; then
-        varadds ldflags -luuid
-    else
-        have_uuid_uuid=0
-    fi
-fi
-have_capability=`have_include sys/capability`
-if [ ".$have_capability" = .1 ]; then
-    ok=`have_library cap cap_get_proc`
-    if [ ".$ok" = .1 ]; then
-        varadds ldflags -lcap
-    else
-        have_capability=0
-    fi
-fi
 
 ok=`have_library resolv res_init`
 test ".$ok" = .1 && varadds ldflags -lresolv
 
-if [ ".$host" = ".linux" ]; then
-    have_selinux=`have_include selinux/selinux`
-    if [ ".$have_selinux" = .1 ]; then
-        ok=`have_library selinux is_selinux_enabled`
-        if [ ".$ok" = .1 ]; then
-            varadds ldflags -lselinux
-        else
-            have_selinux=0
-        fi
-    fi
-else
-    have_selinux=0
-fi
-
 if [ ".$host" = ".solaris" ]; then
     have_port_h=`have_include port`
     if [ ".$have_port_h" = .1 ]; then
@@ -1289,6 +1257,8 @@ extern "C" {
 #define HAVE_LANGINFO_H         `have_include langinfo`
 #define HAVE_LOCALE_H           `have_include locale`
 #define HAVE_SCHED_H            `have_include sched`
+#define HAVE_SYS_CAPABILITY_H   `have_include sys/capability`
+#define HAVE_SELINUX_H          `have_include selinux/selinux`
 #define HAVE_STRLCAT            `have_function x strlcat`
 #define HAVE_STRLCPY            `have_function x strlcpy`
 #define HAVE_STRSIGNAL          `have_function x strsignal`
@@ -1373,11 +1343,8 @@ extern "C" {
 #define HAVE_THREAD_LOCAL       `have_thread_local`
 #define HAVE_IPV6               `have_ipv6`
 
-#define HAVE_UUID_UUID          $have_uuid_uuid
-#define HAVE_SYS_CAPABILITY     $have_capability
 #define HAVE_OPENSSL            $have_openssl
 #define HAVE_OCSP               $have_ocsp
-#define HAVE_SELINUX            $have_selinux
 #define HAVE_KSTAT              $have_kstat
 #define HAVE_PORT_H             $have_port_h