Change some define's to AC_DEFUN's so that "aclocal -I config" will
find all the right .m4 files upon demand. This commit was SVN r18514.
This commit is contained in:
parent
5a2992dea2
commit
15fce83c5b
@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -17,7 +18,7 @@ dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
define([OMPI_CXX_FIND_EXCEPTION_FLAGS],[
|
||||
AC_DEFUN([OMPI_CXX_FIND_EXCEPTION_FLAGS],[
|
||||
#
|
||||
# Arguments: none
|
||||
#
|
||||
|
@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -17,7 +18,7 @@ dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
define(OMPI_CXX_FIND_TEMPLATE_PARAMETERS,[
|
||||
AC_DEFUN([OMPI_CXX_FIND_TEMPLATE_PARAMETERS],[
|
||||
#
|
||||
# Arguments: none
|
||||
#
|
||||
|
@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -17,7 +18,7 @@ dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
define([OMPI_CXX_HAVE_EXCEPTIONS],[
|
||||
AC_DEFUN([OMPI_CXX_HAVE_EXCEPTIONS],[
|
||||
#
|
||||
# Arguments: None
|
||||
#
|
||||
|
@ -11,6 +11,7 @@ dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -22,7 +23,7 @@ dnl
|
||||
# interested in. If so, then save it away. Otherwise, the string is
|
||||
# set to unknown.
|
||||
|
||||
define([OMPI_PS_FLAVOR_CHECK],[
|
||||
AC_DEFUN([OMPI_PS_FLAVOR_CHECK],[
|
||||
AC_MSG_CHECKING([for flavor of ps to use])
|
||||
PS_FLAVOR="unknown"
|
||||
ps -A -o fname > /dev/null 2>&1
|
||||
|
@ -9,6 +9,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -16,7 +17,7 @@ dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
define(OMPI_CHECK_PTHREAD_PIDS,[
|
||||
AC_DEFUN([OMPI_CHECK_PTHREAD_PIDS],[
|
||||
#
|
||||
# Arguments: none
|
||||
#
|
||||
@ -29,9 +30,6 @@ define(OMPI_CHECK_PTHREAD_PIDS,[
|
||||
# getpid() differently in the case of a Linux-like threads model.
|
||||
#
|
||||
|
||||
AH_TEMPLATE([OMPI_THREADS_HAVE_DIFFERENT_PIDS],
|
||||
[Do threads have different pids (pthreads on linux)])
|
||||
|
||||
AC_MSG_CHECKING([if threads have different pids (pthreads on linux)])
|
||||
CFLAGS_save="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $THREAD_CFLAGS"
|
||||
|
@ -9,6 +9,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -116,6 +117,9 @@ AC_MSG_RESULT($THREAD_TYPE)
|
||||
#
|
||||
# Blah - this should be made better, but I don't know how...
|
||||
#
|
||||
AH_TEMPLATE([OMPI_THREADS_HAVE_DIFFERENT_PIDS],
|
||||
[Do threads have different pids (pthreads on linux)])
|
||||
|
||||
if test "$THREAD_TYPE" = "solaris"; then
|
||||
AC_DEFINE(OMPI_HAVE_SOLARIS_THREADS, 1)
|
||||
AC_DEFINE(OMPI_HAVE_POSIX_THREADS, 0)
|
||||
|
@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -17,7 +18,7 @@ dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
define(OMPI_MAKE_STRIPPED_FLAGS,[
|
||||
AC_DEFUN([OMPI_MAKE_STRIPPED_FLAGS],[
|
||||
|
||||
# Process a set of flags and remove all debugging and optimization
|
||||
# flags
|
||||
|
Loading…
x
Reference in New Issue
Block a user