From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 18 Nov 2022 13:13:35 +0000 (-0600)
Subject: macos doesn't like big version numbers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c38c6d5b1fb99c079a9b563aedd610bfb2bbc59;p=thirdparty%2Ffreeradius-server.git

macos doesn't like big version numbers
---

diff --git a/Make.inc.in b/Make.inc.in
index 80419312340..11623e6929d 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -146,6 +146,10 @@ endif
 #
 RADIUSD_VERSION = @RADIUSD_VERSION@
 
+RADIUSD_VERSION_MAJOR = @RADIUSD_VERSION_MAJOR@
+RADIUSD_VERSION_MINOR = @RADIUSD_VERSION_MINOR@
+RADIUSD_VERSION_INCROM = @RADIUSD_VERSION_INCRM@
+
 #
 #  This allows dlopen to do runtime checks for version mismatches
 #  between what it was originally linked with, and the library it's
diff --git a/configure b/configure
index dd0b2ac5242..34a67bf3c0c 100755
--- a/configure
+++ b/configure
@@ -733,6 +733,10 @@ PANDOC_ENGINE
 PANDOC
 ASCIIDOCTOR
 GIT
+RADIUSD_VERSION_INCRM
+RADIUSD_VERSION_MINOR
+RADIUSD_VERSION_MAJOR
+RADIUSD_VERSION
 target_alias
 host_alias
 build_alias
@@ -2840,6 +2844,11 @@ printf "%s\n" "#define RADIUSD_VERSION_INCRM ${RADIUSD_VERSION_INCRM}" >>confdef
 
 
 
+
+
+
+
+
 unset ASAN_OPTIONS
 unset LSAN_OPTIONS
 
diff --git a/configure.ac b/configure.ac
index bd7bd1bb34d..fc8ddf2309f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,11 @@ AC_DEFINE_UNQUOTED([RADIUSD_VERSION_MAJOR], [${RADIUSD_VERSION_MAJOR}], [Version
 AC_DEFINE_UNQUOTED([RADIUSD_VERSION_MINOR], [${RADIUSD_VERSION_MINOR}], [Version integer in format <mi>])
 AC_DEFINE_UNQUOTED([RADIUSD_VERSION_INCRM], [${RADIUSD_VERSION_INCRM}], [Version integer in format <in>])
 
+AC_SUBST(RADIUSD_VERSION)
+AC_SUBST(RADIUSD_VERSION_MAJOR)
+AC_SUBST(RADIUSD_VERSION_MINOR)
+AC_SUBST(RADIUSD_VERSION_INCRM)
+
 dnl #############################################################
 dnl #
 dnl #  Override some of the default autoconf variables such as
diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index adb64e69892..ad31a7ff69c 100644
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -33,7 +33,7 @@ ifneq "${LIBTOOL}" ""
 
 ifeq "${LIBTOOL}" "JLIBTOOL"
     JLIBTOOL := ${BUILD_DIR}/make/jlibtool
-    JLIBTOOL_DEFS := -DPROGRAM_VERSION=$(RADIUSD_VERSION)
+    JLIBTOOL_DEFS := -DPROGRAM_VERSION=$(RADIUSD_VERSION_MAJOR).$(RADIUSD_VERSION_MINOR)
 
     # Pass compiler and ranlib paths through to jlibtool if they're
     # defined in the environment.  This lets us define a separate