[mpich2-commits] r5525 - in mpich2/trunk: . confdb src/mpi/romio src/mpl src/pm/gforker src/pm/remshell src/pm/smpd src/pm/util src/util/logging/rlog test/mpi
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Wed Oct 21 16:43:52 CDT 2009
Author: balaji
Date: 2009-10-21 16:43:52 -0500 (Wed, 21 Oct 2009)
New Revision: 5525
Modified:
mpich2/trunk/confdb/aclocal_am.m4
mpich2/trunk/confdb/aclocal_cc.m4
mpich2/trunk/confdb/aclocal_make.m4
mpich2/trunk/configure.in
mpich2/trunk/src/mpi/romio/configure.in
mpich2/trunk/src/mpl/configure.in
mpich2/trunk/src/pm/gforker/configure.in
mpich2/trunk/src/pm/remshell/configure.in
mpich2/trunk/src/pm/smpd/configure.in
mpich2/trunk/src/pm/util/configure.in
mpich2/trunk/src/util/logging/rlog/configure.in
mpich2/trunk/test/mpi/configure.in
Log:
Get rid of unused macros and ones which are already provided by
autoconf.
Modified: mpich2/trunk/confdb/aclocal_am.m4
===================================================================
--- mpich2/trunk/confdb/aclocal_am.m4 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/confdb/aclocal_am.m4 2009-10-21 21:43:52 UTC (rev 5525)
@@ -3,11 +3,4 @@
dnl automake generates. We don't use AC_DEFUN, since aclocal will
dnl then complain that AM_IGNORE is a duplicate (if you are using the
dnl patched automake/aclocal).
-ifdef([AM_IGNORE],,[
-define([AM_IGNORE],)])
-dnl You can use PAC_PROVIDE_IGNORE to ensure that AM_IGNORE is defined
-dnl for configures that don't use automake
-AC_DEFUN([PAC_PROVIDE_IGNORE],[
-ifdef([AM_IGNORE],,[
-define([AM_IGNORE],)])
-])
+ifdef([AM_IGNORE],,[define([AM_IGNORE],)])
Modified: mpich2/trunk/confdb/aclocal_cc.m4
===================================================================
--- mpich2/trunk/confdb/aclocal_cc.m4 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/confdb/aclocal_cc.m4 2009-10-21 21:43:52 UTC (rev 5525)
@@ -162,66 +162,6 @@
])
dnl/*D
-dnl PAC_C_VOLATILE - Check if C supports volatile
-dnl
-dnl Synopsis:
-dnl PAC_C_VOLATILE
-dnl
-dnl Output Effect:
-dnl Defines 'volatile' as empty if volatile is not available.
-dnl
-dnl D*/
-AC_DEFUN([PAC_C_VOLATILE],[
-AC_CACHE_CHECK([for volatile],
-pac_cv_c_volatile,[
-AC_TRY_COMPILE(,[volatile int a;],pac_cv_c_volatile="yes",
-pac_cv_c_volatile="no")])
-if test "$pac_cv_c_volatile" = "no" ; then
- AC_DEFINE(volatile,,[if C does not support volatile])
-fi
-])
-
-dnl/*D
-dnl PAC_C_RESTRICT - Check if C supports restrict
-dnl
-dnl Synopsis:
-dnl PAC_C_RESTRICT
-dnl
-dnl Output Effect:
-dnl Defines 'restrict' if some version of restrict is supported; otherwise
-dnl defines 'restrict' as empty. This allows you to include 'restrict' in
-dnl declarations in the same way that 'AC_C_CONST' allows you to use 'const'
-dnl in declarations even when the C compiler does not support 'const'
-dnl
-dnl Note that some compilers accept restrict only with additional options.
-dnl DEC/Compaq/HP Alpha Unix (Tru64 etc.) -accept restrict_keyword
-dnl
-dnl D*/
-AC_DEFUN([PAC_C_RESTRICT],[
-AC_CACHE_CHECK([for restrict],
-pac_cv_c_restrict,[
-AC_TRY_COMPILE(,[int * restrict a;],pac_cv_c_restrict="restrict",
-pac_cv_c_restrict="no")
-if test "$pac_cv_c_restrict" = "no" ; then
- AC_TRY_COMPILE(,[int * _Restrict a;],pac_cv_c_restrict="_Restrict",
- pac_cv_c_restrict="no")
-fi
-if test "$pac_cv_c_restrict" = "no" ; then
- AC_TRY_COMPILE(,[int * __restrict a;],pac_cv_c_restrict="__restrict",
- pac_cv_c_restrict="no")
-fi
-])
-if test "$pac_cv_c_restrict" = "no" ; then
- restrict_val=""
-elif test "$pac_cv_c_restrict" != "restrict" ; then
- restrict_val=$pac_cv_c_restrict
-fi
-if test "$restrict_val" != "restrict" ; then
- AC_DEFINE_UNQUOTED(restrict,$restrict_val,[if C does not support restrict])
-fi
-])
-
-dnl/*D
dnl PAC_PROG_C_UNALIGNED_DOUBLES - Check that the C compiler allows unaligned
dnl doubles
dnl
Modified: mpich2/trunk/confdb/aclocal_make.m4
===================================================================
--- mpich2/trunk/confdb/aclocal_make.m4 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/confdb/aclocal_make.m4 2009-10-21 21:43:52 UTC (rev 5525)
@@ -22,66 +22,8 @@
AC_CHECK_PROGS(MAKE,make gnumake nmake pmake smake)
fi
])dnl
+
dnl/*D
-dnl PAC_PROG_MAKE_ECHOS_DIR - Check whether make echos all directory changes
-dnl
-dnl Synopsis:
-dnl PAC_PROG_MAKE_ECHOS_DIR
-dnl
-dnl Output Effect:
-dnl If make echos directory changes, append '--no-print-directory' to the
-dnl symbol 'MAKE'. If 'MAKE' is not set, chooses 'make' for 'MAKE'.
-dnl
-dnl You can override this test (if, for example, you want make to be
-dnl more noisy) by setting the environment variable MAKE_MAY_PRINT_DIR to
-dnl yes
-dnl
-dnl See also:
-dnl PAC_PROG_MAKE
-dnl D*/
-dnl
-AC_DEFUN([PAC_PROG_MAKE_ECHOS_DIR],[
-if test "$MAKE_MAY_PRINT_DIR" != "yes" ; then
- AC_CACHE_CHECK([whether make echos directory changes],
-pac_cv_prog_make_echos_dir,
-[
-AC_REQUIRE([PAC_PROG_MAKE_PROGRAM])
-# This is needed for Mac OSX 10.5
-rm -rf conftest.dSYM
-rm -f conftest
-cat > conftest <<.
-SHELL=/bin/sh
-ALL:
- @(dir="`pwd`" ; cd .. ; \$(MAKE) -f "\$\$dir/conftest" SUB)
-SUB:
- @echo "success"
-.
-str="`$MAKE -f conftest 2>&1`"
-if test "$str" != "success" ; then
- str="`$MAKE --no-print-directory -f conftest 2>&1`"
- if test "$str" = "success" ; then
- pac_cv_prog_make_echos_dir="yes using --no-print-directory"
- else
- pac_cv_prog_make_echos_dir="no"
- echo "Unexpected output from make with program" >>config.log
- cat conftest >>config.log
- echo "str" >> config.log
- fi
-else
- pac_cv_prog_make_echos_dir="no"
-fi
-# This is needed for Mac OSX 10.5
-rm -rf conftest.dSYM
-rm -f conftest
-str=""
-])
- if test "$pac_cv_prog_make_echos_dir" = "yes using --no-print-directory" ; then
- MAKE="$MAKE --no-print-directory"
- fi
-fi
-])dnl
-dnl
-dnl/*D
dnl PAC_PROG_MAKE_INCLUDE - Check whether make supports include
dnl
dnl Synopsis:
@@ -99,7 +41,6 @@
dnl PAC_PROG_MAKE
dnl
dnl D*/
-dnl
AC_DEFUN([PAC_PROG_MAKE_INCLUDE],[
AC_CACHE_CHECK([whether make supports include],pac_cv_prog_make_include,[
AC_REQUIRE([PAC_PROG_MAKE_PROGRAM])
@@ -129,7 +70,7 @@
ifelse([$1],,:,[$1])
fi
])dnl
-dnl
+
dnl/*D
dnl PAC_PROG_MAKE_ALLOWS_COMMENTS - Check whether comments are allowed in
dnl shell commands in a makefile
@@ -178,7 +119,7 @@
ifelse([$1],,[$1])
fi
])dnl
-dnl
+
dnl/*D
dnl PAC_PROG_MAKE_VPATH - Check whether make supports source-code paths.
dnl
@@ -205,7 +146,6 @@
dnl PAC_PROG_MAKE
dnl
dnl D*/
-dnl
AC_DEFUN([PAC_PROG_MAKE_VPATH],[
AC_SUBST(VPATH)
AM_IGNORE(VPATH)
@@ -253,7 +193,7 @@
VPATH='.PATH: . ${srcdir}'
fi
])dnl
-dnl
+
dnl/*D
dnl PAC_PROG_MAKE_SET_CFLAGS - Check whether make sets CFLAGS
dnl
@@ -299,6 +239,7 @@
ifelse([$1],,:,[$1])
fi
])dnl
+
dnl/*D
dnl PAC_PROG_MAKE_CLOCK_SKEW - Check whether there is a problem with
dnl clock skew in suing make.
@@ -334,59 +275,8 @@
Consider building in a local instead of NFS filesystem.])
fi
])
-dnl
+
dnl/*D
-dnl PAC_PROG_MAKE_HAS_PATTERN_RULES - Determine if the make program supports
-dnl pattern rules
-dnl
-dnl Synopsis:
-dnl PAC_PROG_MAKE_HAS_PATTERN_RULES([action if true],[action if false])
-dnl
-dnl Output Effect:
-dnl Executes the first argument if patterns of the form
-dnl.vb
-dnl prefix%suffix: prefix%suffix
-dnl.ve
-dnl are supported by make (gnumake and Solaris make are known to support
-dnl this form of target). If patterns are not supported, executes the
-dnl second argument.
-dnl
-dnl See Also:
-dnl PAC_PROG_MAKE
-dnl
-dnl D*/
-AC_DEFUN([PAC_PROG_MAKE_HAS_PATTERN_RULES],[
-AC_CACHE_CHECK([whether make has pattern rules],
-pac_cv_prog_make_has_patterns,[
-AC_REQUIRE([PAC_PROG_MAKE_PROGRAM])
-# This is needed for Mac OSX 10.5
-rm -rf conftest.dSYM
-rm -f conftest*
-cat > conftestmm <<EOF
-# Test for pattern rules
-.SUFFIXES:
-.SUFFIXES: .dep .c
-conftest%.dep: %.c
- @cat \[$]< >\[$]@
-EOF
-date > conftest.c
-if ${MAKE} -f conftestmm conftestconftest.dep 1>&AC_FD_CC 2>&1 </dev/null ; then
- pac_cv_prog_make_has_patterns="yes"
-else
- pac_cv_prog_make_has_patterns="no"
-fi
-# This is needed for Mac OSX 10.5
-rm -rf conftest.dSYM
-rm -f conftest*
-])
-if test "$pac_cv_prog_make_has_patterns" = "no" ; then
- ifelse([$2],,:,[$2])
-else
- ifelse([$1],,:,[$1])
-fi
-])dnl
-dnl
-dnl/*D
dnl PAC_PROG_MAKE - Checks for the varieties of MAKE, including support for
dnl VPATH
dnl
@@ -398,7 +288,7 @@
dnl Sets the variable 'SET_CFLAGS' to 'CFLAGS =' if make sets 'CFLAGS'.
dnl
dnl Notes:
-dnl This macro uses 'PAC_PROG_MAKE_ECHOS_DIR', 'PAC_PROG_MAKE_INCLUDE',
+dnl This macro uses 'PAC_PROG_MAKE_INCLUDE',
dnl 'PAC_PROG_MAKE_ALLOWS_COMMENTS', 'PAC_PROG_MAKE_VPATH', and
dnl 'PAC_PROG_MAKE_SET_CFLAGS'. See those commands for details about their
dnl actions.
@@ -407,23 +297,13 @@
dnl if the make program does not set the value of make, otherwise 'SET_MAKE'
dnl is set to empty; if the make program echos the directory name, then
dnl 'SET_MAKE' is set to 'MAKE = $MAKE'.
-dnl
-dnl A recent change has been to remove the test on make echoing
-dnl directories. This was done to make the build process behave more
-dnl like other builds that do not work around this behavior in gnumake.
dnl D*/
-dnl
AC_DEFUN([PAC_PROG_MAKE],[
PAC_PROG_MAKE_PROGRAM
PAC_PROG_MAKE_CLOCK_SKEW
-dnl PAC_PROG_MAKE_ECHOS_DIR
PAC_PROG_MAKE_INCLUDE
PAC_PROG_MAKE_ALLOWS_COMMENTS
PAC_PROG_MAKE_VPATH
-dnl
-dnl We're not using patterns any more, and Compaq/DEC OSF-1 sometimes hangs
-dnl at this test
-dnl PAC_PROG_MAKE_HAS_PATTERN_RULES
AC_SUBST(SET_CFLAGS)
AM_IGNORE(SET_CFLAGS)
PAC_PROG_MAKE_SET_CFLAGS([SET_CFLAGS='CFLAGS='])
Modified: mpich2/trunk/configure.in
===================================================================
--- mpich2/trunk/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -3064,8 +3064,8 @@
# ----------------------------------------------------------------------------
# Check for C compiler characteristics
AC_C_CONST
-PAC_C_VOLATILE
-PAC_C_RESTRICT
+AC_C_VOLATILE
+AC_C_RESTRICT
AC_C_INLINE
PAC_C_GNU_ATTRIBUTE
Modified: mpich2/trunk/src/mpi/romio/configure.in
===================================================================
--- mpich2/trunk/src/mpi/romio/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/src/mpi/romio/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -2048,7 +2048,7 @@
echo "setting SYSDEP_INC to $SYSDEP_INC"
AC_SUBST(SYSDEP_INC)
-PAC_C_RESTRICT
+AC_C_RESTRICT
PAC_C_GNU_ATTRIBUTE
echo "setting CC to $CC"
Modified: mpich2/trunk/src/mpl/configure.in
===================================================================
--- mpich2/trunk/src/mpl/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/src/mpl/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -22,8 +22,8 @@
AC_C_CONST
AC_C_INLINE
AC_PROG_MKDIR_P
-PAC_C_VOLATILE
-PAC_C_RESTRICT
+AC_C_VOLATILE
+AC_C_RESTRICT
PAC_CC_FUNCTION_NAME_SYMBOL
PAC_C_GNU_ATTRIBUTE
Modified: mpich2/trunk/src/pm/gforker/configure.in
===================================================================
--- mpich2/trunk/src/pm/gforker/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/src/pm/gforker/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -124,8 +124,8 @@
dnl
dnl check for compiler characteristics
AC_C_CONST
-PAC_C_VOLATILE
-PAC_C_RESTRICT
+AC_C_VOLATILE
+AC_C_RESTRICT
AC_C_INLINE
PAC_C_GNU_ATTRIBUTE
dnl
Modified: mpich2/trunk/src/pm/remshell/configure.in
===================================================================
--- mpich2/trunk/src/pm/remshell/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/src/pm/remshell/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -106,8 +106,8 @@
dnl
dnl check for compiler characteristics
AC_C_CONST
-PAC_C_VOLATILE
-PAC_C_RESTRICT
+AC_C_VOLATILE
+AC_C_RESTRICT
AC_C_INLINE
dnl
dnl check for library functions
Modified: mpich2/trunk/src/pm/smpd/configure.in
===================================================================
--- mpich2/trunk/src/pm/smpd/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/src/pm/smpd/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -73,8 +73,8 @@
dnl
dnl check for compiler characteristics
AC_C_CONST
-PAC_C_VOLATILE
-PAC_C_RESTRICT
+AC_C_VOLATILE
+AC_C_RESTRICT
AC_C_INLINE
dnl
dnl Look for Standard headers
Modified: mpich2/trunk/src/pm/util/configure.in
===================================================================
--- mpich2/trunk/src/pm/util/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/src/pm/util/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -89,8 +89,8 @@
PAC_ARG_STRICT
AC_C_CONST
-PAC_C_VOLATILE
-PAC_C_RESTRICT
+AC_C_VOLATILE
+AC_C_RESTRICT
AC_C_INLINE
PAC_C_GNU_ATTRIBUTE
dnl
Modified: mpich2/trunk/src/util/logging/rlog/configure.in
===================================================================
--- mpich2/trunk/src/util/logging/rlog/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/src/util/logging/rlog/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -83,8 +83,8 @@
dnl check for compiler characteristics
dnl PAC_PROG_C_WEAK_SYMBOLS
AC_C_CONST
-PAC_C_VOLATILE
-PAC_C_RESTRICT
+AC_C_VOLATILE
+AC_C_RESTRICT
AC_C_INLINE
dnl PAC_C_STRUCT_ALIGNMENT
dnl
Modified: mpich2/trunk/test/mpi/configure.in
===================================================================
--- mpich2/trunk/test/mpi/configure.in 2009-10-21 21:33:04 UTC (rev 5524)
+++ mpich2/trunk/test/mpi/configure.in 2009-10-21 21:43:52 UTC (rev 5525)
@@ -364,7 +364,7 @@
#
# Check for const and restrict (used in some of the performance tests)
AC_C_CONST
-PAC_C_RESTRICT
+AC_C_RESTRICT
# General headers
AC_CHECK_HEADERS(unistd.h stdarg.h string.h stdlib.h memory.h)
More information about the mpich2-commits
mailing list