From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 27 Oct 2012 21:05:55 +0000 (+0100)
Subject: More version fixes for master branch
X-Git-Tag: release_3_0_0_beta1~1638
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e9aef86e4133e23819f4b1faa4a5bb14c9159d;p=thirdparty%2Ffreeradius-server.git

More version fixes for master branch

Should pass RADIUSD_VERSION_STRING as release
---

diff --git a/Make.inc.in b/Make.inc.in
index eedc57d7085..b279fcfc2f8 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -128,7 +128,7 @@ endif
 
 ifneq "$(LIBTOOL)" ""
 COMPILE.c	:= $(LIBTOOL) --quiet --mode=compile $(CC)
-LINK.lib	:= $(LIBTOOL) --quiet --mode=link $(CC) -release $(RADIUSD_VERSION) -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/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 6e68f3a979a..a79fed6a808 100644
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -1,6 +1,6 @@
 # -*- text -*-
 ##
-## radiusd.conf	-- FreeRADIUS server configuration file - @RADIUSD_VERSION@
+## radiusd.conf	-- FreeRADIUS server configuration file - @RADIUSD_VERSION_STRING@
 ##
 ##	http://www.freeradius.org/
 ##	$Id$
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 7c78effb254..0505abcb75b 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -49,7 +49,7 @@ install: all
 	$(INSTALL) -d -m 755	$(R)$(libdir)
 	$(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
+	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la;
+	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la
 
 reconfig:
diff --git a/src/main/radclient.mk b/src/main/radclient.mk
index 77506835e05..084ed219775 100644
--- a/src/main/radclient.mk
+++ b/src/main/radclient.mk
@@ -1,7 +1,10 @@
 TGT_PREREQS := libfreeradius-radius.a
 SRC_CFLAGS := -I${top_srcdir}/src/modules/rlm_mschap
 SRC_CFLAGS	+= -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
-
+SRC_CFLAGS	+= -DRADIUSD_VERSION_STRING=\"${RADIUSD_VERSION_STRING}\"
+ifdef RADIUSD_VERSION_COMMIT
+CFLAGS		+= -DRADIUSD_VERSION_COMMIT=\"${RADIUSD_VERSION_COMMIT}\"
+endif
 TGT_LDLIBS := $(LIBS)
 
 SOURCES	:= radclient.c ${top_srcdir}/src/modules/rlm_mschap/smbdes.c \
diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index bad5c0f8c05..f587afc82b9 100644
--- a/src/main/radiusd.mk
+++ b/src/main/radiusd.mk
@@ -9,6 +9,10 @@ endif
 
 SRC_CFLAGS	:= -DHOSTINFO=\"${HOSTINFO}\"
 SRC_CFLAGS	+= -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
+SRC_CFLAGS	+= -DRADIUSD_VERSION_STRING=\"${RADIUSD_VERSION_STRING}\"
+ifdef RADIUSD_VERSION_COMMIT
+CFLAGS		+= -DRADIUSD_VERSION_COMMIT=\"${RADIUSD_VERSION_COMMIT}\"
+endif
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS	:= $(OPENSSL_LIBS)
 TGT_LDFLAGS     := $(LIBS) $(LCRYPT)
diff --git a/src/main/radmin.mk b/src/main/radmin.mk
index 514346073bc..1e39b15bb95 100644
--- a/src/main/radmin.mk
+++ b/src/main/radmin.mk
@@ -1,6 +1,9 @@
 TGT_PREREQS := libfreeradius-radius.a
 SRC_CFLAGS	+= -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
-
+SRC_CFLAGS	+= -DRADIUSD_VERSION_STRING=\"${RADIUSD_VERSION_STRING}\"
+ifdef RADIUSD_VERSION_COMMIT
+CFLAGS		+= -DRADIUSD_VERSION_COMMIT=\"${RADIUSD_VERSION_COMMIT}\"
+endif
 TGT_LDLIBS := $(LIBS) $(LIBREADLINE)
 
 SOURCES	:= radmin.c
diff --git a/src/modules/rlm_eap/libeap/Makefile b/src/modules/rlm_eap/libeap/Makefile
index aca48ecdc9f..7c606577ca4 100644
--- a/src/modules/rlm_eap/libeap/Makefile
+++ b/src/modules/rlm_eap/libeap/Makefile
@@ -29,7 +29,7 @@ all: $(TARGET).la
 
 $(TARGET).la: $(LT_OBJS)
 	@echo LINK $@ $<
-	@$(LIBTOOL) --quiet --mode=link $(CC) -release $(RADIUSD_VERSION) \
+	@$(LIBTOOL) --quiet --mode=link $(CC) -release $(RADIUSD_VERSION_STRING) \
 	    $(LDFLAGS) $(LINK_MODE) -o $@ $(MOD_RPATH)$^ \
 	    $(LIBRADIUS) $(LIBS)
 	@for x in .libs/* $^; do \
@@ -46,5 +46,5 @@ clean:
 install: all
 	$(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
+	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la;
+	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la
diff --git a/src/modules/rlm_sql/drivers/rules.mak b/src/modules/rlm_sql/drivers/rules.mak
index c197f23ecaa..56342d1d905 100644
--- a/src/modules/rlm_sql/drivers/rules.mak
+++ b/src/modules/rlm_sql/drivers/rules.mak
@@ -103,7 +103,7 @@ build-module: $(TARGET).la
 
 $(TARGET).la: $(LT_OBJS)
 	@echo LINK $@ $^
-	@$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+	@$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION_STRING) \
 	    $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) $(RLM_MOD) -o $@ \
 	    $(MOD_RPATH) $^ $(RLM_SQL_LIBS)
 
@@ -149,6 +149,6 @@ install:
 	if [ "x$(TARGET)" != "x" ]; then \
 	    $(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 $$?; \
+	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
+	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
 	fi
diff --git a/src/modules/rules.mak b/src/modules/rules.mak
index 202f41090d4..a6c4b5e5393 100644
--- a/src/modules/rules.mak
+++ b/src/modules/rules.mak
@@ -124,7 +124,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) \
+	@$(LIBTOOL) --quiet --mode=link $(CC) -release $(RADIUSD_VERSION_STRING) \
 	    $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) $(RLM_MOD) -o $@     \
 	    $(MOD_RPATH) $(filter %.lo,$^) $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
 
@@ -174,8 +174,8 @@ install:
 	if [ "x$(TARGET)" != "x" ]; then \
 	    $(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 $$?; \
+	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
+	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
 	fi
 ifneq ($(RLM_UTILS),)
 	$(INSTALL) -d -m 755 $(R)$(bindir)