X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_canonical.m4;h=a6b9b24ae8c32ca598a11024e81729f5a91a4590;hb=7b548d21a8eafec0b830ad1bd6429cecd4eaeba8;hp=9465a5c1d88b94586e06992ea5083927b6d0c531;hpb=d6524995788ff698a0275284f3df4adfec8b6c67;p=m6w6%2Flibmemcached diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 9465a5c1..a6b9b24a 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.1]) +AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.3]) AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ dnl Force dependency tracking on for Sun Studio builds @@ -16,11 +16,13 @@ AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ dnl The standard setup for how we build Pandora projects AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_REQUIRE([PANDORA_FORCE_DEPEND_TRACKING]) - m4_define([PCT_ALL_ARGS],[$@]) + 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_foreach_w([pct_arg],$@,[ + m4_foreach([pct_arg],$*,[ m4_case(pct_arg, [use-gnulib], [ m4_undefine([PCT_USE_GNULIB]) @@ -97,8 +99,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_SYS_LARGEFILE - AS_IF([test "$GCC" = "yes"], PANDORA_ENSURE_GCC_VERSION) - PANDORA_CHECK_C_VERSION PANDORA_CHECK_CXX_VERSION