Author: mturk
Date: Fri Jul 31 16:54:49 2009
New Revision: 799659
URL: http://svn.apache.org/viewvc?rev=799659&view=rev
Log:
Check for libaio
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.in
commons/sandbox/runtime/trunk/src/main/native/configure
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.in?rev=799659&r1=799658&r2=799659&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.in Fri Jul 31
16:54:49 2009
@@ -173,10 +173,10 @@
-...@$(RANLIB) $@
$(SHAREDLIB): $(COMMON_OBJS) $(@platf...@_objs) @testobjs@ $(STATICLIB)
- $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(COMMON_OBJS) $(@platf...@_objs)
@testobjs@
+ $(CC) $(SHFLAGS) -o $@ $(COMMON_OBJS) $(@platf...@_objs) @testobjs@
$(LDFLAGS)
$(SSLMODLIB): $(SHAREDLIB) $(OPENSSL_OBJS)
- $(CC) $(SHFLAGS) $(LDFLAGS) $(SSLFLAGS) -L. -l$(NAME) -o $@
$(OPENSSL_OBJS)
+ $(CC) $(SHFLAGS) -o $@ $(OPENSSL_OBJS) $(LDFLAGS) $(SSLFLAGS) -L.
-l$(NAME)
clean:
for i in $(SRCDIR) $(ARCH_DIRS) ; do rm -f $$i/*.$(OBJ) ; done
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=799659&r1=799658&r2=799659&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Fri Jul 31 16:54:49
2009
@@ -756,6 +756,10 @@
test ".$sizeof_off64t" = .0 && have_off64t=0
have_aio=`have_include aio`
have_libaio=`have_include libaio`
+ if [ ".$have_libaio" = .1 ]; then
+ have_libaio=`have_library aio`
+ test ".$have_libaio" = .1 && varadds ldflags -laio
+ fi
have_windows=0
have_uuid_uuid=`have_include uuid/uuid`
if [ ".$have_uuid_uuid" = .1 ]; then
@@ -764,8 +768,6 @@
fi
fi
-test ".$have_libaio" = .1 && varadds ldflags -laio
-
if [ ".$host" = ".linux" ]; then
have_selinux=`have_include selinux/selinux`
if [ ".$have_selinux" = .1 ]; then
