X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_canonical.m4;h=7c5f6b9c095cf1aa413b4be735331caf9379ebae;hb=66dcfb211cc2ca7dc6630754a6fd68343569e29a;hp=b9b3e455e6b889db2e4d21e720c11eda46d739c2;hpb=ab2154ec9b3c87fbd414176aeed0ccfebbb8bf2b;p=awesomized%2Flibmemcached diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index b9b3e455..7c5f6b9c 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -1,55 +1,34 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. 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.94]) - -AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ - AC_ARG_ENABLE([fat-binaries], - [AS_HELP_STRING([--enable-fat-binaries], - [Enable fat binary support on OSX @<:@default=off@:>@])], - [ac_enable_fat_binaries="$enableval"], - [ac_enable_fat_binaries="no"]) - - dnl Force dependency tracking on for Sun Studio builds - AS_IF([test "x${enable_dependency_tracking}" = "x"],[ - enable_dependency_tracking=yes - ]) - dnl If we're building OSX Fat Binaries, we have to turn off -M options - AS_IF([test "x${ac_enable_fat_binaries}" = "xyes"],[ - enable_dependency_tracking=no +AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.175]) + +AC_DEFUN([PANDORA_BLOCK_BAD_OPTIONS],[ + AS_IF([test "x${prefix}" = "x"],[ + AC_MSG_ERROR([--prefix requires an argument]) ]) ]) dnl The standard setup for how we build Pandora projects AC_DEFUN([PANDORA_CANONICAL_TARGET],[ - AC_REQUIRE([PANDORA_FORCE_DEPEND_TRACKING]) ifdef([m4_define],,[define([m4_define], defn([define]))]) ifdef([m4_undefine],,[define([m4_undefine], defn([undefine]))]) m4_define([PCT_ALL_ARGS],[$*]) - m4_define([PCT_USE_GNULIB],[no]) m4_define([PCT_REQUIRE_CXX],[no]) - m4_define([PCT_IGNORE_SHARED_PTR],[no]) m4_define([PCT_FORCE_GCC42],[no]) - m4_define([PCT_SRC_IN_SRC],[no]) + m4_define([PCT_DONT_SUPPRESS_INCLUDE],[no]) + m4_define([PCT_NO_VC_CHANGELOG],[no]) m4_define([PCT_VERSION_FROM_VC],[no]) m4_define([PCT_USE_VISIBILITY],[yes]) m4_foreach([pct_arg],[$*],[ m4_case(pct_arg, - [use-gnulib], [ - m4_undefine([PCT_USE_GNULIB]) - m4_define([PCT_USE_GNULIB],[yes]) - ], [require-cxx], [ m4_undefine([PCT_REQUIRE_CXX]) m4_define([PCT_REQUIRE_CXX],[yes]) ], - [ignore-shared-ptr], [ - m4_undefine([PCT_IGNORE_SHARED_PTR]) - m4_define([PCT_IGNORE_SHARED_PTR],[yes]) - ], [force-gcc42], [ m4_undefine([PCT_FORCE_GCC42]) m4_define([PCT_FORCE_GCC42],[yes]) @@ -58,9 +37,9 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ m4_undefine([PCT_USE_VISIBILITY]) m4_define([PCT_USE_VISIBILITY],[no]) ], - [src-in-src], [ - m4_undefine([PCT_SRC_IN_SRC]) - m4_define([PCT_SRC_IN_SRC],[yes]) + [dont-suppress-include], [ + m4_undefine([PCT_DONT_SUPPRESS_INCLUDE]) + m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes]) ], [version-from-vc], [ m4_undefine([PCT_VERSION_FROM_VC]) @@ -68,6 +47,8 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ ]) ]) + PANDORA_BLOCK_BAD_OPTIONS + # We need to prevent canonical target # from injecting -O2 into CFLAGS - but we won't modify anything if we have # set CFLAGS on the command line, since that should take ultimate precedence @@ -76,19 +57,43 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], [CXXFLAGS=""]) - AC_CANONICAL_TARGET - - AM_INIT_AUTOMAKE(-Wall -Werror nostdinc subdir-objects foreign) + AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar]) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - m4_if(PCT_USE_GNULIB,yes,[ gl_EARLY ]) + m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[ + gl_EARLY + ],[ + PANDORA_EXTENSIONS + ]) AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([PANDORA_MAC_GCC42]) + m4_if(PCT_FORCE_GCC42, [yes], [ + AC_REQUIRE([PANDORA_ENSURE_GCC_VERSION]) + ]) AC_REQUIRE([PANDORA_64BIT]) + m4_if(PCT_NO_VC_CHANGELOG,yes,[ + vc_changelog=no + ],[ + vc_changelog=yes + ]) m4_if(PCT_VERSION_FROM_VC,yes,[ - PANDORA_VC_VERSION + PANDORA_VC_INFO_HEADER + ],[ + PANDORA_TEST_VC_DIR + + changequote(<<, >>)dnl + PANDORA_RELEASE_ID=`echo $VERSION | sed 's/[^0-9]//g'` + changequote([, ])dnl + + PANDORA_RELEASE_COMMENT="" + AC_DEFINE_UNQUOTED([PANDORA_RELEASE_VERSION],["$VERSION"], + [Version of the software]) + + AC_SUBST(PANDORA_RELEASE_COMMENT) + AC_SUBST(PANDORA_RELEASE_VERSION) + AC_SUBST(PANDORA_RELEASE_ID) ]) PANDORA_VERSION @@ -99,49 +104,32 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AM_PROG_CC_C_O - m4_if(PCT_FORCE_GCC42, [yes], [ - AS_IF([test "$GCC" = "yes"], PANDORA_ENSURE_GCC_VERSION) - ]) 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 - PANDORA_CHECK_CXX_STANDARD m4_if(PCT_REQUIRE_CXX, [yes], [ AS_IF([test "$ac_cv_cxx_stdcxx_98" = "no"],[ AC_MSG_ERROR([No working C++ Compiler has been found. ${PACKAGE} requires a C++ compiler that can handle C++98]) ]) - ]) - PANDORA_SHARED_PTR - m4_if(PCT_IGNORE_SHARED_PTR, [no], [ - AS_IF([test "$ac_cv_shared_ptr_namespace" = "missing"],[ - AC_MSG_WARN([a usable shared_ptr implementation was not found. Let someone know what your platform is.]) - ]) - ]) - - m4_if(PCT_USE_GNULIB, [yes], [ + m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[ gl_INIT AC_CONFIG_LIBOBJ_DIR([gnulib]) ]) - PANDORA_CHECK_C_VERSION PANDORA_CHECK_CXX_VERSION - AC_C_BIGENDIAN - AC_C_CONST - AC_C_INLINE - AC_C_VOLATILE - AC_C_RESTRICT - AC_HEADER_TIME + AC_STRUCT_TM AC_TYPE_SIZE_T AC_SYS_LARGEFILE + PANDORA_CLOCK_GETTIME + + AC_CHECK_HEADERS(sys/socket.h) # off_t is not a builtin type AC_CHECK_SIZEOF(off_t, 4) @@ -175,12 +163,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned]) ]) - dnl AC_FUNC_ALLOCA would test for stack direction if we didn't have a working - dnl alloca - but we need to know it anyway for check_stack_overrun. - PANDORA_STACK_DIRECTION - - AC_CHECK_LIBM - AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)]) AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)]) @@ -188,29 +170,8 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ PANDORA_OPTIMIZE - AC_LANG_PUSH(C++) - # Test whether madvise() is declared in C++ code -- it is not on some - # systems, such as Solaris - AC_CHECK_DECLS([madvise], [], [], [AC_INCLUDES_DEFAULT[ - #if HAVE_SYS_MMAN_H - #include - #include - #endif - ]]) - AC_LANG_POP() - PANDORA_HAVE_GCC_ATOMICS - m4_if(PCT_USE_VISIBILITY,[yes],[ - dnl We need to inject error into the cflags to test if visibility works or not - save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} -Werror" - PANDORA_VISIBILITY - CFLAGS="${save_CFLAGS}" - ]) - - PANDORA_HEADER_ASSERT - PANDORA_WARNINGS(PCT_ALL_ARGS) PANDORA_ENABLE_DTRACE @@ -218,25 +179,15 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_LIB_PREFIX PANDORA_HAVE_BETTER_MALLOC - AC_CHECK_PROGS([DOXYGEN], [doxygen]) - AC_CHECK_PROGS([PERL], [perl]) - - AS_IF([test "x${gl_LIBOBJS}" != "x"],[ - AS_IF([test "$GCC" = "yes"],[ - AM_CPPFLAGS="-isystem \$(top_srcdir)/gnulib -isystem \$(top_builddir)/gnulib ${AM_CPPFLAGS}" - ],[ - AM_CPPFLAGS="-I\$(top_srcdir)/gnulib -I\$(top_builddir)/gnulib ${AM_CPPFLAGS}" - ]) - ]) - AS_IF([test "PCT_SRC_IN_SRC" = "yes"],[ + m4_if(m4_substr(m4_esyscmd(test -d src && echo 0),0,1),0,[ AM_CPPFLAGS="-I\$(top_srcdir)/src -I\$(top_builddir)/src ${AM_CPPFLAGS}" + ],[ + AM_CPPFLAGS="-I\$(top_srcdir) -I\$(top_builddir) ${AM_CPPFLAGS}" ]) PANDORA_USE_PIPE - - AM_CPPFLAGS="-I\${top_srcdir} -I\${top_builddir} ${AM_CPPFLAGS}" - 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])