Remove cruft from rlm_sql configure script, and inherit EXPERIMENTAL status from...

diff --git a/configure b/configure
index e6c8851..7a64579 100755 (executable)
--- a/configure
+++ b/configure
@@ -631,8 +631,6 @@ USE_SHARED_LIBS
 INSTALLSTRIP
 MODULES
 subdirs
-INCLTDL
-LIBLTDL
 HOSTINFO
 CRYPTLIB
 LIBPREFIX
@@ -7414,6 +7412,8 @@ else
 $as_echo "no." >&6; }
 fi
 
+export EXPERIMENTAL
+
 if test -d $srcdir/.git -a "x$GIT" = "xyes"; then
   RADIUSD_VERSION_COMMIT=`git log --pretty=format:'%h' -n 1`
 
@@ -7452,17 +7452,6 @@ $as_echo "#define HAVE_THREAD_TLS 1" >>confdefs.h
 
 
 
-old_LIBS="$LIBS"
-LIBS="$LIBS $LIBLTDL"
-ac_fn_c_check_func "$LINENO" "lt_dladvise_init" "ac_cv_func_lt_dladvise_init"
-if test "x$ac_cv_func_lt_dladvise_init" = xyes; then :
-
-$as_echo "#define HAVE_LT_DLADVISE_INIT /**/" >>confdefs.h
-
-fi
-
-LIBS="$old_LIBS"
-
 talloc_include_dir=
 
 # Check whether --with-talloc-include-dir was given.
@@ -8023,8 +8012,6 @@ $as_echo "top_builddir=$top_builddir" >&6; }
 
 
 
-
-
 if test "x$EXPERIMENTAL" = "xyes"; then
   for foo in `ls -1 "${srcdir}"/src/modules | grep rlm_`; do
     MODULES="$MODULES $foo"

diff --git a/configure.in b/configure.in
index 9246d76..1f57512 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1004,6 +1004,8 @@ else
   AC_MSG_RESULT(no.)
 fi
 
+export EXPERIMENTAL
+
 dnl append the current git hash onto the version string
 if test -d $srcdir/.git -a "x$GIT" = "xyes"; then
   RADIUSD_VERSION_COMMIT=`git log --pretty=format:'%h' -n 1`

diff --git a/src/modules/rlm_sql/configure b/src/modules/rlm_sql/configure
index 14cc72d..d617f3c 100755 (executable)
--- a/src/modules/rlm_sql/configure
+++ b/src/modules/rlm_sql/configure
@@ -586,7 +586,6 @@ ac_unique_file="rlm_sql.c"
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-SQL_MODULES
 targetname
 sql_cflags
 sql_ldflags
@@ -639,7 +638,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-with_experimental_modules
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1252,11 +1250,6 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-experimental-modules      Use experimental and unstable modules. (default=no)
-
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2533,20 +2526,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-               EXPERIMENTAL=
-
-# Check whether --with-experimental-modules was given.
-if test "${with_experimental_modules+set}" = set; then :
-  withval=$with_experimental_modules;  case "$withval" in
-               yes)
-                       EXPERIMENTAL=yes
-                       ;;
-               *)
-       esac
-
-fi
-
-
        mysubdirs=
        if test "x$EXPERIMENTAL" = "xyes"; then
          for foo in `find ./drivers -name configure -print`; do
@@ -2559,17 +2538,6 @@ fi
          done
        fi
 
-       SQL_MODULES=
-       if test "x$EXPERIMENTAL" = "xyes"; then
-         for foo in `ls ./drivers/rlm_*/Makefile* | sed 's/.*rlm/rlm/;s,/Make.*,,' | sort -u`; do
-           SQL_MODULES="$SQL_MODULES $foo"
-         done
-       else
-         for foo in `cat stable`; do
-           SQL_MODULES="$SQL_MODULES $foo"
-         done
-       fi
-
                ln -s ../../../install-sh install-sh
 
                                        ac_aux_dir=
@@ -2641,7 +2609,6 @@ sql_cflags=$SMART_CFLAGS
 
 
 
-
   unset ac_cv_env_LIBS_set
   unset ac_cv_env_LIBS_value
 

diff --git a/src/modules/rlm_sql/configure.in b/src/modules/rlm_sql/configure.in
index 78a2bfb..4b7d745 100644 (file)
--- a/src/modules/rlm_sql/configure.in
+++ b/src/modules/rlm_sql/configure.in
@@ -10,18 +10,6 @@ if test x$with_[]modname != xno; then
 
        AC_PROG_CC
 
-       dnl extra argument: --with-experimental-modules
-       EXPERIMENTAL=
-       AC_ARG_WITH(experimental-modules,
-       [  --with-experimental-modules      Use experimental and unstable modules. (default=no) ],
-       [ case "$withval" in
-               yes)
-                       EXPERIMENTAL=yes
-                       ;;
-               *)
-       esac ]
-       )
-
        mysubdirs=
        if test "x$EXPERIMENTAL" = "xyes"; then
          for foo in `find ./drivers -name configure -print`; do
@@ -34,17 +22,6 @@ if test x$with_[]modname != xno; then
          done
        fi
 
