From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 13 Jun 2017 18:04:45 +0000 (-0400)
Subject: remove STATIC_MODULES, and shared/static library configuration
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2faa484e38024ef2a2eb6e9c03ff362bdea46864;p=thirdparty%2Ffreeradius-server.git

remove STATIC_MODULES, and shared/static library configuration

It's 2017.  We always use shared libraries
---

diff --git a/Make.inc.in b/Make.inc.in
index a5d9bcccdd1..2a880218f4d 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -109,12 +109,9 @@ RUNDIR		= ${localstatedir}/run/radiusd
 SBINDIR		= ${sbindir}
 RADIR		= ${radacctdir}
 
-USE_SHARED_LIBS = @USE_SHARED_LIBS@
-bm_shared_libs  = @USE_SHARED_LIBS@
-USE_STATIC_LIBS = @USE_STATIC_LIBS@
-bm_static_libs  = @USE_STATIC_LIBS@
+bm_shared_libs  = yes
+bm_static_libs  = yes
 
-STATIC_MODULES	= @STATIC_MODULES@
 LIBREADLINE	= @LIBREADLINE@
 
 #
@@ -164,13 +161,7 @@ endif
 ANALYZE.c       := @clang_path@
 
 #
-#  With shared libs, the test binaries are in a different place
-#  AND the method we use to run those binaries changes.
+#  Have wrappers for the test tools, so that they run.
 #
-ifeq "$(USE_SHARED_LIBS)" "yes"
-	TESTBINDIR = ./$(BUILD_DIR)/bin/local
-	TESTBIN    =  $(JLIBTOOL) --quiet --mode=execute $(TESTBINDIR)
-else
-	TESTBINDIR = ./$(BUILD_DIR)/bin
-	TESTBIN    = ./$(BUILD_DIR)/bin
-endif
+TESTBINDIR = ./$(BUILD_DIR)/bin/local
+TESTBIN    =  $(JLIBTOOL) --quiet --mode=execute $(TESTBINDIR)
diff --git a/configure b/configure
index fd6dbeec336..b5daedadbc6 100755
--- a/configure
+++ b/configure
@@ -625,9 +625,6 @@ ac_includes_default="\
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-STATIC_MODULES
-USE_STATIC_LIBS
-USE_SHARED_LIBS
 INSTALLSTRIP
 MODULES
 subdirs
@@ -5616,34 +5613,6 @@ $as_echo "#define WITH_UDPFROMTO /**/" >>confdefs.h
     fi
 
 
-STATIC_MODULES=
-
-# Check whether --with-static_modules was given.
-if test "${with_static_modules+set}" = set; then :
-  withval=$with_static_modules;
-  for i in $withval; do
-    STATIC_MODULES="$STATIC_MODULES -dlpreopen ../modules/rlm_$i/rlm_$i.la"
-  done
-
-fi
-
-
-USE_SHARED_LIBS=yes
-
-# Check whether --with-shared-libs was given.
-if test "${with_shared_libs+set}" = set; then :
-  withval=$with_shared_libs;  case "$withval" in
-  no)
-    USE_SHARED_LIBS=no
-    ;;
-  *)
-  esac
-
-fi
-
-
-
-
     WITH_CAP=yes
 
 
@@ -14730,13 +14699,6 @@ ac_config_commands="$ac_config_commands scripts-chmod"
 
 
 
-
-
-USE_STATIC_LIBS="yes"
-
-
-
-
 unset ac_cv_env_LIBS_set
 unset ac_cv_env_LIBS_value
 
diff --git a/configure.ac b/configure.ac
index 7e476cbb0f7..b8795a449a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,30 +486,6 @@ AX_WITH_FEATURE_ARGS([dhcp],[yes])
 AX_WITH_FEATURE_ARGS([tacacs],[yes])
 AX_WITH_FEATURE_ARGS([udpfromto],[yes])
 
-dnl #
-dnl #  Allow the user to specify a list of modules to be linked
-dnl #  statically to the server.
-dnl #
-STATIC_MODULES=
-AC_ARG_WITH(static_modules,
-[  --with-static-modules=QUOTED-MODULE-LIST],[
-  for i in $withval; do
-    STATIC_MODULES="$STATIC_MODULES -dlpreopen ../modules/rlm_$i/rlm_$i.la"
-  done
-])
-
-USE_SHARED_LIBS=yes
-AC_ARG_WITH(shared-libs,
-[AS_HELP_STRING([--with-shared-libs ],
-[build dynamic libraries and link against them. (default=yes)])],
-[ case "$withval" in
-  no)
-    USE_SHARED_LIBS=no
-    ;;
-  *)
-  esac
-])
-
 dnl #############################################################
 dnl #
 dnl #  0e. Library/include paths
@@ -2159,11 +2135,6 @@ dnl #
 AC_SUBST(LIBS)
 AC_SUBST(INSTALLSTRIP)
 
-AC_SUBST(USE_SHARED_LIBS)
-USE_STATIC_LIBS="yes"
-AC_SUBST(USE_STATIC_LIBS)
-AC_SUBST(STATIC_MODULES)
-
 AC_OUTPUT(\
   ./Make.inc \
   ./src/include/build-radpaths-h \