0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-18 18:08:21 +02:00

configure: Toward consistent formatting.

This commit is contained in:
Jason Volk 2018-08-12 09:54:44 -07:00
parent a8a2015ec9
commit 406f79ef7d

View file

@ -35,7 +35,9 @@ AX_CXX_COMPILE_STDCXX([17], [gnu], [mandatory], 201500)
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Makefile tree dnl Makefile tree
dnl
dnl These (and Makefile.in) are generated from a Makefile.am in the same dir. dnl These (and Makefile.in) are generated from a Makefile.am in the same dir.
dnl dnl
@ -51,7 +53,6 @@ AC_CONFIG_FILES(\
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])
dnl dnl
dnl Initialization of variables exported to Makefile.am. dnl Initialization of variables exported to Makefile.am.
dnl These will be further composed throughout this file... dnl These will be further composed throughout this file...
@ -64,8 +65,7 @@ AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)
dnl
dnl ***************************************************************************
dnl Preprocessor define macros dnl Preprocessor define macros
dnl dnl
dnl Use RB_DEFINE() et al to generate defines in config.h dnl Use RB_DEFINE() et al to generate defines in config.h
@ -101,13 +101,11 @@ AC_DEFUN([CPPDEFINE],
fi fi
]) ])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Platform dnl Platform
dnl dnl
dnl dnl
dnl Recursive local targets (clean-local is implied) dnl Recursive local targets (clean-local is implied)
dnl dnl
@ -116,7 +114,6 @@ dnl
# mrproper # mrproper
#]) #])
dnl dnl
dnl Coarse compiler test macros dnl Coarse compiler test macros
dnl dnl
@ -126,7 +123,6 @@ AM_CONDITIONAL([CLANG], [[[[ $CXX = clang* ]]]])
RB_DEFINE_UNQUOTED([CXX], ["$CXX"], [CXX Compiler]) RB_DEFINE_UNQUOTED([CXX], ["$CXX"], [CXX Compiler])
dnl dnl
dnl Coarse operating system test macros dnl Coarse operating system test macros
dnl dnl
@ -141,7 +137,6 @@ AM_CONDITIONAL([SOLARIS], [[[[ $host_os = *solaris* ]]]])
RB_DEFINE_UNQUOTED([OS], ["$host_os"], [Host operating system]) RB_DEFINE_UNQUOTED([OS], ["$host_os"], [Host operating system])
dnl dnl
dnl The CXX standard check even with the sd6 check wasn't enough for GCC. This dnl The CXX standard check even with the sd6 check wasn't enough for GCC. This
dnl is because we're developing with C++15'ish, which is in some grey area dnl is because we're developing with C++15'ish, which is in some grey area
@ -166,12 +161,11 @@ AM_COND_IF([GCC],
]) ])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Developer options dnl Developer options
dnl dnl
dnl dnl
dnl Debugging mode dnl Debugging mode
dnl dnl
@ -190,7 +184,6 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging suite fo
AM_CONDITIONAL([DEBUG], [[[[ "$DEBUG" = "1" ]]]]) AM_CONDITIONAL([DEBUG], [[[[ "$DEBUG" = "1" ]]]])
dnl dnl
dnl Explicit assert switch for still using assert() without --enable-debug dnl Explicit assert switch for still using assert() without --enable-debug
dnl dnl
@ -218,7 +211,6 @@ AM_COND_IF(ASSERT,
CPPDEFINE([NDEBUG]) CPPDEFINE([NDEBUG])
]) ])
dnl dnl
dnl Explicit optimize switch for enabling optimization when using --enable-debug dnl Explicit optimize switch for enabling optimization when using --enable-debug
dnl dnl
@ -240,7 +232,6 @@ AC_ARG_ENABLE(optimize, AC_HELP_STRING([--enable-optimize], [Enable optimization
AM_CONDITIONAL([OPTIMIZE], [[[[ "$OPTIMIZE" = "1" ]]]]) AM_CONDITIONAL([OPTIMIZE], [[[[ "$OPTIMIZE" = "1" ]]]])
dnl dnl
dnl Explicit optimization level switch dnl Explicit optimization level switch
dnl dnl
@ -275,10 +266,11 @@ AC_ARG_WITH(optimize-level, AC_HELP_STRING([--with-optimize-level[[[=3]]]], [Exp
]) ])
]) ])
dnl dnl
dnl Explicit log level dnl Explicit log level
dnl dnl
dnl NOTE: Log levels here must be manually sync'ed with ircd/logger.h
dnl
AC_MSG_CHECKING(whether to explicitly set the logging level ceiling) AC_MSG_CHECKING(whether to explicitly set the logging level ceiling)
AC_ARG_WITH(log-level, AC_HELP_STRING([--with-log-level[[[=INFO]]]], [Explicitly set the log level ceiling]), AC_ARG_WITH(log-level, AC_HELP_STRING([--with-log-level[[[=INFO]]]], [Explicitly set the log level ceiling]),
@ -321,7 +313,6 @@ AC_ARG_WITH(log-level, AC_HELP_STRING([--with-log-level[[[=INFO]]]], [Explicitly
]) ])
]) ])
dnl dnl
dnl Profiling mode dnl Profiling mode
dnl dnl
@ -339,7 +330,6 @@ AC_ARG_ENABLE(profile, AC_HELP_STRING([--enable-profile], [Enable profiling]),
], [ ], [
]) ])
dnl dnl
dnl Precompiled headers dnl Precompiled headers
dnl dnl
@ -357,7 +347,6 @@ AC_ARG_ENABLE(pch, AC_HELP_STRING([--disable-pch], [Disable precompiled header g
AM_CONDITIONAL([BUILD_PCH], [[[[ "$build_pch" = "yes" ]]]]) AM_CONDITIONAL([BUILD_PCH], [[[[ "$build_pch" = "yes" ]]]])
dnl dnl
dnl Generic Mode compilation dnl Generic Mode compilation
dnl dnl
@ -382,7 +371,6 @@ AM_COND_IF([GENERIC],
CXXFLAGS+=" -march=native" CXXFLAGS+=" -march=native"
]) ])
dnl dnl
dnl Optimization dnl Optimization
dnl dnl
@ -417,7 +405,6 @@ AM_COND_IF([OPTIMIZE],
CXXFLAGS+=" -ggdb" CXXFLAGS+=" -ggdb"
]) ])
dnl dnl
dnl Compiler intrumentation dnl Compiler intrumentation
dnl dnl
@ -436,7 +423,6 @@ dnl -fvisibility-inlines-hidden - for optimization; note the address of inline
dnl functions won't be the same between translation units dnl functions won't be the same between translation units
CXXFLAGS+=" -fvisibility-inlines-hidden" CXXFLAGS+=" -fvisibility-inlines-hidden"
dnl dnl
dnl Compiler warnings dnl Compiler warnings
dnl dnl
@ -534,8 +520,8 @@ AM_COND_IF([CLANG],
CPPFLAGS+="$CWARNS" CPPFLAGS+="$CWARNS"
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Philology checks dnl Philology checks
dnl dnl
@ -563,11 +549,9 @@ AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(long long)
AC_CHECK_SIZEOF(__int128) AC_CHECK_SIZEOF(__int128)
dnl -fsigned-char ensures 'char' is signed on all platforms dnl -fsigned-char ensures 'char' is signed on all platforms
CXXFLAGS+=" -fsigned-char" CXXFLAGS+=" -fsigned-char"
dnl dnl
dnl Header files dnl Header files
dnl dnl
@ -665,7 +649,6 @@ dnl experimental
RB_CHK_SYSHEADER(experimental/string_view, [EXPERIMENTAL_STRING_VIEW]) RB_CHK_SYSHEADER(experimental/string_view, [EXPERIMENTAL_STRING_VIEW])
RB_CHK_SYSHEADER(experimental/optional, [EXPERIMENTAL_OPTIONAL]) RB_CHK_SYSHEADER(experimental/optional, [EXPERIMENTAL_OPTIONAL])
dnl dnl
dnl Specific function checks dnl Specific function checks
dnl dnl
@ -681,7 +664,6 @@ AC_CHECK_FUNCS([ \
AC_SEARCH_LIBS(dlinfo, dl, AC_DEFINE(HAVE_DLINFO, 1, [Define if you have dlinfo])) AC_SEARCH_LIBS(dlinfo, dl, AC_DEFINE(HAVE_DLINFO, 1, [Define if you have dlinfo]))
AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if you have nanosleep])) AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if you have nanosleep]))
dnl dnl
dnl Networking Functions dnl Networking Functions
dnl dnl
@ -703,7 +685,8 @@ fi
dnl *************************************************************************** dnl ***************************************************************************
dnl TODO: sort this OS-specific section dnl
dnl Miscellaneous operating system specific
dnl dnl
AM_COND_IF(MINGW, AM_COND_IF(MINGW,
@ -721,7 +704,6 @@ AM_COND_IF(INTERIX,
CPPDEFINE([_XPG4_2]) CPPDEFINE([_XPG4_2])
],[]) ],[])
dnl dnl
dnl Linux AIO support dnl Linux AIO support
dnl dnl
@ -747,6 +729,7 @@ AM_CONDITIONAL([AIO], [[[[ $aio = yes ]]]])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Installation Layout dnl Installation Layout
dnl dnl
@ -927,15 +910,16 @@ AC_SUBST([PROGRAM_PREFIX])
AC_DEFINE_UNQUOTED([PROGRAM_PREFIX], ["$with_program_prefix"], [String with which all programs intended to be in PATH are prefixed.]) AC_DEFINE_UNQUOTED([PROGRAM_PREFIX], ["$with_program_prefix"], [String with which all programs intended to be in PATH are prefixed.])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Third party dnl Third party
dnl dnl
dnl
dnl dnl
dnl libsodium (NaCl) crypto support dnl libsodium (NaCl) crypto support
dnl dnl
dnl
dnl PKG_CHECK_MODULES(SODIUM, [sodium], [have_sodium="yes"], [have_sodium="no"]) dnl PKG_CHECK_MODULES(SODIUM, [sodium], [have_sodium="yes"], [have_sodium="no"])
RB_CHK_SYSHEADER(sodium.h, [SODIUM_H]) RB_CHK_SYSHEADER(sodium.h, [SODIUM_H])
@ -951,10 +935,11 @@ AC_SUBST(SODIUM_CPPFLAGS, [])
AC_SUBST(SODIUM_LDFLAGS, []) AC_SUBST(SODIUM_LDFLAGS, [])
AC_SUBST(SODIUM_LIBS, ["-lsodium"]) AC_SUBST(SODIUM_LIBS, ["-lsodium"])
dnl
dnl dnl
dnl libgmp support dnl libgmp support
dnl dnl
dnl
PKG_CHECK_MODULES(GMP, [gmp], [have_gmp="yes"], [have_gmp="no"]) PKG_CHECK_MODULES(GMP, [gmp], [have_gmp="yes"], [have_gmp="no"])
AM_CONDITIONAL([GMP], [test "x$have_gmp" = "xyes"]) AM_CONDITIONAL([GMP], [test "x$have_gmp" = "xyes"])
@ -963,10 +948,11 @@ AC_SUBST(GMP_CPPFLAGS, [])
AC_SUBST(GMP_LDFLAGS, []) AC_SUBST(GMP_LDFLAGS, [])
AC_SUBST(GMP_LIBS, ["-lgmp"]) AC_SUBST(GMP_LIBS, ["-lgmp"])
dnl
dnl dnl
dnl libmagic support dnl libmagic support
dnl dnl
dnl
RB_CHK_SYSHEADER(magic.h, [MAGIC_H]) RB_CHK_SYSHEADER(magic.h, [MAGIC_H])
AC_CHECK_LIB(magic, magic_version, AC_CHECK_LIB(magic, magic_version,
@ -983,10 +969,11 @@ AC_CHECK_LIB(magic, magic_version,
AM_CONDITIONAL([MAGIC], [test "x$have_magic" = "xyes"]) AM_CONDITIONAL([MAGIC], [test "x$have_magic" = "xyes"])
dnl
dnl dnl
dnl zlib support dnl zlib support
dnl dnl
dnl
AC_SUBST(Z_CPPFLAGS) AC_SUBST(Z_CPPFLAGS)
AC_SUBST(Z_LDFLAGS) AC_SUBST(Z_LDFLAGS)
@ -1014,10 +1001,11 @@ AC_CHECK_HEADER(zlib.h,
zlib=no zlib=no
]) ])
dnl
dnl dnl
dnl lz4 support dnl lz4 support
dnl dnl
dnl
AC_SUBST(LZ4_CPPFLAGS) AC_SUBST(LZ4_CPPFLAGS)
AC_SUBST(LZ4_LDFLAGS) AC_SUBST(LZ4_LDFLAGS)
@ -1045,10 +1033,11 @@ AC_CHECK_HEADER(lz4.h,
lz4=no lz4=no
]) ])
dnl
dnl dnl
dnl snappy support dnl snappy support
dnl dnl
dnl
AC_SUBST(SNAPPY_CPPFLAGS) AC_SUBST(SNAPPY_CPPFLAGS)
AC_SUBST(SNAPPY_LDFLAGS) AC_SUBST(SNAPPY_LDFLAGS)
@ -1076,10 +1065,11 @@ AC_CHECK_HEADER(snappy.h,
snappy=no snappy=no
]) ])
dnl
dnl dnl
dnl boost support dnl boost support
dnl dnl
dnl
BOOST_VERSION_MIN="1.66" BOOST_VERSION_MIN="1.66"
BOOST_VERSION_MIN_PATCH="0" BOOST_VERSION_MIN_PATCH="0"
@ -1165,10 +1155,11 @@ fi
BOOST_CPPFLAGS+=" -DBOOST_COROUTINES_NO_DEPRECATION_WARNING=1" BOOST_CPPFLAGS+=" -DBOOST_COROUTINES_NO_DEPRECATION_WARNING=1"
dnl
dnl dnl
dnl RocksDB support dnl RocksDB support
dnl dnl
dnl
AC_MSG_CHECKING([whether you asked to use the RocksDB included here]) AC_MSG_CHECKING([whether you asked to use the RocksDB included here])
AC_ARG_WITH(included-rocksdb, AC_ARG_WITH(included-rocksdb,
@ -1213,10 +1204,11 @@ AC_HELP_STRING([--with-included-rocksdb[[[=shared]]]], [Use the RocksDB sources
AC_SUBST(ROCKSDB_LIBS, ["-lrocksdb"]) AC_SUBST(ROCKSDB_LIBS, ["-lrocksdb"])
]) ])
dnl
dnl dnl
dnl SpiderMonkey support dnl SpiderMonkey support
dnl dnl
dnl
AC_MSG_CHECKING([whether you asked to use the JS engine included here]) AC_MSG_CHECKING([whether you asked to use the JS engine included here])
AC_ARG_WITH(included-js, AC_ARG_WITH(included-js,
@ -1293,10 +1285,11 @@ AC_HELP_STRING([--with-included-js[[[=shared]]]], [Use the JS engine (SpiderMonk
dnl TODO use an $enable_js var dnl TODO use an $enable_js var
AM_CONDITIONAL([JS], [[[[ $with_included_js = yes ]]]]) AM_CONDITIONAL([JS], [[[[ $with_included_js = yes ]]]])
dnl
dnl dnl
dnl OpenSSL support dnl OpenSSL support
dnl dnl
dnl
AC_MSG_CHECKING([for OpenSSL]) AC_MSG_CHECKING([for OpenSSL])
AC_ARG_ENABLE(openssl, AC_ARG_ENABLE(openssl,
@ -1399,10 +1392,11 @@ AC_SUBST(SSL_INCLUDES)
AC_SUBST(SSL_CFLAGS) AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_LIBS) AC_SUBST(SSL_LIBS)
dnl
dnl dnl
dnl mbedTLS support dnl mbedTLS support
dnl dnl
dnl
AC_ARG_ENABLE(mbedtls, AC_ARG_ENABLE(mbedtls,
[AC_HELP_STRING([--enable-mbedtls], [Enable mbedTLS support.]) [AC_HELP_STRING([--enable-mbedtls], [Enable mbedTLS support.])
@ -1421,10 +1415,11 @@ fi
AC_SUBST(MBEDTLS_CFLAGS) AC_SUBST(MBEDTLS_CFLAGS)
AC_SUBST(MBEDTLS_LIBS) AC_SUBST(MBEDTLS_LIBS)
dnl
dnl dnl
dnl GnuTLS support dnl GnuTLS support
dnl dnl
dnl
AC_MSG_CHECKING(for GnuTLS) AC_MSG_CHECKING(for GnuTLS)
AC_ARG_ENABLE(gnutls, AC_ARG_ENABLE(gnutls,
@ -1474,10 +1469,11 @@ elif test x"$cf_enable_gnutls" != xno; then
SSL_TYPE="gnutls" SSL_TYPE="gnutls"
fi fi
dnl
dnl dnl
dnl Additional linkages dnl Additional linkages
dnl dnl
dnl
AM_COND_IF([MINGW], AM_COND_IF([MINGW],
[ [
@ -1487,9 +1483,8 @@ AM_COND_IF([MINGW],
LIBS+="-lpthread -latomic" LIBS+="-lpthread -latomic"
]) ])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Application settings dnl Application settings
dnl dnl
@ -1547,7 +1542,6 @@ AC_HELP_STRING([--with-nicklen=LENGTH],[Set the upper-bound nick length to LENGT
AC_DEFINE_UNQUOTED(NICKLEN, (${NICKLEN}+1), [Nickname length]) AC_DEFINE_UNQUOTED(NICKLEN, (${NICKLEN}+1), [Nickname length])
dnl dnl
dnl --with-topiclen dnl --with-topiclen
dnl dnl
@ -1566,8 +1560,8 @@ AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (def
AC_DEFINE_UNQUOTED(TOPICLEN, ${TOPICLEN}, [Maximum topic length (<=390)]) AC_DEFINE_UNQUOTED(TOPICLEN, ${TOPICLEN}, [Maximum topic length (<=390)])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Branding defined in the compilation dnl Branding defined in the compilation
dnl dnl
@ -1603,7 +1597,6 @@ RB_DEFINE_UNQUOTED([TIME_CONFIGURED], [$RB_DATECODE], [UNIX epoch time at config
RB_DEFINE_UNQUOTED([DATE_CONFIGURED], ["$RB_DATESTR"], [Convenience string of RB_TIME_CONFIGURED]) RB_DEFINE_UNQUOTED([DATE_CONFIGURED], ["$RB_DATESTR"], [Convenience string of RB_TIME_CONFIGURED])
CPPDEFINE([RB_TIME_COMPILED], [$(date +%s)]) CPPDEFINE([RB_TIME_COMPILED], [$(date +%s)])
dnl dnl
dnl --with-custom-branding dnl --with-custom-branding
dnl dnl
@ -1619,7 +1612,6 @@ AC_ARG_WITH(custom-branding, AC_HELP_STRING([--with-custom-branding=NAME], [Cust
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
dnl dnl
dnl --with-custom-version dnl --with-custom-version
dnl dnl
@ -1634,9 +1626,8 @@ AC_ARG_WITH(custom-version, AC_HELP_STRING([--with-custom-version=NAME], [Custom
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Misc dnl Misc
dnl dnl
@ -1652,13 +1643,12 @@ AC_CONFIG_COMMANDS([tools/genssl_chmod], [chmod 755 tools/genssl])
dnl *************************************************************************** dnl ***************************************************************************
dnl
dnl Output dnl Output
dnl dnl
AC_OUTPUT AC_OUTPUT
if [[ $DEBUG ]]; then if [[ $DEBUG ]]; then
debug="yes" debug="yes"
else else