Fixes to work with system libtool

diff --git a/Make.inc.in b/Make.inc.in
index c42211ba91d25285c33a49e48be699002d47a581..6bde399afaedcc166307e63d0fa7a72741fca475 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -152,3 +152,10 @@ all: $(top_srcdir)/scripts/jlibtool
 
 $(top_srcdir)/scripts/jlibtool: $(top_srcdir)/scripts/jlibtool.c
        $(CC) $^ -o $@
+
+# 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"
+endif
+

diff --git a/src/modules/rlm_sql/drivers/rules.mak b/src/modules/rlm_sql/drivers/rules.mak
index 78a1f0f714121f6875458bca00c39e490a6f48d9..c698bf3e57831c1a1863a49914d1a8e0e2411f0b 100644 (file)
--- a/src/modules/rlm_sql/drivers/rules.mak
+++ b/src/modules/rlm_sql/drivers/rules.mak
@@ -104,7 +104,7 @@ build-module: $(TARGET).la
 $(TARGET).la: $(LT_OBJS)
        @echo LINK $@ $^
        @$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
-           $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
+           $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) $(RLM_MOD) -o $@ \
            -rpath $(libdir) $^ $(RLM_SQL_LIBS)
 
 #######################################################################

diff --git a/src/modules/rules.mak b/src/modules/rules.mak
index ce1a538b164e97669a9d3021167db7ddd842499e..71a4de770979ed6516600bed6d85a295afd40a77 100644 (file)
--- a/src/modules/rules.mak
+++ b/src/modules/rules.mak
@@ -125,7 +125,7 @@ build-module: $(TARGET).la $(RLM_UTILS)
 $(TARGET).la: $(RLM_SUBDIRS) $(LT_OBJS)
        @echo LINK $@ $(filter %.lo,$^)
        @$(LIBTOOL) --quiet --mode=link $(CC) -release $(RADIUSD_VERSION) \
-           $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
+           $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) $(RLM_MOD) -o $@     \
            $(filter %.lo,$^) $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
 
 #######################################################################