You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jf...@apache.org on 2006/05/29 23:05:17 UTC
svn commit: r410153 - in
/jakarta/commons/proper/daemon/trunk/src/native/unix: Makedefs.in
native/Makefile.in support/apsupport.m4
Author: jfclere
Date: Mon May 29 14:05:17 2006
New Revision: 410153
URL: http://svn.apache.org/viewvc?rev=410153&view=rev
Log:
Fix PR 39569 (Add LIBS in the make logic).
Modified:
jakarta/commons/proper/daemon/trunk/src/native/unix/Makedefs.in
jakarta/commons/proper/daemon/trunk/src/native/unix/native/Makefile.in
jakarta/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/Makedefs.in
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/unix/Makedefs.in?rev=410153&r1=410152&r2=410153&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/Makedefs.in (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/Makedefs.in Mon May 29 14:05:17 2006
@@ -15,13 +15,14 @@
#
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makedefs.in,v 1.2 2004/02/27 08:40:46 jfclere Exp $
+# @version $Id$
CC = @CC@
JAVAC = @JAVAC@
JAR = @JAR@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
JAVACFLAGS = @JAVACFLAGS@
RANLIB = @RANLIB@
LDCMD = @LDCMD@
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/native/Makefile.in
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/unix/native/Makefile.in?rev=410153&r1=410152&r2=410153&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/native/Makefile.in (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/native/Makefile.in Mon May 29 14:05:17 2006
@@ -36,7 +36,7 @@
$(RANLIB) libservice.a
jsvc: jsvc-unix.o libservice.a
- $(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a -o ../jsvc
+ $(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a $(LIBS) -o ../jsvc
clean:
rm -f $(OBJS) ../jsvc jsvc-unix.o libservice.a
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4?rev=410153&r1=410152&r2=410153&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 Mon May 29 14:05:17 2006
@@ -30,12 +30,12 @@
solaris*)
CFLAGS="$CFLAGS -DOS_SOLARIS -DDSO_DLFCN"
supported_os="solaris"
- LDFLAGS="$LDFLAGS -ldl -lthread"
+ LIBS="$LIBS -ldl -lthread"
;;
linux*)
CFLAGS="$CFLAGS -DOS_LINUX -DDSO_DLFCN"
supported_os="linux"
- LDFLAGS="$LDFLAGS -ldl -lpthread"
+ LIBS="$LIBS -ldl -lpthread"
;;
cygwin)
CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN -DNO_SETSID"
@@ -43,11 +43,12 @@
;;
sysv)
CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN"
- LDFLAGS="$LDFLAGS -ldl"
+ LIBS="$LIBS -ldl"
;;
sysv4)
CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread"
- LDFLAGS="-Kthread $LDFLAGS -ldl"
+ LDFLAGS="-Kthread $LDFLAGS"
+ LIBS="$LIBS -ldl"
;;
freebsd*)
CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread"
@@ -60,7 +61,8 @@
;;
hpux11*)
CFLAGS="$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN"
- LDFLAGS="$LDFLAGS -pthread -lpthread"
+ LDFLAGS="$LDFLAGS -pthread"
+ LIBS="$LIBS -lpthread"
;;
*)
AC_MSG_RESULT([failed])
@@ -83,7 +85,8 @@
bs2000)
CFLAGS="$CFLAGS -DCPU=\\\"osd\\\" -DCHARSET_EBCDIC -DOSD_POSIX"
supported_os="osd"
- LDFLAGS="-Kno_link_stdlibs -B llm4 -l BLSLIB"
+ LDFLAGS="-Kno_link_stdlibs -B llm4"
+ LIBS="$LIBS -lBLSLIB"
LDCMD="/opt/C/bin/cc"
HOST_CPU=osd;;
mips)
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org