From 48cb2f1dc818b3433f2eb0d8b7b5a9f0ef511ced Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 9 Sep 2023 15:19:13 -0400 Subject: [PATCH] Suppress noise during configure --- citadel/configure | 18 +++++++--- libcitadel/configure.in | 74 +++++++++++++++++++---------------------- textclient/config.mk | 8 ++--- 3 files changed, 52 insertions(+), 48 deletions(-) mode change 100755 => 100644 libcitadel/configure.in diff --git a/citadel/configure b/citadel/configure index c2efb6427..ad136e3ac 100755 --- a/citadel/configure +++ b/citadel/configure @@ -73,11 +73,12 @@ int main(int argc, char **argv) { exit(0); } ! -$CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile $LDFLAGS -lssl -lcrypto && $tempfile && { +$CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile $LDFLAGS -lssl -lcrypto && $tempfile >/dev/null 2>&1 && { CFLAGS=${CFLAGS}' -DHAVE_OPENSSL' LDFLAGS=${LDFLAGS}' -lssl -lcrypto -lz' } || { echo Citadel Server requires OpenSSL which is not present. + rm -f $tempfile $tempcc 2>/dev/null exit 2 } @@ -99,7 +100,7 @@ int main(int argc, char **argv) { } ! -$CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile && { +$CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile >/dev/null 2>&1 && { ICONV='yes' echo iconv.h is present and requires no additional libraries } || { @@ -109,6 +110,7 @@ $CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile && { LDFLAGS=${LDFLAGS}' -liconv' } || { echo Citadel Server requires iconv character set conversion. + rm -f $tempfile $tempcc 2>/dev/null exit 1 } } @@ -130,12 +132,14 @@ int main(int argc, char **argv) { } ! -$CC $CFLAGS $CPPFLAGS $tempcc -lresolv -o $tempfile && { +$CC $CFLAGS $CPPFLAGS $tempcc -lresolv -o $tempfile >/dev/null 2>&1 && { LRESOLV='-lresolv' } || { LRESOLV='' } +rm -f $tempfile $tempcc 2>/dev/null + ######################################################################## # Test for -lintl @@ -153,12 +157,14 @@ int main(int argc, char **argv) { } ! -$CC $CFLAGS $CPPFLAGS $tempcc -lintl -o $tempfile && { +$CC $CFLAGS $CPPFLAGS $tempcc -lintl -o $tempfile >/dev/null 2>&1 && { LINTL='-lintl' } || { LINTL='' } +rm -f $tempfile $tempcc 2>/dev/null + ######################################################################## # Are we on Linux with -lcrypt and PAMmy stuff? @@ -176,12 +182,14 @@ int main(int argc, char **argv) { } ! -$CC $CFLAGS $CPPFLAGS $tempcc -lcrypt -o $tempfile && { +$CC $CFLAGS $CPPFLAGS $tempcc -lcrypt -o $tempfile >/dev/null 2>&1 && { CHKPW='chkpw chkpwd' } || { CHKPW='' } +rm -f $tempfile $tempcc 2>/dev/null + ######################################################################## # This is needed to link Berkeley DB. We will add more here later. diff --git a/libcitadel/configure.in b/libcitadel/configure.in old mode 100755 new mode 100644 index d68a28728..80450857d --- a/libcitadel/configure.in +++ b/libcitadel/configure.in @@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script. dnl dnl Ensure that libcitadel is configured with autoconf 2.52 or newer -AC_PREREQ(2.52) -AC_INIT([libcitadel], m4_esyscmd_s([grep LIBCITADEL_VERSION lib/libcitadel.h | sed 's/[^0-9]*//g' ]),[http://uncensored.citadel.org]) +AC_PREREQ([2.71]) +AC_INIT([libcitadel],[m4_esyscmd_s(grep LIBCITADEL_VERSION lib/libcitadel.h | sed 's/[^0-9]*//g' )],[http://uncensored.citadel.org]) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) @@ -42,14 +42,20 @@ if test "$GCC" = yes ; then OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes" CFLAGS="$OLDCFLAGS -fexceptions" AC_MSG_CHECKING(whether $CC accepts -fexceptions) - AC_TRY_LINK( , , - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS") + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS"]) CXXFLAGS=`echo "$CFLAGS" | sed 's/ -Wmissing-prototypes -Wstrict-prototypes//'` fi dnl Checks for header files. -AC_HEADER_STDC +m4_warn([obsolete], +[The preprocessor macro `STDC_HEADERS' is obsolete. + Except in unusual embedded environments, you can safely include all + ISO C90 headers unconditionally.])dnl +# Autoupdate added the next two lines to ensure that your configure +# script's behavior did not change. They are probably safe to remove. +AC_CHECK_INCLUDES_DEFAULT +AC_PROG_EGREP + AC_CHECK_HEADER(sys/mman.h, [CFLAGS="$CFLAGS -D HAVE_MMAP"]) AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present]) @@ -73,32 +79,29 @@ dnl TODO: we might need to check for the actual syntax.... AC_MSG_CHECKING([whether your system knows about splice()]) -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define _GNU_SOURCE #include #include -], -[ +]], [[ ssize_t sent, pipesize; int fd, SplicePipe[2]; pipesize = splice(fd, NULL, SplicePipe[1], NULL, 1, SPLICE_F_MORE | SPLICE_F_MOVE|SPLICE_F_NONBLOCK); -], - [ +]])],[ ok_splice=yes AC_DEFINE(LINUX_SPLICE, [], [whether we have the linux splice api]) AC_MSG_RESULT([yes]) - ], - [ + ],[ ok_splice=no AC_MSG_RESULT([no]) - ] -) + +]) AC_MSG_CHECKING([whether your system likes memcpy + HKEY]) -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define _GNU_SOURCE #include #include @@ -111,21 +114,18 @@ AC_TRY_COMPILE([ #include #include "lib/libcitadel.h" -], -[ +]], [[ char foo[22]; memcpy(foo, HKEY("foo")); -], - [ +]])],[ AC_MSG_RESULT([yes]) - ], - [ + ],[ AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy]) AC_MSG_RESULT([no]) - ] -) + +]) AC_CHECK_HEADERS(iconv.h) @@ -137,7 +137,7 @@ AC_ARG_ENABLE(iconv, ok_iconv=no, ok_iconv=yes) AC_MSG_CHECKING(Checking to see if your system supports iconv) -AC_TRY_RUN([ +AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include main() { iconv_t ic = (iconv_t)(-1) ; @@ -145,40 +145,36 @@ AC_TRY_RUN([ iconv_close(ic); exit(0); } - ], - [ + ]])],[ ok_iconv=yes AC_MSG_RESULT([yes]) - ], - [ + ],[ ok_iconv=no AC_MSG_RESULT([no]) - ] -) + +],[]) dnl Check for iconv in external libiconv if test "$ok_iconv" = no; then AC_MSG_CHECKING(Checking for an external libiconv) OLD_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -liconv" - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include main() { iconv_t ic = (iconv_t)(-1) ; ic = iconv_open("UTF-8", "us-ascii"); iconv_close(ic); } - ], - [ + ]])],[ ok_iconv=yes AC_MSG_RESULT([yes]) - ], - [ + ],[ ok_iconv=no LDFLAGS="$OLD_LDFLAGS" AC_MSG_RESULT([no]) - ] - ) + + ],[]) fi if test "$ok_iconv" != "no"; then AC_MSG_RESULT(libcitadel will be built with character set conversion.) @@ -222,7 +218,7 @@ AC_TYPE_SIZE_T AC_CHECK_FUNCS(memmove bcopy) AC_CONFIG_FILES(Makefile libcitadel.pc) -AC_CONFIG_HEADER(sysdep.h) +AC_CONFIG_HEADERS([sysdep.h]) AC_OUTPUT abs_srcdir="`cd $srcdir && pwd`" diff --git a/textclient/config.mk b/textclient/config.mk index da064d22e..2e87ed94a 100644 --- a/textclient/config.mk +++ b/textclient/config.mk @@ -1,5 +1,5 @@ -CFLAGS := -Wformat-truncation=0 -ggdb -DHAVE_OPENSSL -LDFLAGS := -lssl -lcrypto -lz -PREFIX := /usr/local -BINDIR := /usr/local/bin +CFLAGS := -g -I/usr/local/include -DHAVE_OPENSSL +LDFLAGS := -L/usr/local/lib -lssl -lcrypto -lz +PREFIX := /usr/local/citadel +BINDIR := /usr/local/citadel/bin CTDLDIR := /usr/local/citadel -- 2.30.2