From 54875a59cc66a366b4e719f94f7352473cd31bea Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Sun, 29 Jan 2012 11:46:48 -0800 Subject: [PATCH] Additional m4 updates. --- configure.ac | 7 +- m4/ax_check_library.m4 | 6 +- m4/ax_cxx_header_stdcxx_98.m4 | 91 +++++++++++++++++++++++ m4/ax_pthread.m4 | 11 ++- m4/have_cinttypes.m4 | 86 ++++++++++++++++++++++ m4/lib-prefix.m4 | 15 ++-- m4/pandora_canonical.m4 | 4 +- m4/pandora_cinttypes.m4 | 39 ---------- m4/pandora_cstdint.m4 | 38 ---------- m4/pandora_platform.m4 | 3 +- m4/pandora_vc_build.m4 | 132 ---------------------------------- m4/socket_send_flags.m4 | 4 +- 12 files changed, 209 insertions(+), 227 deletions(-) create mode 100644 m4/ax_cxx_header_stdcxx_98.m4 create mode 100644 m4/have_cinttypes.m4 delete mode 100644 m4/pandora_cinttypes.m4 delete mode 100644 m4/pandora_cstdint.m4 diff --git a/configure.ac b/configure.ac index a7f4a306..f709f6b2 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,11 @@ LT_LANG([C++]) LT_LANG([C]) gl_VISIBILITY +AX_CXX_HEADER_STDCXX_98 + if test "$ax_cv_cxx_stdcxx_98" = no; then + AC_MSG_ERROR([Your system lacks a new enough C++ compiler]) + fi + m4_include([m4/memcached.m4]) m4_include([m4/memcached_sasl.m4]) m4_include([m4/gearmand.m4]) @@ -85,7 +90,7 @@ case "$target_os" in dnl Specialty checks AX_PTHREAD -AX_CXX_CSTDINT +AX_CXX_CINTTYPES CONFIG_EXTRA DETECT_BYTEORDER ENABLE_UTILLIB diff --git a/m4/ax_check_library.m4 b/m4/ax_check_library.m4 index 9b9d9db3..24af93c0 100644 --- a/m4/ax_check_library.m4 +++ b/m4/ax_check_library.m4 @@ -60,7 +60,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 3 +#serial 4 AC_DEFUN([AX_CHECK_LIBRARY], [ AC_ARG_VAR($1[_CPPFLAGS], [C preprocessor flags for ]$1[ headers]) @@ -90,6 +90,6 @@ AC_DEFUN([AX_CHECK_LIBRARY], [ AS_IF([test "$]AS_TR_SH([ax_cv_have_]$1)[" = "yes"], AC_DEFINE([HAVE_]$1, [1], [Define to 1 if ]$1[ is found]) - m4_ifval(m4_normalize([$4]), [$4]), - m4_ifval(m4_normalize([$5]), [$5])) + m4_ifnblank([$4], [$4]), + m4_ifnblank([$5], [$5])) ]) diff --git a/m4/ax_cxx_header_stdcxx_98.m4 b/m4/ax_cxx_header_stdcxx_98.m4 new file mode 100644 index 00000000..82e04c58 --- /dev/null +++ b/m4/ax_cxx_header_stdcxx_98.m4 @@ -0,0 +1,91 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_cxx_header_stdcxx_98.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HEADER_STDCXX_98 +# +# DESCRIPTION +# +# Check for complete library coverage of the C++1998/2003 standard. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_STDCXX_98], [AX_CXX_HEADER_STDCXX_98]) +AC_DEFUN([AX_CXX_HEADER_STDCXX_98], [ + AC_CACHE_CHECK([for ISO C++ 98 include files], [ax_cv_cxx_stdcxx_98], [ + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + ], [ + int x + ]), [ax_cv_cxx_stdcxx_98=yes ], [ax_cv_cxx_stdcxx_98=no ] + ]) + + AC_LANG_POP + + ]) + + if test "$ax_cv_cxx_stdcxx_98" = yes; then + AC_DEFINE(STDCXX_98_HEADERS,,[Define if ISO C++ 1998 header files are present. ]) + fi +]) diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 index a6bf596c..e20a388c 100644 --- a/m4/ax_pthread.m4 +++ b/m4/ax_pthread.m4 @@ -82,7 +82,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 16 +#serial 17 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) AC_DEFUN([AX_PTHREAD], [ @@ -256,7 +256,14 @@ if test "x$ax_pthread_ok" = xyes; then flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + *-osf* | *-hpux*) flag="-D_REENTRANT";; + *solaris*) + if test "$GCC" = "yes"; then + flag="-D_REENTRANT" + else + flag="-mt -D_REENTRANT" + fi + ;; esac AC_MSG_RESULT(${flag}) if test "x$flag" != xno; then diff --git a/m4/have_cinttypes.m4 b/m4/have_cinttypes.m4 new file mode 100644 index 00000000..bcfea1c3 --- /dev/null +++ b/m4/have_cinttypes.m4 @@ -0,0 +1,86 @@ +# =========================================================================== +# http://tangent.org/ +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_CINTTYPES +# +# DESCRIPTION +# +# Example: +# +# LICENSE +# +# Copyright (c) 2012 Brian Aker` +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 1 + + +AC_DEFUN([AX_CXX_CINTTYPES], + [ + AC_REQUIRE([AC_PROG_CXX]) + AC_REQUIRE([AC_PROG_CXXCPP]) + AC_REQUIRE([AX_CXX_CSTDINT]) + AC_MSG_CHECKING(the location of cinttypes) + save_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}" + ac_cv_cxx_cinttypes="" + + AC_LANG_PUSH([C++]) +# AC_CACHE_CHECK([for location of cinttypes], [ac_cv_cxx_cinttypes], +# [ +# Look for cinttypes + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ uint32_t foo= UINT32_C(1) ])], + [ac_cv_cxx_cinttypes=""], + [ +# Look for tr1/cinttypes + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ uint32_t foo= UINT32_C(1) ])], + [ac_cv_cxx_cinttypes=""], + [ +# Look for boost/cinttypes.hpp + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ uint32_t foo= UINT32_C(1) ])], + [ac_cv_cxx_cinttypes=""]) + ]) + ]) +# ]) + AC_LANG_POP() + + CXXFLAGS="${save_CXXFLAGS}" + if test -n "$ac_cv_cxx_cinttypes"; then + AC_MSG_RESULT([$ac_cv_cxx_cinttypes]) + else + ac_cv_cxx_cinttypes="" + AC_MSG_WARN([Could not find a cinttypes header.]) + AC_MSG_RESULT([$ac_cv_cxx_cinttypes]) + fi + + AC_DEFINE([__STDC_LIMIT_MACROS],[1],[Use STDC Limit Macros in C++]) + AC_DEFINE_UNQUOTED(CINTTYPES_H,$ac_cv_cxx_cinttypes, [the location of ]) + ]) diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index bab0cb7f..1601ceae 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 6 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -184,10 +184,10 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the dnl symlink is missing, so we set acl_libdirstem2 too. AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], - [AC_RUN_IFELSE([ - AC_LANG_PROGRAM([], [[ - return sizeof(void*) == 8 ? 0 : 1; - ]]) + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) ]) if test $gl_cv_solaris_64bit = yes; then @@ -206,6 +206,9 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], if test -d "$searchdir"; then case "$searchdir" in */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; *) searchdir=`cd "$searchdir" && pwd` case "$searchdir" in */lib64 ) acl_libdirstem=lib64 ;; diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index b7da1ac3..1460c9df 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -61,7 +61,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], [CXXFLAGS=""]) - AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability 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])]) @@ -120,8 +120,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_MSG_ERROR([No working C++ Compiler has been found. ${PACKAGE} requires a C++ compiler that can handle C++98]) ]) ]) - PANDORA_CXX_CSTDINT - PANDORA_CXX_CINTTYPES m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[ gl_INIT diff --git a/m4/pandora_cinttypes.m4 b/m4/pandora_cinttypes.m4 deleted file mode 100644 index e4a8b478..00000000 --- a/m4/pandora_cinttypes.m4 +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2008 Sun Microsystems, Inc. -# This file is free software; Sun Microsystems, Inc. -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# We check two things: where the include file is for cinttypes. We -# include AC_TRY_COMPILE for all the combinations we've seen in the -# wild. We define one of HAVE_CINTTYPES or HAVE_TR1_CINTTYPES or -# HAVE_BOOST_CINTTYPES depending -# on location. - -AC_DEFUN([PANDORA_CXX_CINTTYPES], - [AC_REQUIRE([PANDORA_CXX_CSTDINT]) - AC_MSG_CHECKING(the location of cinttypes) - AC_LANG_PUSH(C++) - save_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}" - ac_cv_cxx_cinttypes="" - for location in tr1/cinttypes boost/cinttypes cinttypes; do - if test -z "$ac_cv_cxx_cinttypes"; then - AC_TRY_COMPILE([#include $ac_cv_cxx_cstdint; - #include <$location>], - [uint32_t foo= UINT32_C(1)], - [ac_cv_cxx_cinttypes="<$location>";]) - fi - done - AC_LANG_POP() - CXXFLAGS="${save_CXXFLAGS}" - if test -n "$ac_cv_cxx_cinttypes"; then - AC_MSG_RESULT([$ac_cv_cxx_cinttypes]) - else - ac_cv_cxx_cinttypes="" - AC_MSG_RESULT() - AC_MSG_WARN([Could not find a cinttypes header.]) - fi - AC_DEFINE([__STDC_LIMIT_MACROS],[1],[Use STDC Limit Macros in C++]) - AC_DEFINE_UNQUOTED(CINTTYPES_H,$ac_cv_cxx_cinttypes, - [the location of ]) -]) diff --git a/m4/pandora_cstdint.m4 b/m4/pandora_cstdint.m4 deleted file mode 100644 index 9c848438..00000000 --- a/m4/pandora_cstdint.m4 +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2008 Sun Microsystems, Inc. -# This file is free software; Sun Microsystems, Inc. -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# We check two things: where the include file is for cstdint. We -# include AC_TRY_COMPILE for all the combinations we've seen in the -# wild. We define one of HAVE_CSTDINT or HAVE_TR1_CSTDINT or -# HAVE_BOOST_CSTDINT depending -# on location. - -AC_DEFUN([PANDORA_CXX_CSTDINT], - [AC_MSG_CHECKING(the location of cstdint) - AC_LANG_PUSH(C++) - save_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}" - ac_cv_cxx_cstdint="" - for location in tr1/cstdint boost/cstdint cstdint; do - if test -z "$ac_cv_cxx_cstdint"; then - AC_TRY_COMPILE([#include <$location>], - [uint32_t t], - [ac_cv_cxx_cstdint="<$location>";]) - fi - done - AC_LANG_POP() - CXXFLAGS="${save_CXXFLAGS}" - if test -n "$ac_cv_cxx_cstdint"; then - AC_MSG_RESULT([$ac_cv_cxx_cstdint]) - else - AC_DEFINE([__STDC_CONSTANT_MACROS],[1],[Use STDC Constant Macros in C++]) - AC_DEFINE([__STDC_FORMAT_MACROS],[1],[Use STDC Format Macros in C++]) - ac_cv_cxx_cstdint="" - AC_MSG_RESULT() - AC_MSG_WARN([Could not find a cstdint header.]) - fi - AC_DEFINE_UNQUOTED(CSTDINT_H,$ac_cv_cxx_cstdint, - [the location of ]) -]) diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4 index 4d51d2b5..bd570f61 100644 --- a/m4/pandora_platform.m4 +++ b/m4/pandora_platform.m4 @@ -88,8 +88,9 @@ AC_DEFUN([PANDORA_PLATFORM],[ AM_CFLAGS="${AM_CFLAGS} -I\${top_srcdir}/win32/mingw -I\${top_builddir}/win32/mingw -I\${top_srcdir}/win32 -I\${top_builddir}/win32" ;; esac - AM_CONDITIONAL(TARGET_LINUX, [test "x${TARGET_LINUX}" = "xtrue"]) AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL(TARGET_OSX, [test "x${TARGET_OSX}" = "xtrue"]) + AM_CONDITIONAL(TARGET_LINUX, [test "x${TARGET_LINUX}" = "xtrue"]) AC_SUBST(PANDORA_OPTIMIZE_BITFIELD) diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4 index a1fb60b3..1adb2809 100644 --- a/m4/pandora_vc_build.m4 +++ b/m4/pandora_vc_build.m4 @@ -34,135 +34,3 @@ AC_DEFUN([PANDORA_TEST_VC_DIR],[ pandora_building_from_git=no fi ]) - -AC_DEFUN([PANDORA_BUILDING_FROM_VC],[ - m4_syscmd(PANDORA_TEST_VC_DIR - m4_if(PCT_NO_VC_CHANGELOG,yes,[ - vc_changelog=no - ],[ - vc_changelog=yes - ]) - - [ - - PANDORA_RELEASE_DATE=`date +%Y.%m` - PANDORA_RELEASE_NODOTS_DATE=`date +%Y%m` - - # Set some defaults - PANDORA_VC_REVNO="0" - PANDORA_VC_REVID="unknown" - PANDORA_VC_BRANCH="bzr-export" - - if test "${pandora_building_from_bzr}" = "yes"; then - echo "# Grabbing changelog and version information from bzr" - PANDORA_BZR_REVNO=`bzr revno` - if test "x$PANDORA_BZR_REVNO" != "x${PANDORA_VC_REVNO}" ; then - PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}" - PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1` - PANDORA_VC_BRANCH=`bzr nick` - PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1` - PANDORA_VC_LATEST_TAG=`bzr tags --sort=time | grep -v '\?'| cut -f1 -d' ' | tail -1` - if test "x${vc_changelog}" = "xyes"; then - bzr log --gnu > ChangeLog - fi - fi - elif test "${pandora_building_from_git}" = "yes"; then - echo "# Grabbing changelog and version information from git" - PANDORA_GIT_REVID=`git --no-pager log --max-count=1 | cut -f2 -d' ' | head -1` - if test "x$PANDORA_GIT_REVID" != "x${PANDORA_VC_REVNO}" ; then - PANDORA_VC_REVID="${PANDORA_GIT_REVID}" - PANDORA_VC_BRANCH=`git branch | grep -Ei "\* (.*)" | cut -f2 -d' '` - fi - fi - - if ! test -d config ; then - mkdir -p config - fi - - if test "${pandora_building_from_bzr}" = "yes" -o ! -f config/pandora_vc_revinfo ; then - cat > config/pandora_vc_revinfo.tmp </dev/null 2>&1 ; then - mv config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo - fi - rm -f config/pandora_vc_revinfo.tmp - fi - ]) -]) - -AC_DEFUN([_PANDORA_READ_FROM_FILE],[ - $1=`grep $1 $2 | cut -f2 -d=` -]) - -AC_DEFUN([PANDORA_VC_VERSION],[ - AC_REQUIRE([PANDORA_BUILDING_FROM_VC]) - - PANDORA_TEST_VC_DIR - - AS_IF([test -f ${srcdir}/config/pandora_vc_revinfo],[ - _PANDORA_READ_FROM_FILE([PANDORA_VC_REVNO],${srcdir}/config/pandora_vc_revinfo) - _PANDORA_READ_FROM_FILE([PANDORA_VC_REVID],${srcdir}/config/pandora_vc_revinfo) - _PANDORA_READ_FROM_FILE([PANDORA_VC_BRANCH], - ${srcdir}/config/pandora_vc_revinfo) - _PANDORA_READ_FROM_FILE([PANDORA_VC_TAG], - ${srcdir}/config/pandora_vc_revinfo) - _PANDORA_READ_FROM_FILE([PANDORA_VC_LATEST_TAG], - ${srcdir}/config/pandora_vc_revinfo) - _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_DATE], - ${srcdir}/config/pandora_vc_revinfo) - _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_NODOTS_DATE], - ${srcdir}/config/pandora_vc_revinfo) - ]) - AS_IF([test "x${PANDORA_VC_BRANCH}" != x"${PACKAGE}"],[ - PANDORA_RELEASE_COMMENT="${PANDORA_VC_BRANCH}" - ],[ - PANDORA_RELEASE_COMMENT="trunk" - ]) - - AS_IF([test "x${PANDORA_VC_TAG}" != "x"],[ - PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}" - ],[ - AS_IF([test "x${PANDORA_VC_LATEST_TAG}" != "x"],[ - PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG}.${PANDORA_VC_REVNO}" - ],[ - PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}" - ]) - ]) - changequote(<<, >>)dnl - PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_VERSION} | sed 's/[^0-9]//g'` - changequote([, ])dnl - - - VERSION="${PANDORA_RELEASE_VERSION}" - AC_DEFINE_UNQUOTED([PANDORA_RELEASE_VERSION],["${PANDORA_RELEASE_VERSION}"], - [The real version of the software]) - AC_SUBST(PANDORA_VC_REVNO) - AC_SUBST(PANDORA_VC_REVID) - AC_SUBST(PANDORA_VC_BRANCH) - AC_SUBST(PANDORA_RELEASE_DATE) - AC_SUBST(PANDORA_RELEASE_NODOTS_DATE) - AC_SUBST(PANDORA_RELEASE_COMMENT) - AC_SUBST(PANDORA_RELEASE_VERSION) - AC_SUBST(PANDORA_RELEASE_ID) -]) - -AC_DEFUN([PANDORA_VC_INFO_HEADER],[ - AC_REQUIRE([PANDORA_VC_VERSION]) - m4_define([PANDORA_VC_PREFIX],m4_toupper(m4_normalize(AC_PACKAGE_NAME))[_]) - - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[VC_REVNO], [$PANDORA_VC_REVNO], [Version control revision number]) - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[VC_REVID], ["$PANDORA_VC_REVID"], [Version control revision ID]) - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[VC_BRANCH], ["$PANDORA_VC_BRANCH"], [Version control branch name]) - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_DATE], ["$PANDORA_RELEASE_DATE"], [Release date of version control checkout]) - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_NODOTS_DATE], [$PANDORA_RELEASE_NODOTS_DATE], [Numeric formatted release date of checkout]) - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_COMMENT], ["$PANDORA_RELEASE_COMMENT"], [Set to trunk if the branch is the main $PACKAGE branch]) - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_VERSION], ["$PANDORA_RELEASE_VERSION"], [Release date and revision number of checkout]) - AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_ID], [$PANDORA_RELEASE_ID], [Numeric formatted release date and revision number of checkout]) -]) diff --git a/m4/socket_send_flags.m4 b/m4/socket_send_flags.m4 index 8b569eef..1eefa1bd 100644 --- a/m4/socket_send_flags.m4 +++ b/m4/socket_send_flags.m4 @@ -14,7 +14,7 @@ AC_DEFUN([SOCKET_SEND_FLAGS], save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I${srcdir}" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ int flags= MSG_NOSIGNAL ])], [ac_cv_msg_nosignal="yes"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ int flags= MSG_NOSIGNAL ])], [ac_cv_msg_nosignal="yes"]) AC_LANG_POP ]) @@ -23,7 +23,7 @@ AC_DEFUN([SOCKET_SEND_FLAGS], save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I${srcdir}" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ int flags= MSG_DONTWAIT ])], [ac_cv_msg_dontwait="yes"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ int flags= MSG_DONTWAIT ])], [ac_cv_msg_dontwait="yes"]) AC_LANG_POP ]) -- 2.30.2