X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_canonical.m4;h=a9e4fa78cdc9df46650d095477c259a2a0d5a2df;hb=7bca10ca93172c1417f10c630a13c7aa88617ded;hp=5917d28f9cadc6925c5062b83e829fcbe05b80a2;hpb=61b5e9c68b7e931ed4e79a39ab9e5b1031d0030d;p=awesomized%2Flibmemcached diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 5917d28f..a9e4fa78 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -1,53 +1,49 @@ -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.74]) +AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.175]) -AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ - dnl Force dependency tracking on for Sun Studio builds - AS_IF([test "x${enable_dependency_tracking}" = "x"],[ - enable_dependency_tracking=yes +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_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]) ], - [src-in-src], [ - m4_undefine([PCT_SRC_IN_SRC]) - m4_define([PCT_SRC_IN_SRC],[yes]) + [skip-visibility], [ + m4_undefine([PCT_USE_VISIBILITY]) + m4_define([PCT_USE_VISIBILITY],[no]) + ], + [dont-suppress-include], [ + m4_undefine([PCT_DONT_SUPPRESS_INCLUDE]) + m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes]) ]) ]) + 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 @@ -56,17 +52,28 @@ 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 + ]) + dnl Once we can use a modern autoconf, we can use this dnl AC_PROG_CC_C99 AC_REQUIRE([AC_PROG_CXX]) @@ -74,49 +81,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) @@ -150,32 +140,14 @@ 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 - - PANDORA_OPTIMIZE + AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)]) + AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)]) - 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 - dnl We need to inject error into the cflags to test if visibility works or not - dnl save_CFLAGS="${CFLAGS}" - dnl CFLAGS="${CFLAGS} -Werror" - dnl gl_VISIBILITY - dnl CFLAGS="${save_CFLAGS}" + PANDORA_OPTIMIZE - PANDORA_HEADER_ASSERT + PANDORA_HAVE_GCC_ATOMICS PANDORA_WARNINGS(PCT_ALL_ARGS) @@ -184,29 +156,20 @@ 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]) AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_CPPFLAGS]) + AC_SUBST([AM_LDFLAGS]) ])