-       SQL_MODULES=
-       if test "x$EXPERIMENTAL" = "xyes"; then
-         for foo in `ls ./drivers/rlm_*/Makefile* | sed 's/.*rlm/rlm/;s,/Make.*,,' | sort -u`; do
-           SQL_MODULES="$SQL_MODULES $foo"
-         done
-       else
-         for foo in `cat stable`; do
-           SQL_MODULES="$SQL_MODULES $foo"
-         done
-       fi
-
        dnl # don't ask... this is done to avoid autoconf stupidities.
        ln -s ../../../install-sh install-sh
 
@@ -87,5 +64,4 @@ sql_cflags=$SMART_CFLAGS
 AC_SUBST(sql_ldflags)
 AC_SUBST(sql_cflags)
 AC_SUBST(targetname)
-AC_SUBST(SQL_MODULES)
 AC_OUTPUT(all.mk)

diff --git a/src/modules/rlm_sql/drivers/rules.mak b/src/modules/rlm_sql/drivers/rules.mak
deleted file mode 100644 (file)
index 56342d1..0000000
--- a/src/modules/rlm_sql/drivers/rules.mak
+++ /dev/null
@@ -1,154 +0,0 @@
-#######################################################################
-#
-# $Id$
-#
-#  Each module should have a few common defines at the TOP of the
-# Makefile, and the 'include ../rules.mak'
-#
-# e.g.
-#
-##########################
-# TARGET = rlm_foo
-# SRCS   = rlm_foo.c other.c
-#
-# include ../rules.mak
-#
-# CFLAGS += my_c_flags
-##########################
-#
-# and everything will be automagically built
-#
-#######################################################################
-
-.PHONY: all build-module clean distclean install reconfig
-
-all: build-module
-
-#######################################################################
-#
-#  definitions for new dependencies on suffixes
-#
-#######################################################################
-.SUFFIXES: .lo .o .la .a
-
-#######################################################################
-#
-# define libtool objects for the libraries,
-# along with a number of other useful definitions.
-#
-#######################################################################
-LT_OBJS                = $(SRCS:.c=.lo)
-CFLAGS         += -I../.. -I$(top_builddir)/src/
-
-#######################################################################
-#
-# Ensure that the modules get re-built if the server header files
-# change.
-#
-#######################################################################
-SERVER_HEADERS = ../../rlm_sql.h
-$(LT_OBJS):  $(SERVER_HEADERS)
-
-#######################################################################
-#
-# define new rules
-#
-#######################################################################
-%.lo: %.c
-       @echo CC $<@
-       @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) $(RLM_SQL_CFLAGS) -c $<
-
-ifneq ($(TARGET),)
-#######################################################################
-#
-# Define a number of new targets
-#
-#######################################################################
-
-#
-#  If the module is in the list of static modules, then the "dynamic"
-#  library is built statically, so that the '.la' file contains the
-#  libraries that the module depends on.
-#
-#  Yes, this is a horrible hack.
-#
-ifeq ($(findstring $(TARGET),$(STATIC_MODULES)),)
-LINK_MODE=-export-dynamic $(MOD_RPATH) -rdynamic
-else
-LINK_MODE=-static
-endif
-
-#
-#  Also, if we're NOT using shared libraries, then force the
-#  link mode to static.
-#
-ifneq ($(USE_SHARED_LIBS),yes)
-LINK_MODE=-static
-endif
-
-#######################################################################
-#
-#  Generic targets so we can sweep through all modules
-# without knowing what their names are.
-#
-#  These rules also allow us to copy the '.a' or '.la' up
-# a level, to the 'src/modules' directory, for general consumption.
-#
-#######################################################################
-build-module: $(TARGET).la
-       @for x in .libs/* $^; do \
-               rm -f $(top_builddir)/src/modules/lib/$$x; \
-               ln -s $(top_builddir)/src/modules/rlm_sql/drivers/$(TARGET)/$$x $(top_builddir)/src/modules/lib/$$x; \
-       done
-
-$(TARGET).la: $(LT_OBJS)
-       @echo LINK $@ $^
-       @$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION_STRING) \
-           $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) $(RLM_MOD) -o $@ \
-           $(MOD_RPATH) $^ $(RLM_SQL_LIBS)
-
-#######################################################################
-#
-#  It's a dummy target: don't build it
-#
-#######################################################################
-else
-build-module:
-
-# if $(TARGET) == ""
-endif
-
-#######################################################################
-#
-#  clean and install rules
-#
-#######################################################################
-clean:
-       @rm -f *.a *.o *.lo *.la *~
-       @rm -rf .libs _libs
-       @rm -f config.log config.status config.cache
-
-distclean: clean
-       @rm -f config.h config.mak
-
-reconfig:
-       @if [ -f configure.in ]; then \
-               [ "x$(AUTOCONF)" != "x" ] && $(AUTOCONF) -I $(top_builddir); \
-       fi
-       @if [ -f config.h.in ]; then \
-               [ "x$(AUTOHEADER)" != "x" ] && $(AUTOHEADER); \
-       fi
-
-#
-#  Do any module-specific installation.
-#
-#  If there isn't a TARGET defined, then don't do anything.
-#  Otherwise, install the libraries into $(libdir)
-#
-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_STRING).la; \
-           ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
-       fi