Pass system $(LIBS) to linker when linking libfreeradius-radius

Remove -release from LDFLAGS until we can figure out what the correct solution is (GCC complains)

diff --git a/Make.inc.in b/Make.inc.in
index 5234c1b3176c5ae8b1e6ea9e757ffc3ace766e06..6f7e3629084bb23bf9c4182f982fb9d655402795 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -104,7 +104,7 @@ endif
 #  between what it was originally linked with, and the library it's
 #  actually loading.
 #
-LDFLAGS += -release=$(RADIUSD_VERSION_STRING)
+#LDFLAGS += -release=$(RADIUSD_VERSION_STRING)
 
 MODULES                = @MODULES@
 HOSTINFO       = @HOSTINFO@
@@ -149,7 +149,7 @@ endif
 
 ifneq "$(LIBTOOL)" ""
 COMPILE.c      := $(LIBTOOL) --quiet --mode=compile $(CC) 
-LINK.lib       := $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(libdir) -o
+LINK.lib       := $(LIBTOOL) --quiet --mode=link $(CC) -release=$(RADIUSD_VERSION_STRING) -rpath $(libdir) -o
 LO             := lo
 LA             := la
 else

diff --git a/src/lib/all.mk b/src/lib/all.mk
index cc1937ad0b30ab9bb2b6cd370027afac69265eed..40b0a83fba94fd713899842a6a67e5f36a2cac95 100644 (file)
--- a/src/lib/all.mk
+++ b/src/lib/all.mk
@@ -3,6 +3,7 @@
 #
 # Version:      $Id$
 #
+TARGET         := libfreeradius-radius.a
 
 SOURCES                := dict.c filters.c hash.c hmac.c hmacsha1.c isaac.c log.c \
                  misc.c missing.c md4.c md5.c print.c radius.c rbtree.c \
@@ -16,4 +17,8 @@ INCLUDES      = ../include/radius.h ../include/libradius.h \
 
 SRC_CFLAGS     := -D_LIBRADIUS -I$(top_builddir)/src
 
-TARGET         := libfreeradius-radius.a
+# System libraries discovered by our top level configure script, links things
+# like pthread and the regexp libraries.
+TGT_LDLIBS     := $(LIBS)
+
+