Cleanup configure.ac a little for better readability

- Use 2 new lines as separator between configure options.
- Remove forgotten copy&paste text.
- Reorder and move template configure option to the end.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>

1 files changed, 44 insertions, 32 deletions

diff --git a/configure.ac b/configure.ac
index a4f0acfa..8c8db8e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,7 @@ AC_ARG_WITH(moddirs,
 AM_CONDITIONAL(WITH_MODDIRS, test x$moddirs != x)
 AC_SUBST(moddirs)
 
+
 # Large file support
 AC_ARG_ENABLE(largefile,
         [AS_HELP_STRING([--enable-largefile],[Enable large file support @<:@default=yes@:>@])],
@@ -158,6 +159,7 @@ if test "$enable_largefile" = "no"; then
         AC_DEFINE(NOLARGEFILE, 1, [Defined when large file support is disabled.])
 fi
 
+
 # Regular expressions
 AC_ARG_ENABLE(regexp,
         [AS_HELP_STRING([--enable-regexp],[Enable regular expressions support @<:@default=yes@:>@])],
@@ -173,6 +175,7 @@ if test "$enable_regexp" = "yes"; then
         AC_DEFINE(FEATURE_REGEXP, 1, [Regular expressions support enabled.])
 fi
 
+
 # zlib compression
 AC_ARG_ENABLE(zlib,
         [AS_HELP_STRING([--enable-zlib],[Enable zlib compression  support @<:@default=yes@:>@])],
@@ -193,6 +196,7 @@ if test "$enable_zlib" = "yes"; then
 	fi
 fi
 
+
 #gssapi
 AC_ARG_ENABLE(gssapi_krb5,
 	[AS_HELP_STRING([--enable-gssapi-krb5],[Enable GSSAPI Kerberos 5 support @<:@default=no@:>@])],
@@ -215,6 +219,7 @@ if test $enable_gssapi_krb5 = yes; then
 fi
 AM_CONDITIONAL(ENABLE_GSSAPI, test x$enable_gssapi_krb5 = xyes)
 
+
 # multithreading via pthreads
 AC_ARG_ENABLE(pthreads,
         [AS_HELP_STRING([--enable-pthreads],[Enable multithreading via pthreads @<:@default=yes@:>@])],
@@ -255,6 +260,7 @@ if test "x$enable_pthreads" != "xno"; then
   )
 fi
 
+
 # klog
 AC_ARG_ENABLE(klog,
         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],
@@ -269,6 +275,7 @@ AM_CONDITIONAL(ENABLE_IMKLOG, test x$enable_klog = xyes)
 AM_CONDITIONAL(ENABLE_IMKLOG_BSD, test x$os_type = xbsd)
 AM_CONDITIONAL(ENABLE_IMKLOG_LINUX, test x$os_type = xlinux)
 
+
 #
 # SYSLOG_UNIXAF
 #
@@ -289,6 +296,7 @@ AC_ARG_ENABLE([unix],
     AC_DEFINE([SYSLOG_UNIXAF], [1], [Description])
   ])
 
+
 # inet
 AC_ARG_ENABLE(inet,
         [AS_HELP_STRING([--enable-inet],[Enable networking support @<:@default=yes@:>@])],
@@ -304,6 +312,7 @@ if test "$enable_inet" = "yes"; then
         AC_DEFINE(SYSLOG_INET, 1, [network support is integrated.])
 fi
 
+
 #
 # The following define determines whether the package adheres to the
 # file system standard.
@@ -325,6 +334,7 @@ AC_ARG_ENABLE([fsstnd],
     AC_DEFINE([FSSTND], [1], [Description])
   ])
 
+
 # debug
 AC_ARG_ENABLE(debug,
         [AS_HELP_STRING([--enable-debug],[Enable debug mode @<:@default=no@:>@])],
@@ -342,6 +352,7 @@ if test "$enable_debug" = "no"; then
         AC_DEFINE(NDEBUG, 1, [Defined if debug mode is disabled.])
 fi
 
+
 # runtime instrumentation
 AC_ARG_ENABLE(rtinst,
         [AS_HELP_STRING([--enable-rtinst],[Enable runtime instrumentation mode @<:@default=no@:>@])],
@@ -356,6 +367,7 @@ if test "$enable_rtinst" = "yes"; then
         AC_DEFINE(RTINST, 1, [Defined if runtime instrumentation mode is enabled.])
 fi
 
+
 # valgrind
 AC_ARG_ENABLE(valgrind,
         [AS_HELP_STRING([--enable-valgrind],[Enable valgrind support settings @<:@default=no@:>@])],
@@ -452,6 +464,7 @@ AM_CONDITIONAL(ENABLE_PGSQL, test x$enable_pgsql = xyes)
 AC_SUBST(PGSQL_CFLAGS)
 AC_SUBST(PGSQL_LIBS)
 
+
 # oracle (OCI) support
 AC_ARG_ENABLE(oracle,
 	[AS_HELP_STRING([--enable-oracle],[Enable native Oracle database support @<:@default=no@:>@])],
@@ -484,7 +497,8 @@ fi
 AM_CONDITIONAL(ENABLE_ORACLE, test x$enable_oracle = xyes)
 AC_SUBST(ORACLE_CFLAGS)
 AC_SUBST(ORACLE_LIBS)
-	
+
+
 # libdbi support
 AC_ARG_ENABLE(libdbi,
         [AS_HELP_STRING([--enable-libdbi],[Enable libdbi database support @<:@default=no@:>@])],
@@ -645,6 +659,7 @@ AM_CONDITIONAL(ENABLE_RELP, test x$enable_relp = xyes)
 AC_SUBST(RELP_CFLAGS)
 AC_SUBST(RELP_LIBS)
 
+
 # RFC 3195 support
 AC_ARG_ENABLE(rfc3195,
         [AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])],
@@ -663,7 +678,7 @@ AC_SUBST(LIBLOGGING_CFLAGS)
 AC_SUBST(LIBLOGGING_LIBS)
 
 
-# settings for the file input module;
+# settings for the file input module
 AC_ARG_ENABLE(imfile,
         [AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])],
         [case "${enableval}" in
@@ -673,13 +688,35 @@ AC_ARG_ENABLE(imfile,
          esac],
         [enable_imfile=no]
 )
-#
-# you may want to do some library checks here - see snmp, mysql, pgsql modules
-# for samples
-#
 AM_CONDITIONAL(ENABLE_IMFILE, test x$enable_imfile = xyes)
 
 
+# settings for the omprog output module
+AC_ARG_ENABLE(omprog,
+        [AS_HELP_STRING([--enable-omprog],[Compiles omprog module @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_omprog="yes" ;;
+          no) enable_omprog="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omprog) ;;
+         esac],
+        [enable_omprog=no]
+)
+AM_CONDITIONAL(ENABLE_OMPROG, test x$enable_omprog = xyes)
+
+
+# settings for omstdout
+AC_ARG_ENABLE(omstdout,
+        [AS_HELP_STRING([--enable-omstdout],[Compiles stdout module @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_omstdout="yes" ;;
+          no) enable_omstdout="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omstdout) ;;
+         esac],
+        [enable_omstdout=no]
+)
+AM_CONDITIONAL(ENABLE_OMSTDOUT, test x$enable_omstdout = xyes)
+
+
 # settings for the template input module; copy and modify this code
 # if you intend to add your own module. Be sure to replace imtemplate
 # by the actual name of your module.
@@ -699,21 +736,6 @@ AC_ARG_ENABLE(imtemplate,
 AM_CONDITIONAL(ENABLE_IMTEMPLATE, test x$enable_imtemplate = xyes)
 # end of copy template - be sure to search for imtemplate to find everything!
 
-SHAVE_INIT
-
-# settings for the omprog output module
-AC_ARG_ENABLE(omprog,
-        [AS_HELP_STRING([--enable-omprog],[Compiles omprog template module @<:@default=no@:>@])],
-        [case "${enableval}" in
-         yes) enable_omprog="yes" ;;
-          no) enable_omprog="no" ;;
-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omprog) ;;
-         esac],
-        [enable_omprog=no]
-)
-AM_CONDITIONAL(ENABLE_OMPROG, test x$enable_omprog = xyes)
-# end of omprog
-
 
 # settings for the template output module; copy and modify this code
 # if you intend to add your own module. Be sure to replace omtemplate
@@ -735,17 +757,7 @@ AM_CONDITIONAL(ENABLE_OMTEMPLATE, test x$enable_omtemplate = xyes)
 # end of copy template - be sure to search for omtemplate to find everything!
 
 
-# settings for omstdout
-AC_ARG_ENABLE(omstdout,
-        [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=no@:>@])],
-        [case "${enableval}" in
-         yes) enable_omstdout="yes" ;;
-          no) enable_omstdout="no" ;;
-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omstdout) ;;
-         esac],
-        [enable_omstdout=no]
-)
-AM_CONDITIONAL(ENABLE_OMSTDOUT, test x$enable_omstdout = xyes)
+SHAVE_INIT
 
 
 AC_CONFIG_FILES([Makefile \