X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_canonical.m4;h=81d46149ec69595708f364a723f941906f8f1649;hb=09835f1c7f9e00ed3561968d496aa1dd6061f7ac;hp=8443bf80c3ba4ef9a2ace114541f4d94879a3fa0;hpb=c1a8ae2ab7557b9c167e022182b810d3e2cd43ce;p=m6w6%2Flibmemcached diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 8443bf80..81d46149 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -1,37 +1,26 @@ -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.134]) - -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_REQUIRE_CXX],[no]) m4_define([PCT_FORCE_GCC42],[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],[$*],[ @@ -52,19 +41,17 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ m4_undefine([PCT_DONT_SUPPRESS_INCLUDE]) m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes]) ], + [no-vc-changelog], [ + m4_undefine([PCT_NO_VC_CHANGELOG]) + m4_define([PCT_NO_VC_CHANGELOG],[yes]) + ], [version-from-vc], [ m4_undefine([PCT_VERSION_FROM_VC]) m4_define([PCT_VERSION_FROM_VC],[yes]) ]) ]) - 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 # from injecting -O2 into CFLAGS - but we won't modify anything if we have @@ -74,18 +61,14 @@ 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) - ],[ - AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability 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(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[ gl_EARLY + ],[ + PANDORA_EXTENSIONS ]) AC_REQUIRE([AC_PROG_CC]) @@ -94,10 +77,27 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ ]) 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 @@ -111,17 +111,13 @@ 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 - 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]) ]) - ]) m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[ @@ -132,18 +128,14 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ 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) AS_IF([test "$ac_cv_sizeof_off_t" -eq 0],[ @@ -176,10 +168,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned]) ]) - 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)]) @@ -187,27 +175,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) @@ -217,21 +186,26 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_LIB_PREFIX PANDORA_HAVE_BETTER_MALLOC - AC_CHECK_PROGS([DOXYGEN], [doxygen]) AC_CHECK_PROGS([PERL], [perl]) AC_CHECK_PROGS([DPKG_GENSYMBOLS], [dpkg-gensymbols], [:]) + AC_CHECK_PROGS([LCOV], [lcov], [echo lcov not found]) + AC_CHECK_PROGS([LCOV_GENHTML], [genhtml], [echo genhtml not found]) + + AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build], [:]) + AS_IF([test "x${SPHINXBUILD}" != "x:"],[ + AC_CACHE_CHECK([if sphinx is new enough],[ac_cv_recent_sphinx],[ + + ${SPHINXBUILD} -Q -C -b man -d conftest.d . . >/dev/null 2>&1 + AS_IF([test $? -eq 0],[ac_cv_recent_sphinx=yes], + [ac_cv_recent_sphinx=no]) + rm -rf conftest.d + ]) + ]) AM_CONDITIONAL(HAVE_DPKG_GENSYMBOLS,[test "x${DPKG_GENSYMBOLS}" != "x:"]) + AM_CONDITIONAL(HAVE_SPHINX,[test "x${SPHINXBUILD}" != "x:"]) + AM_CONDITIONAL(HAVE_RECENT_SPHINX,[test "x${ac_cv_recent_sphinx}" = "xyes"]) - PANDORA_WITH_GETTEXT - - 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}" - ]) - ]) 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}" ],[ @@ -240,8 +214,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ PANDORA_USE_PIPE - - 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])