From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 27 Oct 2012 15:57:19 +0000 (+0200)
Subject: More fixes to make it work with system libtool && jlibtool
X-Git-Tag: release_3_0_0_beta1~1641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51403eefba71229e994cab0f2b32c589e52b3f7e;p=thirdparty%2Ffreeradius-server.git

More fixes to make it work with system libtool && jlibtool
---

diff --git a/Make.inc.in b/Make.inc.in
index 6bde399afae..76981acb4f4 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -156,6 +156,7 @@ $(top_srcdir)/scripts/jlibtool: $(top_srcdir)/scripts/jlibtool.c
 # Add -module for normal libtool.  It doesn't like building "foo.la"
 # as a library unless you tell it to shut up, yes, I KNOW this is a module
 ifeq "$(findstring jlibtool,$(LIBTOOL))" ""
-  RLM_MOD = "-module"
+  RLM_MOD = -module
+else
+  MOD_RPATH = -rpath $(libdir)
 endif
-
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 3d72407d5c5..7c78effb254 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -47,7 +47,7 @@ clean:
 
 install: all
 	$(INSTALL) -d -m 755	$(R)$(libdir)
-	$(LIBTOOL) --mode=install $(INSTALL) -c -rpath $(libdir) $(TARGET).la \
+	$(LIBTOOL) --mode=install $(INSTALL) -c $(MOD_RPATH) $(TARGET).la \
 		$(R)$(libdir)/$(TARGET).la
 	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
 	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
diff --git a/src/modules/rlm_eap/libeap/Makefile b/src/modules/rlm_eap/libeap/Makefile
index 18c189cadca..aca48ecdc9f 100644
--- a/src/modules/rlm_eap/libeap/Makefile
+++ b/src/modules/rlm_eap/libeap/Makefile
@@ -30,7 +30,7 @@ all: $(TARGET).la
 $(TARGET).la: $(LT_OBJS)
 	@echo LINK $@ $<
 	@$(LIBTOOL) --quiet --mode=link $(CC) -release $(RADIUSD_VERSION) \
-	    $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ \
+	    $(LDFLAGS) $(LINK_MODE) -o $@ $(MOD_RPATH)$^ \
 	    $(LIBRADIUS) $(LIBS)
 	@for x in .libs/* $^; do \
 		rm -f $(top_builddir)/src/modules/lib/$$x; \
@@ -44,7 +44,7 @@ clean:
 	@rm -rf .libs
 
 install: all
-	$(LIBTOOL) --mode=install $(INSTALL) -c -rpath $(libdir) $(TARGET).la \
+	$(LIBTOOL) --mode=install $(INSTALL) -c $(MOD_RPATH) $(TARGET).la \
 		$(R)$(libdir)/$(TARGET).la
 	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
 	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
diff --git a/src/modules/rlm_sql/drivers/rules.mak b/src/modules/rlm_sql/drivers/rules.mak
index c698bf3e578..c197f23ecaa 100644
--- a/src/modules/rlm_sql/drivers/rules.mak
+++ b/src/modules/rlm_sql/drivers/rules.mak
@@ -73,7 +73,7 @@ ifneq ($(TARGET),)
 #  Yes, this is a horrible hack.
 #
 ifeq ($(findstring $(TARGET),$(STATIC_MODULES)),)
-LINK_MODE=-export-dynamic -rpath ${libdir} -rdynamic
+LINK_MODE=-export-dynamic $(MOD_RPATH) -rdynamic
 else
 LINK_MODE=-static
 endif
@@ -105,7 +105,7 @@ $(TARGET).la: $(LT_OBJS)
 	@echo LINK $@ $^
 	@$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
 	    $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) $(RLM_MOD) -o $@ \
-	    -rpath $(libdir) $^ $(RLM_SQL_LIBS)
+	    $(MOD_RPATH) $^ $(RLM_SQL_LIBS)
 
 #######################################################################
 #
@@ -147,8 +147,8 @@ reconfig:
 #
 install:
 	if [ "x$(TARGET)" != "x" ]; then \
-	    $(LIBTOOL) --mode=install $(INSTALL) -c \
-		-rpath $(libdir) $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
+	    $(LIBTOOL) --mode=install $(INSTALL) -c $(MOD_RPATH) \
+		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
 	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
 	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
 	fi
diff --git a/src/modules/rules.mak b/src/modules/rules.mak
index 71a4de77097..202f41090d4 100644
--- a/src/modules/rules.mak
+++ b/src/modules/rules.mak
@@ -86,7 +86,7 @@ ifneq ($(TARGET),)
 #  Yes, this is a horrible hack.
 #
 ifeq ($(findstring $(TARGET),$(STATIC_MODULES)),)
-LINK_MODE = -export-dynamic -rpath ${libdir} -rdynamic
+LINK_MODE = -export-dynamic $(MOD_RPATH) -rdynamic
 else
 LINK_MODE = -static
 endif
@@ -126,7 +126,7 @@ $(TARGET).la: $(RLM_SUBDIRS) $(LT_OBJS)
 	@echo LINK $@ $(filter %.lo,$^)
 	@$(LIBTOOL) --quiet --mode=link $(CC) -release $(RADIUSD_VERSION) \
 	    $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) $(RLM_MOD) -o $@     \
-	    $(filter %.lo,$^) $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
+	    $(MOD_RPATH) $(filter %.lo,$^) $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
 
 #######################################################################
 #
@@ -173,7 +173,7 @@ install:
 	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
 	if [ "x$(TARGET)" != "x" ]; then \
 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
-		-rpath $(libdir) $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
+		$(MOD_RPATH) $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
 	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
 	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
 	fi