Add --enable-boilermake

Cleanup description indentation

diff --git a/Make.inc.in b/Make.inc.in
index f3e5f24cdf7754f15b654476562057fe3d4b4099..9c9f4a158e464215dd473a041f8aef25f67179bb 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -168,3 +168,5 @@ endif
 ifeq "$(LIBTOOL)" ""
 $(error Building FreeRADIUS requires libtool)
 endif
+
+BOILER = @boilermake@

diff --git a/configure b/configure
index bb2cf442f1f1f7ae0ace823dba682ef5c43097ca..75fc00e6ce97aa1c44af0191f8f23897dddb6015 100755 (executable)
--- a/configure
+++ b/configure
@@ -671,6 +671,7 @@ PERL
 raddbdir
 radacctdir
 logdir
+boilermake
 CXXCPP
 OTOOL64
 OTOOL
@@ -770,6 +771,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_strict_dependencies
+enable_boilermake
 with_docdir
 with_logdir
 with_radacctdir
@@ -1415,7 +1417,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-developer               Enables features of interest to developers.
+  --enable-developer      enables features of interest to developers.
   --disable-largefile     omit support for large files
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -1423,6 +1425,7 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-strict-dependencies  Fail configure on lack of module dependancy.
+  --enable-boilermake     use the boilermake build system (experimental default=no).
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1440,11 +1443,11 @@ Optional Packages:
   --with-raddbdir=DIR     Directory for config files SYSCONFDIR/raddb
   --with-ascend-binary    Include support for Ascend binary filter attributes (default=yes)
   --with-threads          Use threads, if available.  (default=yes)
-  --with-tcp             Compile in TCP support. (default=yes)
+  --with-tcp              Compile in TCP support. (default=yes)
   --with-vmps             Compile in VMPS support. (default=yes)
   --with-dhcp             Compile in DHCP support. (default=yes)
   --with-static-modules=QUOTED-MODULE-LIST
- --with-modules=QUOTED-MODULE-LIST
+  --with-modules=QUOTED-MODULE-LIST
   --with-experimental-modules      Use experimental and unstable modules. (default=no, unless --enable-developer=yes)
   --with-openssl                   Use OpenSSL. (default=yes)
   --with-openssl-includes=DIR      Directory to look for OpenSSL include files
@@ -15251,6 +15254,22 @@ if test "${enable_strict_dependencies+set}" = set; then :
 fi
 
 
+boilermake = no
+# Check whether --enable-boilermake was given.
+if test "${enable_boilermake+set}" = set; then :
+  enableval=$enable_boilermake;  case "$enableval" in
+    yes)
+        boilermake=yes
+        ;;
+    *)
+        boilermake=no
+  esac
+
+fi
+
+
+
+
 docdir='${datadir}/doc/freeradius'
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking docdir" >&5
 $as_echo_n "checking docdir... " >&6; }

diff --git a/configure.in b/configure.in
index aebce0bbe3743091f815bba6d727bc1cd13c1295..391965d7054268a96ac0bf111655ff42b15f9f8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -61,7 +61,7 @@ dnl #  These checks must be done before expanding the AC_PROG_CC
 dnl #  and AC_PROG_CXX macros.
 dnl #
 AC_ARG_ENABLE(developer,
-[  --enable-developer               Enables features of interest to developers.],
+[  --enable-developer      enables features of interest to developers.],
 [ case "$enableval" in
     no)
        developer=no
@@ -166,7 +166,7 @@ AS_IF([test "x$with_system_libtool" = "xyes" ],
 
 dnl Put this in later, when all distributed modules use autoconf.
 dnl AC_ARG_WITH(disablemodulefoo,
-dnl [  --without-rlm_foo       Disables module compilation.  Module list:]
+dnl [  --without-rlm_foo         Disables module compilation.  Module list:]
 dnl esyscmd([find src/modules -type d -name rlm_\* -print |\
 dnl    sed -e 's%src/modules/.*/% (sub)- %; s%.*/%- %' |\
 dnl    awk '{print "                            "$0}']))
@@ -174,6 +174,21 @@ dnl        awk '{print "                            "$0}']))
 AC_ARG_ENABLE(strict-dependencies,
 [  --enable-strict-dependencies  Fail configure on lack of module dependancy.])
 
+dnl # Build using the new boilermake system
+boilermake = no
+AC_ARG_ENABLE(boilermake,
+[  --enable-boilermake     use the boilermake build system (experimental default=no).],
+[ case "$enableval" in
+    yes)
+        boilermake=yes
+        ;;
+    *)
+        boilermake=no
+  esac ]
+)
+
+AC_SUBST(boilermake)
+
 dnl extra argument: --with-docdir
 docdir='${datadir}/doc/freeradius'
 AC_MSG_CHECKING(docdir)
@@ -295,7 +310,7 @@ AC_ARG_WITH(threads,
 dnl extra argument: --with-tcp
 WITH_TCP=yes
 AC_ARG_WITH(tcp,
-[  --with-tcp             Compile in TCP support. (default=yes)],
+[  --with-tcp              Compile in TCP support. (default=yes)],
 [ case "$withval" in
     yes)
         ;;
@@ -351,7 +366,7 @@ AC_ARG_WITH(static_modules,
 
 MODULES=
 AC_ARG_WITH(modules,
-[ --with-modules=QUOTED-MODULE-LIST],[
+[  --with-modules=QUOTED-MODULE-LIST],[
  for i in $withval; do
    MODULES="$MODULES $i"
  done