[cgma-dev] r3264 - in cgm/trunk: . m4
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Mon Nov 2 16:23:20 CST 2009
Author: kraftche
Date: 2009-11-02 16:23:19 -0600 (Mon, 02 Nov 2009)
New Revision: 3264
Modified:
cgm/trunk/configure.ac
cgm/trunk/m4/acis.m4
cgm/trunk/m4/boost.m4
cgm/trunk/m4/compiler.m4
cgm/trunk/m4/cplusplus.m4
cgm/trunk/m4/hdf5.m4
cgm/trunk/m4/makevar.m4
cgm/trunk/m4/netcdf.m4
Log:
s/SNL_/FATHOM_/ in autoconf macros
Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/configure.ac 2009-11-02 22:23:19 UTC (rev 3264)
@@ -9,13 +9,13 @@
AC_DISABLE_SHARED
EXTRA_GNU_FLAGS="-Wall -pipe -pedantic"
-SNL_CHECK_COMPILERS
+FATHOM_CHECK_COMPILERS
AC_PROG_LIBTOOL
LIBS="-lm"
AC_PROG_SED
AC_C_BIGENDIAN( [LITTLE_ENDIAN=], [LITTLE_ENDIAN=-DLITTLE_ENDIAN=BYTE_ORDER] )
AC_SUBST(LITTLE_ENDIAN)
-SNL_COMPILER_FLAGS
+FATHOM_COMPILER_FLAGS
################################################################################
# Fortran Stuff for ITAPS C bindings
@@ -65,8 +65,8 @@
# CGM-specific Checks
################################################################################
-SNL_CANT_USE_STD
-SNL_TEMPLATE_DEFS_INCLUDED
+FATHOM_CANT_USE_STD
+FATHOM_TEMPLATE_DEFS_INCLUDED
AC_SUBST(CANT_USE_STD)
AC_SUBST(CANT_USE_STD_IO)
AC_SUBST(TEMPLATE_DEFS_INCLUDED)
@@ -209,9 +209,9 @@
[AC_MSG_ERROR([ACIS source not present. Checkout ACIS_SRC and move to ACIS])] )
if test "$ACIS_DIR" == "yes"; then ACIS_DIR=.; fi
- SNL_ACIS_ENV
+ FATHOM_ACIS_ENV
- SNL_ACIS_TRANSLATOR
+ FATHOM_ACIS_TRANSLATOR
if test x$ACIS_STEP_TRANSLATOR != x; then
ACIS_LIBS="$ACIS_LIBS $ACIS_STEP_LIBS"
ACIS_XLIBS="$ACIS_XLATE_LIBS"
Modified: cgm/trunk/m4/acis.m4
===================================================================
--- cgm/trunk/m4/acis.m4 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/m4/acis.m4 2009-11-02 22:23:19 UTC (rev 3264)
@@ -11,7 +11,7 @@
# If ACIS_VERSION is set, the corresponding test
# will be skipped.
#######################################################################################
-AC_DEFUN([SNL_ACIS_ENV], [
+AC_DEFUN([FATHOM_ACIS_ENV], [
AC_CHECK_FILE([$ACIS_DIR/include/acis.hxx], [], [AC_MSG_ERROR("Invalid ACIS path")])
@@ -32,13 +32,13 @@
*_debug)
;;
*)
- SNL_ACIS_LIBDIR( [$dir] )
+ FATHOM_ACIS_LIBDIR( [$dir] )
;;
esac
# next try debug libraries
case "$dir" in
*_debug)
- SNL_ACIS_LIBDIR( [$dir] )
+ FATHOM_ACIS_LIBDIR( [$dir] )
;;
esac
done
@@ -104,8 +104,8 @@
#######################################################################################
# Macro to check for ACIS translators.
#######################################################################################
-AC_DEFUN([SNL_ACIS_TRANSLATOR], [
-AC_REQUIRE([SNL_ACIS_ENV])
+AC_DEFUN([FATHOM_ACIS_TRANSLATOR], [
+AC_REQUIRE([FATHOM_ACIS_ENV])
case "$ACIS_VERSION" in
11??)
ACIS_XLATE_LIBS='-lxacis2k -lxcore2k -lxutil'
@@ -143,7 +143,7 @@
# If ACIS_VERSION is alreay set, it will NOT be modified by
# this function.
#######################################################################################
-AC_DEFUN([SNL_ACIS_LIBDIR], [
+AC_DEFUN([FATHOM_ACIS_LIBDIR], [
AC_REQUIRE([AC_PROG_LIBTOOL])
AC_LANG_PUSH([C++])
snl_acis_libdir=$1
@@ -185,4 +185,4 @@
fi
], [snl_acis_link_success=no])
AC_LANG_POP
-]) # SNL_ACIS_LIBDIR
+]) # FATHOM_ACIS_LIBDIR
Modified: cgm/trunk/m4/boost.m4
===================================================================
--- cgm/trunk/m4/boost.m4 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/m4/boost.m4 2009-11-02 22:23:19 UTC (rev 3264)
@@ -4,9 +4,9 @@
# Unless user specified --without-boost, will check for any passed headers.
# For any found headers, -DHAVE_[header] will be added to DEFINES
#######################################################################################
-AC_DEFUN([SNL_CHECK_BOOST],[
+AC_DEFUN([FATHOM_CHECK_BOOST],[
AC_MSG_CHECKING([if boost library is enabled])
-SNL_BOOST_OPT_HEADER_LIST="$1"
+FATHOM_BOOST_OPT_HEADER_LIST="$1"
AC_ARG_WITH(boost,
[AC_HELP_STRING([--with-boost=DIR], [Specify directory where boost is installed])
AC_HELP_STRING([--without-boost], [Disable support for boost libraries])],
@@ -27,4 +27,4 @@
AC_CHECK_HEADERS( [$SNL_BOOST_OPT_HEADER_LIST],[def=`echo "$ac_header" | $as_tr_cpp`; DEFINES="$DEFINES -DHAVE_$def"] )
AC_LANG_RESTORE
fi
-]) # SNL_CHECK_BOOST
+]) # FATHOM_CHECK_BOOST
Modified: cgm/trunk/m4/compiler.m4
===================================================================
--- cgm/trunk/m4/compiler.m4 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/m4/compiler.m4 2009-11-02 22:23:19 UTC (rev 3264)
@@ -30,7 +30,7 @@
# - test for C++ compiler
# - test for Fortran compiler
#######################################################################################
-AC_DEFUN([SNL_CHECK_COMPILERS], [
+AC_DEFUN([FATHOM_CHECK_COMPILERS], [
CHECK_CC="$1"
CHECK_CXX="$2"
@@ -123,7 +123,7 @@
AC_PROG_F77( [$F77_LIST] )
fi
-]) # SNL_CHECK_COMPILERS
+]) # FATHOM_CHECK_COMPILERS
@@ -134,14 +134,14 @@
# CXXFLAGS - C++ compiler flags
#
#######################################################################################
-AC_DEFUN([SNL_COMPILER_FLAGS], [
+AC_DEFUN([FATHOM_COMPILER_FLAGS], [
if test "xno" != "x$CHECK_CC"; then
- SNL_CC_FLAGS
+ FATHOM_CC_FLAGS
fi
if test "xno" != "x$CHECK_CXX"; then
- SNL_CXX_FLAGS
+ FATHOM_CXX_FLAGS
fi
@@ -206,7 +206,7 @@
fi
# Check for 32/64 bit.
- # This requires SNL_CXX_FLAGS and SNL_CC_FLAGS to have been called first
+ # This requires FATHOM_CXX_FLAGS and FATHOM_CC_FLAGS to have been called first
AC_ARG_ENABLE( 32bit, AC_HELP_STRING([--enable-32bit],[Force 32-bit objects]),
[
if test "xyes" != "x$enableval"; then
@@ -220,7 +220,7 @@
CFLAGS="$CFLAGS $SNL_CC_32BIT"
enable_32bit=yes
])
-# This requires SNL_CXX_FLAGS and SNL_CC_FLAGS to have been called first
+# This requires FATHOM_CXX_FLAGS and FATHOM_CC_FLAGS to have been called first
AC_ARG_ENABLE( 64bit, AC_HELP_STRING([--enable-64bit],[Force 64-bit objects]),
[
if test "xyes" != "x$enableval"; then
@@ -236,7 +236,7 @@
CFLAGS="$CFLAGS $SNL_CC_64BIT"
])
-]) # SNL_COMPILER_FLAGS
+]) # FATHOM_COMPILER_FLAGS
#######################################################################################
# *******************************************************************************
@@ -251,7 +251,7 @@
# - action upon success
# - action upon failure
#################################################################################
-AC_DEFUN([SNL_TRY_COMPILER_DEFINE], [
+AC_DEFUN([FATHOM_TRY_COMPILER_DEFINE], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM( [[#ifndef $1
choke me
@@ -263,11 +263,11 @@
#######################################################################################
# Check for compiler-specific flags.
# Sets the following environmental variables:
-# SNL_CXX_SPECIAL : Any compiler-specific flags which must be specified
-# SNL_CXX_32BIT : Flag to force compilation of 32-bit code
-# SNL_CXX_64BIT : Flag to force compilation of 64-bit code
+# FATHOM_CXX_SPECIAL : Any compiler-specific flags which must be specified
+# FATHOM_CXX_32BIT : Flag to force compilation of 32-bit code
+# FATHOM_CXX_64BIT : Flag to force compilation of 64-bit code
#######################################################################################
-AC_DEFUN([SNL_CXX_FLAGS], [
+AC_DEFUN([FATHOM_CXX_FLAGS], [
AC_LANG_PUSH([C++])
# Detect compiler
@@ -276,41 +276,41 @@
if test x$GXX = xyes; then
cxx_compiler=GNU
# Intel claims to be GCC, check for it here
- SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel])
+ FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel])
# Search for other compiler types
# For efficiency, limit checks to relevant OSs
else
cxx_compiler=unknown
case "$target_os" in
aix*)
- SNL_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge])
+ FATHOM_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge])
;;
solaris*|sunos*)
- SNL_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop])
+ FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop])
;;
irix*)
- SNL_TRY_COMPILER_DEFINE([__sgi],[cxx_compiler=MIPSpro])
+ FATHOM_TRY_COMPILER_DEFINE([__sgi],[cxx_compiler=MIPSpro])
;;
linux*)
- SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel])
- SNL_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge])
- SNL_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq])
- SNL_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop])
- SNL_TRY_COMPILER_DEFINE([__PGI],[cxx_cmopiler=PortlandGroup])
+ FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel])
+ FATHOM_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge])
+ FATHOM_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq])
+ FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop])
+ FATHOM_TRY_COMPILER_DEFINE([__PGI],[cxx_cmopiler=PortlandGroup])
;;
hpux*)
- SNL_TRY_COMPILER_DEFINE([__HP_aCC],[cxx_compiler=HP])
+ FATHOM_TRY_COMPILER_DEFINE([__HP_aCC],[cxx_compiler=HP])
;;
windows*)
- SNL_TRY_COMPILER_DEFINE([__MSC_VER],[cxx_compiler=VisualStudio])
- SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel])
- SNL_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq])
- SNL_TRY_COMPILER_DEFINE([__BORLANDC__],[cxx_compiler=Borland])
- SNL_TRY_COMPILER_DEFINE([__CYGWIN__],[cxx_compiler=Cygwin])
- SNL_TRY_COMPILER_DEFINE([__MINGW32__],[cxx_compiler=MinGW])
+ FATHOM_TRY_COMPILER_DEFINE([__MSC_VER],[cxx_compiler=VisualStudio])
+ FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel])
+ FATHOM_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq])
+ FATHOM_TRY_COMPILER_DEFINE([__BORLANDC__],[cxx_compiler=Borland])
+ FATHOM_TRY_COMPILER_DEFINE([__CYGWIN__],[cxx_compiler=Cygwin])
+ FATHOM_TRY_COMPILER_DEFINE([__MINGW32__],[cxx_compiler=MinGW])
;;
*)
- SNL_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup])
+ FATHOM_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup])
;;
esac
fi
@@ -325,80 +325,80 @@
AC_MSG_CHECKING([for known compiler/OS combinations])
case "$cxx_compiler:$host_cpu" in
GNU:sparc*)
- SNL_CXX_32BIT=-m32
- SNL_CXX_64BIT=-m64
- SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CXX_32BIT=-m32
+ FATHOM_CXX_64BIT=-m64
+ FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
;;
GNU:powerpc*)
- SNL_CXX_32BIT=-m32
- SNL_CXX_64BIT=-m64
- SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CXX_32BIT=-m32
+ FATHOM_CXX_64BIT=-m64
+ FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
;;
GNU:i?86|GNU:x86_64)
- SNL_CXX_32BIT=-m32
- SNL_CXX_64BIT=-m64
- SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CXX_32BIT=-m32
+ FATHOM_CXX_64BIT=-m64
+ FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
;;
GNU:mips*)
- SNL_CXX_32BIT="-mips32 -mabi=32"
- SNL_CXX_64BIT="-mips64 -mabi=64"
- SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CXX_32BIT="-mips32 -mabi=32"
+ FATHOM_CXX_64BIT="-mips64 -mabi=64"
+ FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
;;
GNU:*)
- SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS"
;;
Intel:*)
- SNL_CXX_32BIT=-m32
- SNL_CXX_64BIT=-m64
- SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383"
+ FATHOM_CXX_32BIT=-m32
+ FATHOM_CXX_64BIT=-m64
+ FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383"
;;
VisualAge:*)
- SNL_CXX_32BIT=-q32
- SNL_CXX_64BIT=-q64
+ FATHOM_CXX_32BIT=-q32
+ FATHOM_CXX_64BIT=-q64
# Do V5.0 namemangling for compatibility with ACIS, and enable RTTI
case "$target_vendor" in
bgp)
- SNL_CXX_SPECIAL=""
+ FATHOM_CXX_SPECIAL=""
AR="ar"
NM="nm -B"
;;
*)
- SNL_CXX_SPECIAL="-qrtti=all -qnamemangling=v5"
+ FATHOM_CXX_SPECIAL="-qrtti=all -qnamemangling=v5"
AR="ar"
NM="nm -B -X 32_64"
;;
esac
;;
MIPSpro:mips)
- SNL_CXX_32BIT=-n32
- SNL_CXX_64BIT=-64
- SNL_CXX_SPECIAL=-LANG:std
+ FATHOM_CXX_32BIT=-n32
+ FATHOM_CXX_64BIT=-64
+ FATHOM_CXX_SPECIAL=-LANG:std
;;
MIPSpro:*)
- SNL_CXX_SPECIAL=-LANG:std
+ FATHOM_CXX_SPECIAL=-LANG:std
;;
SunWorkshop:sparc*)
- SNL_CXX_32BIT=-xarch=generic
- SNL_CXX_64BIT=-xarch=generic64
+ FATHOM_CXX_32BIT=-xarch=generic
+ FATHOM_CXX_64BIT=-xarch=generic64
;;
SunWorkshop:i?86|SunWorkshop:x86_64)
- SNL_CXX_32BIT=-m32
- SNL_CXX_64BIT=-m64
+ FATHOM_CXX_32BIT=-m32
+ FATHOM_CXX_64BIT=-m64
;;
*)
;;
esac
AC_MSG_RESULT([$cxx_compiler:$host_cpu])
-]) # end SNL_CXX_FLAGS
+]) # end FATHOM_CXX_FLAGS
#######################################################################################
# Check for compiler-specific flags.
# Sets the following environmental variables:
-# SNL_CC_SPECIAL : Any compiler-specific flags which must be specified
-# SNL_CC_32BIT : Flag to force compilation of 32-bit code
-# SNL_CC_64BIT : Flag to force compilation of 64-bit code
+# FATHOM_CC_SPECIAL : Any compiler-specific flags which must be specified
+# FATHOM_CC_32BIT : Flag to force compilation of 32-bit code
+# FATHOM_CC_64BIT : Flag to force compilation of 64-bit code
#######################################################################################
-AC_DEFUN([SNL_CC_FLAGS], [
+AC_DEFUN([FATHOM_CC_FLAGS], [
AC_LANG_PUSH([C])
# Detect compiler
@@ -408,42 +408,42 @@
if test x$GCC = xyes; then
cc_compiler=GNU
# Intel claims to be GCC, check for it here
- SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel])
+ FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel])
# Search for other compiler types
# For efficiency, limit checks to relevant OSs
else
cc_compiler=unknown
case "$target_os" in
aix*)
- SNL_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge])
+ FATHOM_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge])
;;
solaris*|sunos*)
- SNL_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop])
+ FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop])
;;
irix*)
- SNL_TRY_COMPILER_DEFINE([__sgi],[cc_compiler=MIPSpro])
+ FATHOM_TRY_COMPILER_DEFINE([__sgi],[cc_compiler=MIPSpro])
;;
linux*)
- SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel])
- SNL_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge])
- SNL_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq])
- SNL_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop])
- SNL_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup])
+ FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel])
+ FATHOM_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge])
+ FATHOM_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq])
+ FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop])
+ FATHOM_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup])
;;
hpux*)
- SNL_TRY_COMPILER_DEFINE([__HP_cc],[cc_compiler=HP])
+ FATHOM_TRY_COMPILER_DEFINE([__HP_cc],[cc_compiler=HP])
;;
windows*)
- SNL_TRY_COMPILER_DEFINE([__MSC_VER],[cc_compiler=VisualStudio])
- SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel])
- SNL_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq])
- SNL_TRY_COMPILER_DEFINE([__BORLANDC__],[cc_compiler=Borland])
- SNL_TRY_COMPILER_DEFINE([__TURBOC__],[cc_compiler=TurboC])
- SNL_TRY_COMPILER_DEFINE([__CYGWIN__],[cc_compiler=Cygwin])
- SNL_TRY_COMPILER_DEFINE([__MINGW32__],[cc_compiler=MinGW])
+ FATHOM_TRY_COMPILER_DEFINE([__MSC_VER],[cc_compiler=VisualStudio])
+ FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel])
+ FATHOM_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq])
+ FATHOM_TRY_COMPILER_DEFINE([__BORLANDC__],[cc_compiler=Borland])
+ FATHOM_TRY_COMPILER_DEFINE([__TURBOC__],[cc_compiler=TurboC])
+ FATHOM_TRY_COMPILER_DEFINE([__CYGWIN__],[cc_compiler=Cygwin])
+ FATHOM_TRY_COMPILER_DEFINE([__MINGW32__],[cc_compiler=MinGW])
;;
*)
- SNL_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup])
+ FATHOM_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup])
;;
esac
fi
@@ -457,67 +457,67 @@
AC_MSG_CHECKING([for known compiler/OS combinations])
case "$cc_compiler:$host_cpu" in
GNU:sparc*)
- SNL_CC_32BIT=-m32
- SNL_CC_64BIT=-m64
- SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CC_32BIT=-m32
+ FATHOM_CC_64BIT=-m64
+ FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS"
;;
GNU:powerpc*)
- SNL_CC_32BIT=-m32
- SNL_CC_64BIT=-m64
- SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CC_32BIT=-m32
+ FATHOM_CC_64BIT=-m64
+ FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS"
;;
GNU:i?86|GNU:x86_64)
- SNL_CC_32BIT=-m32
- SNL_CC_64BIT=-m64
- SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CC_32BIT=-m32
+ FATHOM_CC_64BIT=-m64
+ FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS"
;;
Intel:*)
- SNL_CC_32BIT=-m32
- SNL_CC_64BIT=-m64
- SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383"
+ FATHOM_CC_32BIT=-m32
+ FATHOM_CC_64BIT=-m64
+ FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383"
;;
GNU:mips*)
- SNL_CC_32BIT="-mips32 -mabi=32"
- SNL_CC_64BIT="-mips64 -mabi=64"
- SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CC_32BIT="-mips32 -mabi=32"
+ FATHOM_CC_64BIT="-mips64 -mabi=64"
+ FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS"
;;
GNU:*)
- SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS"
+ FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS"
;;
VisualAge:*)
case "$target_vendor" in
bgp)
- SNL_CC_32BIT=-q32
- SNL_CC_64BIT=-q64
+ FATHOM_CC_32BIT=-q32
+ FATHOM_CC_64BIT=-q64
AR="ar"
NM="nm -B"
;;
*)
- SNL_CC_32BIT=-q32
- SNL_CC_64BIT=-q64
+ FATHOM_CC_32BIT=-q32
+ FATHOM_CC_64BIT=-q64
AR="ar -X 32_64"
NM="nm -B -X 32_64"
;;
esac
;;
MIPSpro:mips)
- SNL_CC_32BIT=-n32
- SNL_CC_64BIT=-64
- SNL_CC_SPECIAL=-LANG:std
+ FATHOM_CC_32BIT=-n32
+ FATHOM_CC_64BIT=-64
+ FATHOM_CC_SPECIAL=-LANG:std
;;
MIPSpro:*)
- SNL_CC_SPECIAL=-LANG:std
+ FATHOM_CC_SPECIAL=-LANG:std
;;
SunWorkshop:sparc*)
- SNL_CC_32BIT=-xarch=generic
- SNL_CC_64BIT=-xarch=generic64
+ FATHOM_CC_32BIT=-xarch=generic
+ FATHOM_CC_64BIT=-xarch=generic64
;;
SunWorkshop:i?86|SunWorkshop:x86_64)
- SNL_CC_32BIT=-m32
- SNL_CC_64BIT=-m64
+ FATHOM_CC_32BIT=-m32
+ FATHOM_CC_64BIT=-m64
;;
*)
;;
esac
AC_MSG_RESULT([$cc_compiler:$host_cpu])
-]) # end SNL_CC_FLAGS
+]) # end FATHOM_CC_FLAGS
Modified: cgm/trunk/m4/cplusplus.m4
===================================================================
--- cgm/trunk/m4/cplusplus.m4 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/m4/cplusplus.m4 2009-11-02 22:23:19 UTC (rev 3264)
@@ -44,7 +44,7 @@
# exist or do not define symbols to be in the "std" namespace.
# For example: if this is defined, #include <iostrea.h> rather than <iostream>
#######################################################################################
-AC_DEFUN([SNL_CANT_USE_STD], [
+AC_DEFUN([FATHOM_CANT_USE_STD], [
AC_CACHE_CHECK([for C++-standard library in std:: namespace],
[snl_cv_cxx_stl_in_std],
@@ -85,7 +85,7 @@
CANT_USE_STD_IO=
fi
-]) # SNL_CANT_USE_STD
+]) # FATHOM_CANT_USE_STD
@@ -95,7 +95,7 @@
# included (in the .hpp files).
# Sets TEMPLATE_DEFS_INCLUDED=-DTEMPLATE_DEFS_INCLUDED
#######################################################################################
-AC_DEFUN([SNL_TEMPLATE_DEFS_INCLUDED], [
+AC_DEFUN([FATHOM_TEMPLATE_DEFS_INCLUDED], [
AC_CACHE_CHECK([if C++ template definitions should be included],
[snl_cv_cxx_template_defs_included],
@@ -125,13 +125,13 @@
TEMPLATE_DEFS_INCLUDED=
fi
-]) # SNL_TEMPLATE_DEFS_INCLUDED
+]) # FATHOM_TEMPLATE_DEFS_INCLUDED
#######################################################################################
# Check if compiler supports template class specialization.
# Sets TEMPLATE_SPECIALIZATION=-DTEMPLATE_SPECIALIZATION
#######################################################################################
-AC_DEFUN([SNL_TEMPLATE_SPECIALIZATION], [
+AC_DEFUN([FATHOM_TEMPLATE_SPECIALIZATION], [
AC_CACHE_CHECK([if C++ compiler supports template class specialization],
[snl_cv_template_specialization],
[AC_LANG_SAVE
@@ -148,13 +148,13 @@
TEMPLATE_SPECIALIZATION=-DTEMPLATE_SPECIALIZATION
fi
-]) # SNL_TEMPLATE_SPECIALIZATION
+]) # FATHOM_TEMPLATE_SPECIALIZATION
#######################################################################################
# Check if compiler supports template function specialization.
# Sets TEMPLATE_FUNC_SPECIALIZATION=-DTEMPLATE_FUNC_SPECIALIZATION
#######################################################################################
-AC_DEFUN([SNL_TEMPLATE_FUNC_SPECIALIZATION], [
+AC_DEFUN([FATHOM_TEMPLATE_FUNC_SPECIALIZATION], [
AC_CACHE_CHECK([if C++ compiler supports template function specialization],
[snl_cv_template_func_specialization],
[AC_LANG_SAVE
@@ -172,4 +172,4 @@
TEMPLATE_FUNC_SPECIALIZATION=-DTEMPLATE_FUNC_SPECIALIZATION
fi
-]) # SNL_TEMPLATE_FUNC_SPECIALIZATION
+]) # FATHOM_TEMPLATE_FUNC_SPECIALIZATION
Modified: cgm/trunk/m4/hdf5.m4
===================================================================
--- cgm/trunk/m4/hdf5.m4 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/m4/hdf5.m4 2009-11-02 22:23:19 UTC (rev 3264)
@@ -6,7 +6,7 @@
# HDF5_LDFLAGS
# HDF5_LIBS
#######################################################################################
-AC_DEFUN([SNL_CHECK_HDF5],[
+AC_DEFUN([FATHOM_CHECK_HDF5],[
# CLI option for linking zlib
AC_ARG_WITH(zlib,
@@ -184,4 +184,4 @@
fi
-]) # SNL_CHECK_HDF5
+]) # FATHOM_CHECK_HDF5
Modified: cgm/trunk/m4/makevar.m4
===================================================================
--- cgm/trunk/m4/makevar.m4 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/m4/makevar.m4 2009-11-02 22:23:19 UTC (rev 3264)
@@ -7,7 +7,7 @@
# of the variable)
# - Action on failure
#######################################################################################
-AC_DEFUN([SNL_MAKE_INC_VAR], [
+AC_DEFUN([FATHOM_MAKE_INC_VAR], [
make_val=
snl_makefile="snl_check.mak"
rm -f $snl_makefile
@@ -16,12 +16,12 @@
AC_MSG_WARN([File not found: $1])
$4
else
-cat >$snl_makefile <<SNL_END_OF_MAKEFILE
+cat >$snl_makefile <<FATHOM_END_OF_MAKEFILE
default:
@echo "\$($2)"
include $1
-SNL_END_OF_MAKEFILE
+FATHOM_END_OF_MAKEFILE
if make -f $snl_makefile > /dev/null 2>&1; then
make_val=`make -s -f $snl_makefile`
rm -f $snl_makefile
Modified: cgm/trunk/m4/netcdf.m4
===================================================================
--- cgm/trunk/m4/netcdf.m4 2009-11-02 22:18:42 UTC (rev 3263)
+++ cgm/trunk/m4/netcdf.m4 2009-11-02 22:23:19 UTC (rev 3264)
@@ -6,7 +6,7 @@
# NETCDF_LDFLAGS
# NETCDF_LIBS
#######################################################################################
-AC_DEFUN([SNL_CHECK_NETCDF],[
+AC_DEFUN([FATHOM_CHECK_NETCDF],[
AC_MSG_CHECKING([if NetCDF support is enabled])
AC_ARG_WITH(netcdf,
@@ -110,4 +110,4 @@
fi
fi
-]) # SNL_HAVE_NETCDF
+]) # FATHOM_HAVE_NETCDF
More information about the cgma-dev
mailing list