More version fixes for master branch

Should pass RADIUSD_VERSION_STRING as release

diff --git a/Make.inc.in b/Make.inc.in
index eedc57d708556d16532ca8196d08dcdf3a2230b2..b279fcfc2f821c16662b507b62e2d61f09eb240d 100644 (file)
--- 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 6e68f3a979a528e00899f238468b9e00f5ee1b9c..a79fed6a8085104dd0026a9089695ea86551f828 100644 (file)
--- 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 7c78effb2546e979d3815f07ff417be714bc84f5..0505abcb75bac8e06616c6e269b0e6b6fc273807 100644 (file)
--- 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 77506835e05d249fb0e45663c91a6c33b38cf4fe..084ed219775b6b54c1675dee953759fe23b72c75 100644 (file)
--- 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 bad5c0f8c05da352c624b09ab2af4fde87382832..f587afc82b9a26689d72da1d573c2faaceadeb6e 100644 (file)
--- 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 514346073bcc1c97fb5d806bb65fed01b5aad5ae..1e39b15bb953dd31526d13ef00d08366302204c9 100644 (file)
--- 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 aca48ecdc9f4945ad0266079a9531792936c3dd7..7c606577ca4035a9f4357e614acdb6b2b386584d 100644 (file)
--- 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 c197f23ecaaff5dbcb4a55b74317aa9c34196493..56342d1d905013320000f858596d582fe8cf4648 100644 (file)
--- 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 202f41090d429a01a64b9567c25280968a283713..a6c4b5e5393d9ade8c18cfa3154b0ea6b54aaa60 100644 (file)
--- 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)