X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_canonical.m4;h=49d4fc4955768cda61d0df2b4aa9518385c09a55;hb=7a116936798b1a3833e37075fb608b248a9b3e6b;hp=002f2fd339532abd614d915579ef66e0fc456099;hpb=0b7de3f4c6b1e1e6e4db9837a7fbc976eb560799;p=awesomized%2Flibmemcached diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 002f2fd3..49d4fc49 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Which version of the canonical setup we're using -AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.171]) +AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.175]) AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ AC_ARG_ENABLE([fat-binaries], @@ -69,14 +69,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ ]) ]) - AC_CONFIG_MACRO_DIR([m4]) - - m4_if(m4_substr(m4_esyscmd(test -d src && echo 0),0,1),0,[ - AC_CONFIG_HEADERS([src/config.h]) - ],[ - AC_CONFIG_HEADERS([config.h]) - ]) - PANDORA_BLOCK_BAD_OPTIONS # We need to prevent canonical target @@ -87,13 +79,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], [CXXFLAGS=""]) - AC_CANONICAL_TARGET - - m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[ - AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar) - ],[ - AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign tar-ustar) - ]) + AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -115,7 +101,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ vc_changelog=yes ]) m4_if(PCT_VERSION_FROM_VC,yes,[ - PANDORA_VC_VERSION + PANDORA_VC_INFO_HEADER ],[ PANDORA_TEST_VC_DIR @@ -143,8 +129,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ PANDORA_PLATFORM - PANDORA_LIBTOOL - dnl autoconf doesn't automatically provide a fail-if-no-C++ macro dnl so we check c++98 features and fail if we don't have them, mainly dnl for that reason @@ -230,10 +214,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ [Define if system doesn't define]) ]) - AC_CHECK_LIBM - dnl Bug on FreeBSD - LIBM check doesn't set the damn variable - AC_SUBST([LIBM]) - AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)]) AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)]) @@ -254,12 +234,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ PANDORA_HAVE_GCC_ATOMICS - m4_if(PCT_USE_VISIBILITY,[yes],[ - PANDORA_ENABLE_VISIBILITY - ],[ - PANDORA_CHECK_VISIBILITY - ]) - PANDORA_HEADER_ASSERT PANDORA_WARNINGS(PCT_ALL_ARGS) @@ -268,6 +242,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_LIB_PREFIX PANDORA_HAVE_BETTER_MALLOC + PANDORA_WITH_VALGRIND AC_CHECK_PROGS([DOXYGEN], [doxygen]) AC_CHECK_PROGS([PERL], [perl]) @@ -290,20 +265,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AM_CONDITIONAL(HAVE_SPHINX,[test "x${SPHINXBUILD}" != "x:"]) AM_CONDITIONAL(HAVE_RECENT_SPHINX,[test "x${ac_cv_recent_sphinx}" = "xyes"]) - m4_if(m4_substr(m4_esyscmd(test -d po && echo 0),0,1),0, [ - AM_PO_SUBDIRS - IT_PROG_INTLTOOL([0.35],[no-xml]) - - GETTEXT_PACKAGE=$PACKAGE - AC_CHECK_LIB(intl, libintl_gettext) - AC_SUBST([GETTEXT_PACKAGE]) - AS_IF([test "x${USE_NLS}" = "xyes" -a "x${pandora_have_intltool}" = "xyes"], - [AC_DEFINE([ENABLE_NLS],[1],[Turn on language support]) - AC_CONFIG_FILES([po/Makefile.in]) - ]) - ]) - AM_CONDITIONAL(BUILD_PO,[test "x${USE_NLS}" = "xyes" -a "x${pandora_have_intltool}" = "xyes"]) - AS_IF([test "x${gl_LIBOBJS}" != "x"],[ AS_IF([test "$GCC" = "yes"],[ AM_CPPFLAGS="-isystem \${top_srcdir}/gnulib -isystem \${top_builddir}/gnulib ${AM_CPPFLAGS}" @@ -319,93 +280,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ PANDORA_USE_PIPE - AH_TOP([ -#ifndef __CONFIG_H__ -#define __CONFIG_H__ - -/* _SYS_FEATURE_TESTS_H is Solaris, _FEATURES_H is GCC */ -#if defined( _SYS_FEATURE_TESTS_H) || defined(_FEATURES_H) -#error "You should include config.h as your first include file" -#endif - -]) - mkdir -p config - cat > config/top.h.stamp </dev/null 2>&1 || mv config/top.h.stamp config/top.h - rm -f config/top.h.stamp - - AH_BOTTOM([ -#if defined(__cplusplus) -# include CSTDINT_H -# include CINTTYPES_H -#else -# include -# include -#endif - -#if !defined(HAVE_ULONG) && !defined(__USE_MISC) -# define HAVE_ULONG 1 -typedef unsigned long int ulong; -#endif - -/* To hide the platform differences between MS Windows and Unix, I am - * going to use the Microsoft way and #define the Microsoft-specific - * functions to the unix way. Microsoft use a separate subsystem for sockets, - * but Unix normally just use a filedescriptor on the same functions. It is - * a lot easier to map back to the unix way with macros than going the other - * way without side effect ;-) - */ -#ifdef TARGET_OS_WINDOWS -#define random() rand() -#define srandom(a) srand(a) -#define get_socket_errno() WSAGetLastError() -#else -#define INVALID_SOCKET -1 -#define SOCKET_ERROR -1 -#define closesocket(a) close(a) -#define get_socket_errno() errno -#endif - -#if defined(__cplusplus) -# if defined(DEBUG) -# include -# include -# endif -template -inline To implicit_cast(From const &f) { - return f; -} -template // use like this: down_cast(foo); -inline To down_cast(From* f) { // so we only accept pointers - // Ensures that To is a sub-type of From *. This test is here only - // for compile-time type checking, and has no overhead in an - // optimized build at run-time, as it will be optimized away - // completely. - if (false) { - implicit_cast(0); - } - -#if defined(DEBUG) - assert(f == NULL || dynamic_cast(f) != NULL); // RTTI: debug mode only! -#endif - return static_cast(f); -} -#endif /* defined(__cplusplus) */ - -#endif /* __CONFIG_H__ */ - ]) - - AM_CFLAGS="${AM_CFLAGS} ${CC_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}" + AM_CFLAGS="-std=c99 ${AM_CFLAGS} ${CC_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}" AM_CXXFLAGS="${AM_CXXFLAGS} ${CXX_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}" AC_SUBST([AM_CFLAGS])