From: Art Cancro Date: Tue, 3 Oct 2023 17:50:06 +0000 (-0400) Subject: libcitadel/configure.in: renamed to configure.ac X-Git-Tag: v997~132 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=da0b32e9ffae47ae5355e0e3fa5d25396e462db5 libcitadel/configure.in: renamed to configure.ac --- diff --git a/libcitadel/configure.ac b/libcitadel/configure.ac new file mode 100644 index 000000000..336eec5dc --- /dev/null +++ b/libcitadel/configure.ac @@ -0,0 +1,230 @@ +dnl configuration script for libcitadel +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.69]) +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) + +dnl +dnl Set LIBREVISION to the ever-ascending libcitadel version number. +dnl +dnl If the API has changed, increment LIBCURRENT. +dnl +dnl Set LIBAGE to 0. +dnl + +LIBCURRENT=4 +LIBREVISION=m4_esyscmd_s([grep LIBCITADEL_VERSION lib/libcitadel.h | sed 's/[^0-9]*//g' ]) +LIBAGE=0 + +sinclude(conftools/libtool.m4) +sinclude(conftools/ac_c_bigendian_cross.m4) + +AC_PROG_LIBTOOL + +AC_SUBST(LIBCURRENT) +AC_SUBST(LIBREVISION) +AC_SUBST(LIBAGE) + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL + +if test "$GCC" = yes ; then + dnl + dnl Be careful about adding the -fexceptions option; some versions of + dnl GCC don't support it and it causes extra warnings that are only + dnl distracting; avoid. + dnl + OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes" + CFLAGS="$OLDCFLAGS -fexceptions" + AC_MSG_CHECKING(whether $CC accepts -fexceptions) + 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. +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]) +dnl Checks for the zlib compression library. +if test "x$with_zlib" != xno ; then + AC_CHECK_HEADERS(zlib.h, + [AC_CHECK_LIB(z, zlibVersion, + [ok_zlib=yes],, + )]) +fi + +if test "x$ok_zlib" = xyes ; then + LIBS="-lz $LIBS" + AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) +fi + +AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])]) + +AC_CHECK_HEADER(sys/sendfile.h, [AC_DEFINE(LINUX_SENDFILE, [], [whether we have the linux sendfile api])]) +dnl TODO: we might need to check for the actual syntax.... + + +AC_MSG_CHECKING([whether your system knows about splice()]) +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_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#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) + + +dnl Here is the check for a libc integrated iconv +AC_ARG_ENABLE(iconv, + [ --disable-iconv do not use iconv charset conversion], + ok_iconv=no, ok_iconv=yes) + +AC_MSG_CHECKING(Checking to see if your system supports iconv) +AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + main() { + iconv_t ic = (iconv_t)(-1) ; + ic = iconv_open("UTF-8", "us-ascii"); + 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_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.) + AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion]) +else + AC_MSG_RESULT(libcitadel will be built without character set conversion.) +fi + +dnl disable backtrace if we don't want it. +AC_ARG_WITH(backtrace, + [ --with-backtrace enable backtrace dumps in the syslog], + [ if test "x$withval" != "xno" ; then + CFLAGS="$CFLAGS -rdynamic " + LDFLAGS="$LDFLAGS -rdynamic " + AC_CHECK_FUNCS(backtrace) + fi + ] +) + + +AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present]) +dnl Checks for the zlib compression library. +if test "x$with_zlib" != xno ; then + AC_CHECK_HEADERS(zlib.h, + [AC_CHECK_LIB(z, zlibVersion, + [ok_zlib=yes],, + )]) +fi + +if test "x$ok_zlib" = xyes ; then + LIBS="-lz $LIBS" + AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) +fi + + +dnl Checks for typedefs, structures, and compiler characteristics. + +AC_SUBST(LIBS) +AC_C_CONST +AC_TYPE_SIZE_T +AC_CHECK_FUNCS(memmove bcopy) + +AC_CONFIG_FILES(Makefile libcitadel.pc) +AC_CONFIG_HEADERS([sysdep.h]) +AC_OUTPUT + +abs_srcdir="`cd $srcdir && pwd`" +abs_builddir="`pwd`" +if test "$abs_srcdir" != "$abs_builddir"; then + make mkdir-init +fi +echo 'zlib compression: ' $ok_zlib +echo 'Character set conversion support:' $ok_iconv diff --git a/libcitadel/configure.in b/libcitadel/configure.in deleted file mode 100644 index 336eec5dc..000000000 --- a/libcitadel/configure.in +++ /dev/null @@ -1,230 +0,0 @@ -dnl configuration script for libcitadel -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.69]) -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) - -dnl -dnl Set LIBREVISION to the ever-ascending libcitadel version number. -dnl -dnl If the API has changed, increment LIBCURRENT. -dnl -dnl Set LIBAGE to 0. -dnl - -LIBCURRENT=4 -LIBREVISION=m4_esyscmd_s([grep LIBCITADEL_VERSION lib/libcitadel.h | sed 's/[^0-9]*//g' ]) -LIBAGE=0 - -sinclude(conftools/libtool.m4) -sinclude(conftools/ac_c_bigendian_cross.m4) - -AC_PROG_LIBTOOL - -AC_SUBST(LIBCURRENT) -AC_SUBST(LIBREVISION) -AC_SUBST(LIBAGE) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL - -if test "$GCC" = yes ; then - dnl - dnl Be careful about adding the -fexceptions option; some versions of - dnl GCC don't support it and it causes extra warnings that are only - dnl distracting; avoid. - dnl - OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes" - CFLAGS="$OLDCFLAGS -fexceptions" - AC_MSG_CHECKING(whether $CC accepts -fexceptions) - 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. -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]) -dnl Checks for the zlib compression library. -if test "x$with_zlib" != xno ; then - AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, zlibVersion, - [ok_zlib=yes],, - )]) -fi - -if test "x$ok_zlib" = xyes ; then - LIBS="-lz $LIBS" - AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) -fi - -AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])]) - -AC_CHECK_HEADER(sys/sendfile.h, [AC_DEFINE(LINUX_SENDFILE, [], [whether we have the linux sendfile api])]) -dnl TODO: we might need to check for the actual syntax.... - - -AC_MSG_CHECKING([whether your system knows about splice()]) -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_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#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) - - -dnl Here is the check for a libc integrated iconv -AC_ARG_ENABLE(iconv, - [ --disable-iconv do not use iconv charset conversion], - ok_iconv=no, ok_iconv=yes) - -AC_MSG_CHECKING(Checking to see if your system supports iconv) -AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - main() { - iconv_t ic = (iconv_t)(-1) ; - ic = iconv_open("UTF-8", "us-ascii"); - 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_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.) - AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion]) -else - AC_MSG_RESULT(libcitadel will be built without character set conversion.) -fi - -dnl disable backtrace if we don't want it. -AC_ARG_WITH(backtrace, - [ --with-backtrace enable backtrace dumps in the syslog], - [ if test "x$withval" != "xno" ; then - CFLAGS="$CFLAGS -rdynamic " - LDFLAGS="$LDFLAGS -rdynamic " - AC_CHECK_FUNCS(backtrace) - fi - ] -) - - -AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present]) -dnl Checks for the zlib compression library. -if test "x$with_zlib" != xno ; then - AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, zlibVersion, - [ok_zlib=yes],, - )]) -fi - -if test "x$ok_zlib" = xyes ; then - LIBS="-lz $LIBS" - AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) -fi - - -dnl Checks for typedefs, structures, and compiler characteristics. - -AC_SUBST(LIBS) -AC_C_CONST -AC_TYPE_SIZE_T -AC_CHECK_FUNCS(memmove bcopy) - -AC_CONFIG_FILES(Makefile libcitadel.pc) -AC_CONFIG_HEADERS([sysdep.h]) -AC_OUTPUT - -abs_srcdir="`cd $srcdir && pwd`" -abs_builddir="`pwd`" -if test "$abs_srcdir" != "$abs_builddir"; then - make mkdir-init -fi -echo 'zlib compression: ' $ok_zlib -echo 'Character set conversion support:' $ok_iconv diff --git a/libcitadel/configure~ b/libcitadel/configure~ index 43ff3dc7a..557d72f69 100755 --- a/libcitadel/configure~ +++ b/libcitadel/configure~ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libcitadel #define LIBCITADEL_VERSION_NUMBER 994. +# Generated by GNU Autoconf 2.71 for libcitadel #define LIBCITADEL_VERSION_NUMBER 996. # # Report bugs to . # @@ -765,8 +765,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libcitadel' PACKAGE_TARNAME='libcitadel' -PACKAGE_VERSION='#define LIBCITADEL_VERSION_NUMBER 994' -PACKAGE_STRING='libcitadel #define LIBCITADEL_VERSION_NUMBER 994' +PACKAGE_VERSION='#define LIBCITADEL_VERSION_NUMBER 996' +PACKAGE_STRING='libcitadel #define LIBCITADEL_VERSION_NUMBER 996' PACKAGE_BUGREPORT='http://uncensored.citadel.org' PACKAGE_URL='' @@ -1456,7 +1456,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libcitadel #define LIBCITADEL_VERSION_NUMBER 994 to adapt to many kinds of systems. +\`configure' configures libcitadel #define LIBCITADEL_VERSION_NUMBER 996 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1522,7 +1522,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libcitadel #define LIBCITADEL_VERSION_NUMBER 994:";; + short | recursive ) echo "Configuration of libcitadel #define LIBCITADEL_VERSION_NUMBER 996:";; esac cat <<\_ACEOF @@ -1628,7 +1628,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libcitadel configure #define LIBCITADEL_VERSION_NUMBER 994 +libcitadel configure #define LIBCITADEL_VERSION_NUMBER 996 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2156,7 +2156,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libcitadel $as_me #define LIBCITADEL_VERSION_NUMBER 994, which was +It was created by libcitadel $as_me #define LIBCITADEL_VERSION_NUMBER 996, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3132,7 +3132,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu LIBCURRENT=4 -LIBREVISION=994 +LIBREVISION=996 LIBAGE=0 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -5848,11 +5848,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx11+y} +if test ${ac_cv_prog_cxx_11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx11=no + ac_cv_prog_cxx_11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5894,11 +5894,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx98+y} +if test ${ac_cv_prog_cxx_98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx98=no + ac_cv_prog_cxx_98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20905,7 +20905,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libcitadel $as_me #define LIBCITADEL_VERSION_NUMBER 994, which was +This file was extended by libcitadel $as_me #define LIBCITADEL_VERSION_NUMBER 996, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20969,7 +20969,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libcitadel config.status #define LIBCITADEL_VERSION_NUMBER 994 +libcitadel config.status #define LIBCITADEL_VERSION_NUMBER 996 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\"