Commit 42988ff0 authored by vijaysm's avatar vijaysm
Browse files

Ran configure.ac through autoupdate (2.68) and fixed all obsolete function...

Ran configure.ac through autoupdate (2.68) and fixed all obsolete function calls and cleaned up configure.
parent 4f271a5f
......@@ -8,8 +8,8 @@ AC_DEFUN([FATHOM_CHECK_BOOST],[
AC_MSG_CHECKING([if boost library is enabled])
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])],
[AS_HELP_STRING([--with-boost=DIR], [Specify directory where boost is installed])
AS_HELP_STRING([--without-boost], [Disable support for boost libraries])],
[BOOST_ARG=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-boost=\"${withval}\""
]
......
......@@ -10,8 +10,8 @@ AC_DEFUN([FATHOM_CHECK_CCMIO],[
AC_MSG_CHECKING([if CCMIO support is enabled])
AC_ARG_WITH(ccmio,
[AC_HELP_STRING([--with-ccmio=DIR], [Specify CCMIO location])
AC_HELP_STRING([--without-ccmio], [Disable support for CCMIO file format])],
[AS_HELP_STRING([--with-ccmio=DIR], [Specify CCMIO location])
AS_HELP_STRING([--without-ccmio], [Disable support for CCMIO file format])],
[CCMIO_ARG=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-ccmio=\"${withval}\""
]
......
......@@ -10,8 +10,8 @@ AC_DEFUN([FATHOM_CHECK_CGNS],[
AC_MSG_CHECKING([if CGNS support is enabled])
AC_ARG_WITH(cgns,
[AC_HELP_STRING([--with-cgns<:@=DIR@:>@], [Specify CGNS library to use for CGNS file format])
AC_HELP_STRING([--without-cgns], [Disable support for CGNS file format])],
[AS_HELP_STRING([--with-cgns<:@=DIR@:>@], [Specify CGNS library to use for CGNS file format])
AS_HELP_STRING([--without-cgns], [Disable support for CGNS file format])],
[CGNS_ARG=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-cgns=\"${withval}\""
]
......
......@@ -98,7 +98,7 @@ USER_FFLAGS="$FFLAGS"
# Check for Parallel
# Need to check this early so we can look for the correct compiler
AC_ARG_WITH( [mpi], AC_HELP_STRING([[--with-mpi@<:@=DIR@:>@]], [Enable parallel support]),
AC_ARG_WITH( [mpi], AS_HELP_STRING([[--with-mpi@<:@=DIR@:>@]], [Enable parallel support]),
[WITH_MPI=$withval; enablempi=yes],[enablempi=no;WITH_MPI=$MPI_DIR] )
if test "xno" != "x$enablempi"; then
......@@ -186,9 +186,9 @@ FCFLAGS="$USER_FCFLAGS $FATHOM_FC_SPECIAL"
#fi
# Check for debug flags
AC_ARG_ENABLE( debug, AC_HELP_STRING([--enable-debug],[Debug symbols (-g)]),
AC_ARG_ENABLE( debug, AS_HELP_STRING([--enable-debug],[Debug symbols (-g)]),
[enable_debug=$enableval], [enable_debug=] )
AC_ARG_ENABLE( optimize, AC_HELP_STRING([--enable-optimize],[Compile optimized (-O2)]),
AC_ARG_ENABLE( optimize, AS_HELP_STRING([--enable-optimize],[Compile optimized (-O2)]),
[enable_cxx_optimize=$enableval; enable_cc_optimize=$enableval; enable_fc_optimize=$enableval;],
[enable_cxx_optimize=""; enable_cc_optimize=""; enable_fc_optimize=""; ]
)
......@@ -246,7 +246,7 @@ fi
# Check for 32/64 bit.
# 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]),
AC_ARG_ENABLE(32bit, AS_HELP_STRING([--enable-32bit],[Force 32-bit objects]),
[
if (test "xyes" != "x$enableval" && test "xno" != "x$enableval"); then
AC_MSG_ERROR([Unknown argument --enable-32bit=$enableval])
......@@ -262,7 +262,7 @@ AC_ARG_ENABLE(32bit, AC_HELP_STRING([--enable-32bit],[Force 32-bit objects]),
], [enable_32bit=no])
# 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]),
AC_ARG_ENABLE(64bit, AS_HELP_STRING([--enable-64bit],[Force 64-bit objects]),
[
if (test "xyes" != "x$enableval" && test "xno" != "x$enableval"); then
AC_MSG_ERROR([Unknown argument --enable-64bit=$enableval])
......
......@@ -10,8 +10,8 @@ AC_DEFUN([FATHOM_CHECK_DAMSEL],[
AC_MSG_CHECKING([if DAMSEL support is enabled])
AC_ARG_WITH(damsel,
[AC_HELP_STRING([--with-damsel=DIR], [Specify DAMSEL location])
AC_HELP_STRING([--without-damsel], [Disable support for DAMSEL file format])],
[AS_HELP_STRING([--with-damsel=DIR], [Specify DAMSEL location])
AS_HELP_STRING([--without-damsel], [Disable support for DAMSEL file format])],
[DAMSEL_ARG=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-damsel=\"${withval}\""
]
......
......@@ -47,7 +47,7 @@ AC_DEFUN([FATHOM_CHECK_HDF5],[
# CLI option for linking zlib
AC_ARG_WITH(zlib,
[AC_HELP_STRING([--with-zlib=DIR],[HDF5 requires zlib, and zlib can be found at...])],
[AS_HELP_STRING([--with-zlib=DIR],[HDF5 requires zlib, and zlib can be found at...])],
[WITH_ZLIB=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-zlib=\"${withval}\""
],[WITH_ZLIB=])
......@@ -72,7 +72,7 @@ fi
# CLI option for linking szip
AC_ARG_WITH(szip,
[AC_HELP_STRING([--with-szip=DIR],[HDF5 requires szip, and szip an be found at...])],
[AS_HELP_STRING([--with-szip=DIR],[HDF5 requires szip, and szip an be found at...])],
[WITH_SZIP=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-szip=\"${withval}\""
],[WITH_SZIP=])
......@@ -96,7 +96,7 @@ if test "x$WITH_SZIP" != "xno"; then
fi
# CLI option for extra HDF5 link flags
AC_ARG_WITH([hdf5-ldflags],[AC_HELP_STRING([--with-hdf5-ldflags=...],
AC_ARG_WITH([hdf5-ldflags],[AS_HELP_STRING([--with-hdf5-ldflags=...],
[Extra LDFLAGS required for HDF5 library (e.g. parallel IO lib)])],
[HDF5_LDFLAGS_WITHVAL="$withval";
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-hdf5-ldflags=\"${withval}\""
......@@ -117,8 +117,8 @@ esac
# CLI option for HDF5
AC_MSG_CHECKING([if HDF5 support is enabled])
AC_ARG_WITH(hdf5,
[AC_HELP_STRING([--with-hdf5@<:@=DIR@:>@], [Specify HDF5 library to use for native file format])
AC_HELP_STRING([--without-hdf5], [Disable support for native HDF5 file format])],
[AS_HELP_STRING([--with-hdf5@<:@=DIR@:>@], [Specify HDF5 library to use for native file format])
AS_HELP_STRING([--without-hdf5], [Disable support for native HDF5 file format])],
[HDF5_ARG=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-hdf5=\"${withval}\""
], [HDF5_ARG=])
......
......@@ -6,7 +6,7 @@
#######################################################################################
AC_DEFUN([FATHOM_CHECK_MPE], [
AC_ARG_ENABLE([mpe],
[AC_HELP_STRING([--enable-mpe],
[AS_HELP_STRING([--enable-mpe],
[Enable use of MPE library for tracing/logging MPI communication])],
[WITH_MPE=$enableval],[WITH_MPE=no])
AC_LANG_PUSH([C])
......
......@@ -51,8 +51,8 @@ AC_DEFUN([FATHOM_CHECK_NETCDF],[
AC_MSG_CHECKING([if NetCDF support is enabled])
AC_ARG_WITH(netcdf,
[AC_HELP_STRING([--with-netcdf@<:@=DIR@:>@], [Specify NetCDF library to use for ExodusII file format])
AC_HELP_STRING([--without-netcdf], [Disable support for ExodusII file format])],
[AS_HELP_STRING([--with-netcdf@<:@=DIR@:>@], [Specify NetCDF library to use for ExodusII file format])
AS_HELP_STRING([--without-netcdf], [Disable support for ExodusII file format])],
[NETCDF_ARG=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-netcdf=\"${withval}\""
]
......@@ -149,8 +149,8 @@ fi
AC_DEFUN([FATHOM_CHECK_PNETCDF],[
AC_ARG_WITH(pnetcdf,
[AC_HELP_STRING([--with-pnetcdf@<:@=DIR@:>@], [Specify Pnetcdf library to use])
AC_HELP_STRING([--without-pnetcdf], [Disable support for Pnetcdf-based file formats])],
[AS_HELP_STRING([--with-pnetcdf@<:@=DIR@:>@], [Specify Pnetcdf library to use])
AS_HELP_STRING([--without-pnetcdf], [Disable support for Pnetcdf-based file formats])],
[PNETCDF_ARG=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-pnetcdf=\"${withval}\""
]
......
################################################################################
# Standard Stuff
################################################################################
AC_INIT(MOAB, 4.7.1pre)
AC_INIT([MOAB],[4.7.1pre])
AC_CONFIG_SRCDIR([moab.make.in])
AC_CONFIG_SRCDIR([MOABConfig.cmake.in])
AC_CONFIG_SRCDIR([examples/makefile.in])
AC_CONFIG_MACRO_DIR([config])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_SYSTEM
AC_CANONICAL_TARGET
m4_ifdef([AM_SILENT_RULES],
[AM_INIT_AUTOMAKE([color-tests parallel-tests])],
[AM_INIT_AUTOMAKE])
......@@ -17,7 +17,7 @@ AC_CHECK_PROG( [SED], [sed], [sed], [true] )
# Infer the source directory as the path to the ./configure script
#srcdir=`dirname $0`
#top_srcdir=`dirname $0`
USER_CONFIGURE_CMD="$0 $*"
USER_CONFIGURE_CMD="$0 $@"
################################################################################
# Compilers
......@@ -118,8 +118,7 @@ AM_CPPFLAGS="$AM_CPPFLAGS $NO_VECTOR_TEMPLATE_INSERT $OLD_STD_COUNT"
# No-Namepsace (3.0) Headers
################################################################################
AC_ARG_ENABLE([old-headers],
[AC_HELP_STRING([--disable-old-headers],
[Do not install no-namespace headers for compatability with MOAB 3.0 API])],
[AS_HELP_STRING([--disable-old-headers],[Do not install no-namespace headers for compatability with MOAB 3.0 API])],
[OLD_HEADERS=$enableval],[OLD_HEADERS=yes])
AM_CONDITIONAL([OLD_HEADERS],[test "xyes" = "x$OLD_HEADERS"])
......@@ -136,7 +135,7 @@ AC_CHECK_SIZEOF([void *])
SIZEOF_VOID_P=$ac_cv_sizeof_void_p
AC_SUBST(SIZEOF_VOID_P)
AC_ARG_ENABLE([64bit-handles],
[AC_HELP_STRING([--enable-64bit-handles],[Force EntityHandle to be 64 bits])],
[AS_HELP_STRING([--enable-64bit-handles],[Force EntityHandle to be 64 bits])],
[AC_CHECK_TYPE([uint64_t],
[AC_DEFINE(MOAB_FORCE_64_BIT_HANDLES,[],[Use int64_t for handles])
SIZEOF_MBENTITYHANDLE=8
......@@ -144,7 +143,7 @@ AC_ARG_ENABLE([64bit-handles],
[AC_MSG_ERROR([Platform does not have uint64_t. Cannot force 64-bit handles])])
])
AC_ARG_ENABLE([32bit-handles],
[AC_HELP_STRING([--enable-32bit-handles],[Force EntityHandle to be 32 bits])],
[AS_HELP_STRING([--enable-32bit-handles],[Force EntityHandle to be 32 bits])],
[AC_CHECK_TYPE([uint32_t],
[AC_DEFINE(MOAB_FORCE_32_BIT_HANDLES,[],[Use int32_t for handles])
SIZEOF_MBENTITYHANDLE=4
......@@ -191,7 +190,7 @@ AC_CHECK_LIB(m, pow, LIBS="$LIBS -lm")
# iMesh Part 1 of 2
################################################################################
AC_ARG_ENABLE( [imesh],
[AC_HELP_STRING([--disable-imesh],[Do not build support for iMesh interface.])],
[AS_HELP_STRING([--disable-imesh],[Do not build support for iMesh interface.])],
[disable_imesh=$enableval],
[disable_imesh=yes] )
......@@ -210,7 +209,7 @@ fi
# iGeom Part 1 of 2
################################################################################
AC_ARG_ENABLE( [igeom],
[AC_HELP_STRING([--enable-igeom],[Build mesh-based iGeom implementation])],
[AS_HELP_STRING([--enable-igeom],[Build mesh-based iGeom implementation])],
[enable_igeom=$enableval],[enable_igeom=no] )
if (test "xyes" != "x$enable_igeom" && test "xno" != "x$enable_igeom"); then
......@@ -481,10 +480,10 @@ AC_SUBST(CGNS_LIBS)
# Documentation
#################################################################################
AC_ARG_ENABLE([docs],
[AC_HELP_STRING([--enable-docs],[indicate to check for doxygen installation])],
[AS_HELP_STRING([--enable-docs],[indicate to check for doxygen installation])],
[ENABLE_DOCS=yes],[ENABLE_DOCS=no] )
AC_ARG_WITH([doxygen],
[AC_HELP_STRING([--with-doxygen=DIR], [Specify directory where Doxygen program is installed. By default, it is /usr/bin])],
[AS_HELP_STRING([--with-doxygen=DIR],[Specify directory where Doxygen program is installed. By default, it is /usr/bin])],
[WITH_DOXYGEN="$withval"], [WITH_DOXYGEN=no])
if test "x$WITH_DOXYGEN" != "xno"; then
......@@ -529,7 +528,7 @@ ZOLTAN_DEFAULT=no
# to the search path, with the assumption that the linker will ignore libraries
# for other architectures.
AC_ARG_WITH( [zoltan-arch],
[AC_HELP_STRING([--with-zoltan-arch=OS],[Specify zoltan architecture])],
[AS_HELP_STRING([--with-zoltan-arch=OS],[Specify zoltan architecture])],
[case "x$withval" in
xyes|xno)
AC_MSG_ERROR([Expeted value for --with-zoltan-arch])
......@@ -545,7 +544,7 @@ AC_ARG_WITH( [zoltan-arch],
# to search for Zoltan libs and headers. Specifying this also enables
# mbzoltan unless it is explicitly disabled.
AC_ARG_WITH( [zoltan],
[AC_HELP_STRING([--with-zoltan=DIR],[Enable Zoltan support, and optionally specify Zoltan location])],
[AS_HELP_STRING([--with-zoltan=DIR],[Enable Zoltan support, and optionally specify Zoltan location])],
[case "x$withval" in
xyes)
WITH_ZOLTAN=yes
......@@ -572,7 +571,7 @@ AC_ARG_WITH( [zoltan],
# parmetis, so the only thing the user would really need to tell
# us is if we need to look in some special place for it.
AC_ARG_WITH([parmetis],
[AC_HELP_STRING([--with-parmetis=DIR],[Directory containing Parmetis library for Zoltan])],
[AS_HELP_STRING([--with-parmetis=DIR],[Directory containing ParMetis library for Zoltan])],
[case "x$withval" in
xyes|xno)
# do nothing
......@@ -600,7 +599,7 @@ AC_ARG_WITH([parmetis],
# metis, so the only thing the user would really need to tell
# us is if we need to look in some special place for it.
AC_ARG_WITH([metis],
[AC_HELP_STRING([--with-metis=DIR],[Directory containing Parmetis library for Zoltan])],
[AS_HELP_STRING([--with-metis=DIR],[Directory containing Metis library for ParMetis/Zoltan])],
[case "x$withval" in
xyes|xno)
# do nothing
......@@ -626,7 +625,7 @@ AC_ARG_WITH([metis],
# to add an additional library search directory in which to check
# for the scotch library.
AC_ARG_WITH([scotch],
[AC_HELP_STRING([--with-scotch=DIR],[Directory containing Scotch library for Zoltan])],
[AS_HELP_STRING([--with-scotch=DIR],[Directory containing Scotch library for Zoltan])],
[SCOTCH_DIR="$withval"; enablescotch=yes],[SCOTCH_DIR=""; enablescotch=no] )
if (test "$enablescotch" != "no"); then
......@@ -666,7 +665,7 @@ fi
# to add an additional library search directory in which to check
# for the parallel scotch library.
AC_ARG_WITH([ptscotch],
[AC_HELP_STRING([--with-ptscotch=DIR],[Directory containing PTScotch library for Zoltan])],
[AS_HELP_STRING([--with-ptscotch=DIR],[Directory containing PTScotch library for Zoltan])],
[PTSCOTCH_DIR="$withval"; enableptscotch=yes],[PTSCOTCH_DIR="$SCOTCH_DIR"; enableptscotch=$enablescotch] )
if (test "$enableptscotch" != "no"); then
......@@ -703,13 +702,12 @@ if (test "$enableptscotch" != "no"); then
esac
fi
################################################################################
# Optional Libraries
################################################################################
AC_ARG_WITH([vtk],
[AC_HELP_STRING([--with-vtk@<:@=DIR@:>@], [Enable VTK support, and specify VTK location])],
[AS_HELP_STRING([--with-vtk@<:@=DIR@:>@],[Enable VTK support, and specify VTK location])],
[WITH_VTK=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-vtk=\"${withval}\""
],[WITH_VTK=])
......@@ -720,7 +718,7 @@ if (test "x$WITH_VTK" != "xno" && test "x$WITH_VTK" != "x"); then
fi
AC_ARG_WITH( [vtk-lib-suffix],
[AC_HELP_STRING([--with-vtk-lib-suffix=SUFFIX],[Specify optional suffix to VTK library names, e.g. -pv3.98])],
[AS_HELP_STRING([--with-vtk-lib-suffix=SUFFIX],[Specify optional suffix to VTK library names, e.g. -pv3.98])],
[case "x$withval" in
xyes)
AC_MSG_ERROR([Must specify a non-empty suffix!])
......@@ -754,8 +752,8 @@ AC_DEFUN([MB_OPTIONAL_TOOL],[
mb_default_$1=$3
fi
AC_ARG_ENABLE( [$1],
[AC_HELP_STRING([--enable-$1],[Build tool: $1])
AC_HELP_STRING([--disable-$1],[Don't build $1])],
[AS_HELP_STRING([--enable-$1],[Build tool: $1])
AS_HELP_STRING([--disable-$1],[Don't build $1])],
[ENABLE_$1=$enableval],[ENABLE_$1=${mb_default_$1}] )
AM_CONDITIONAL([ENABLE_$1],[test "x${ENABLE_$1}" != "xno"])
AC_MSG_CHECKING([if $1 is to be built])
......@@ -764,8 +762,8 @@ AC_HELP_STRING([--disable-$1],[Don't build $1])],
])
# The default for all tools
AC_ARG_ENABLE( [tools], [
AC_HELP_STRING([--enable-tools],[Build all tools by default])
AC_HELP_STRING([--disable-tools],[Disable all tools by default])],
AS_HELP_STRING([--enable-tools],[Build all tools by default])
AS_HELP_STRING([--disable-tools],[Disable all tools by default])],
[ENABLE_TOOLS=$enableval; DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-tools"],
[ENABLE_TOOLS=] )
# Individual tools
......@@ -908,7 +906,8 @@ dnl - Optional library path linker argument (e.g. -L/opt/foo)
AC_DEFUN([FATHOM_CHECK_LIB_LIST],[
old_LIBS="$LIBS"
LIBS="$5 ${$3} $old_LIBS"
AC_HAVE_LIBRARY([$1],[$3="-l$1 ${$3}"],[],[$4])
AC_CHECK_LIB([],[main],[$3="-l$1 ${$3}"],[],[$4])ac_cv_lib_=ac_cv_lib__main
LIBS="$old_LIBS"
])
......@@ -953,8 +952,7 @@ if (test "x$WITH_VTK" != "xno" && test "x$WITH_VTK" != "x"); then
AC_MSG_ERROR([X11 not found])
fi
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_LANG_PUSH([C++])
VTK_INCLUDES=
case "x$WITH_VTK" in
......@@ -1064,7 +1062,7 @@ if (test "x$WITH_VTK" != "xno" && test "x$WITH_VTK" != "x"); then
AC_MSG_ERROR("VTK library 'vtkCommonCore' not found.")
fi
AC_LANG_RESTORE
AC_LANG_POP([C++])
FATHOM_MERGE_LISTS([XLIBS_tmp],[$X_EXTRA_LIBS -lX11 $X_PRE_LIBS],[$vtk_x_libs])
FATHOM_MERGE_LISTS([XLIBS],[$vtk_sys_libs],[$XLIBS_tmp])
......@@ -1087,7 +1085,7 @@ if test $ENABLE_qvdual = yes; then
# GraphViz
################################################################################
AC_ARG_WITH([graphviz],
[AC_HELP_STRING([--with-graphviz=DIR], [Specify directory containing GraphViz])],
[AS_HELP_STRING([--with-graphviz=DIR],[Specify directory containing GraphViz])],
[GRAPH_DIR=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-graphviz=\"${withval}\""
],[GRAPH_DIR=])
......@@ -1169,8 +1167,7 @@ if test $ENABLE_qvdual = yes; then
################################################################################
# QT
################################################################################
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_LANG_PUSH([C++])
AC_ARG_VAR([QTDIR],[QT installation directory])
if test x"$QTDIR" = x; then
search_path="$PATH"
......@@ -1216,22 +1213,21 @@ if test $ENABLE_qvdual = yes; then
old_LIBS="$LIBS"
LIBS="$LIBS $qlibdir"
# Cannot use AC_HAVE_LIBRARY for qt-mt because of
# Cannot use CHECK-LIB here to loop over qt-mt because of
# autoconf bug with libraries that have a '-' in their name.
#AC_HAVE_LIBRARY([qt-mt],[QT_LIBS="$qlibdir -lqt-mt"],[
AC_MSG_CHECKING([for main in -lqt-mt])
QT_LIBS="$qlibdir -lqt-mt"
AC_TRY_LINK_FUNC(main,[AC_MSG_RESULT([yes])],[
AC_MSG_RESULT([no])
LIBS="$old_LIBS $qlibdir"
AC_HAVE_LIBRARY([qt],[QT_LIBS="$qlibdir -lqt"],[
QT_MISSING=yes
])
AC_CHECK_LIB([qt],[main],[QT_LIBS="$qlibdir -lqt"],[QT_MISSING=yes],[])ac_cv_lib_qt=ac_cv_lib_qt_main
])
LIBS="$VTK_LIBS $QT_LIBS"
AC_HAVE_LIBRARY([QVTK],[QT_LIBS="-lQVTL $QT_LIBS"],
[AC_MSG_ERROR([QVTK library for qvdual not found])])
AC_CHECK_LIB([QVTK],[main],[QT_LIBS="-lQVTL $QT_LIBS"],[AC_MSG_ERROR([QVTK library for qvdual not found])],[])ac_cv_lib_QVTK=ac_cv_lib_QVTK_main
LIBS="$old_LIBS"
AC_LANG_POP([C++])
################################################################################
# X/VTK/QT
......@@ -1247,7 +1243,7 @@ fi
# CGM
################################################################################
AC_ARG_WITH(cgm,
[AC_HELP_STRING([--with-cgm=DIR], [Specify directory containing CGM])],
[AS_HELP_STRING([--with-cgm=DIR],[Specify directory containing CGM])],
[CGM_DIR=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-cgm=\"${withval}\""
], [CGM_DIR=])
......@@ -1355,8 +1351,8 @@ AC_SUBST([EXPORT_LTFLAGS])
AC_SUBST([EXPORT_LDFLAGS])
AC_SUBST([AM_CXXFLAGS])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_FCFLAGS])
AC_SUBST([AM_FFLAGS])
AC_SUBST([AM_FCFLAGS])
AC_SUBST([AM_FFLAGS])
AC_ARG_VAR([FC], [FORTRAN compiler command])
AC_CONFIG_HEADERS([config.h])
......@@ -1485,27 +1481,4 @@ if test "x$WARN_PARALLEL_HDF5_NO_COMPLEX" = "xyes"; then
*************************************************************************])
fi
################################################################################
# AHF OPTIONS
################################################################################
#AC_ARG_ENABLE([ahf],
#[AC_HELP_STRING([--enable-ahf],[use the half facet representation])],
#[ case "${enableval}" in
# yes) ahf1=true ;;
# no) ahf1=false ;;
# *) AC_MSG_ERROR([bad value]) ;;
#esac],[ahf1=false])
#ENABLE_AHF=$enableval],[ENABLE_AHF=no] )
#if test "x$ENABLE_AHF" = "xyes"; then
# AM_CPPFLAGS="$AM_CPPFLAGS -DUSE_AHF"
#fi
#AM_CONDITIONAL([ENABLE_AHF],[test x$ahf1 = xtrue])
#AC_SUBST(ENABLE_AHF)
#test "xyes" != "x$WITH_AHF" || AM_CPPFLAGS="$AM_CPPFLAGS -DUSE_AHF"
#AM_CONDITIONAL(USE_AHF, [test "xno" != "x$WITH_AHF"])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment