Skip to content
Snippets Groups Projects
Commit b4de12ef authored by Stefen Guzik's avatar Stefen Guzik
Browse files

added CGNS and sizeof size_t testing

parent 7e56bd72
No related branches found
No related tags found
No related merge requests found
dnl $Id: configure.in,v 1.102 2006-08-26 13:34:43 geuzaine Exp $ dnl $Id: configure.in,v 1.103 2006-09-30 02:38:04 guzik Exp $
dnl dnl
dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
dnl dnl
...@@ -53,6 +53,10 @@ AC_ARG_WITH(osmesa-prefix, ...@@ -53,6 +53,10 @@ AC_ARG_WITH(osmesa-prefix,
AC_HELP_STRING([--with-osmesa-prefix=PFX], AC_HELP_STRING([--with-osmesa-prefix=PFX],
[prefix where OSMesa is installed]), [prefix where OSMesa is installed]),
[OSMESA_PREFIX=$withval]) [OSMESA_PREFIX=$withval])
AC_ARG_WITH(cgns-prefix,
AC_HELP_STRING([--with-cgns-prefix=PFX],
[prefix where CGNS is installed]),
[CGNS_PREFIX=$withval])
dnl Parse '--enable' command line options dnl Parse '--enable' command line options
AC_ARG_ENABLE(gsl, AC_ARG_ENABLE(gsl,
...@@ -100,6 +104,9 @@ AC_ARG_ENABLE(matheval, ...@@ -100,6 +104,9 @@ AC_ARG_ENABLE(matheval,
AC_ARG_ENABLE(osmesa, AC_ARG_ENABLE(osmesa,
AC_HELP_STRING([--enable-osmesa], AC_HELP_STRING([--enable-osmesa],
[use OSMesa for offscreen rendering (default=no)])) [use OSMesa for offscreen rendering (default=no)]))
AC_ARG_ENABLE(cgns,
AC_HELP_STRING([--enable-cgns],
[enable CGNS output (default=no)]))
dnl Get the operating system name dnl Get the operating system name
UNAME=`uname` UNAME=`uname`
...@@ -513,6 +520,25 @@ if test "x${GSL}" != "xyes"; then ...@@ -513,6 +520,25 @@ if test "x${GSL}" != "xyes"; then
fi fi
fi fi
dnl Check for CGNS
if test "x${CGNS_PREFIX}" != "x"; then
enable_cgns="yes"
fi
if test "x$enable_cgns" = "xyes"; then
if test "x${CGNS_PREFIX}" != "x"; then
LDFLAGS="-L${CGNS_PREFIX}/lib ${LDFLAGS}"
fi
AC_CHECK_LIB(cgns,main,CGNS="yes",CGNS="no")
if test "x${CGNS}" = "xyes"; then
if test "x${CGNS_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lcgns"
else
GMSH_LIBS="${GMSH_LIBS} -L${CGNS_PREFIX}/lib -lcgns"
FLAGS="${FLAGS} -DHAVE_LIBCGNS -I${CGNS_PREFIX}/include"
fi
fi
fi
dnl Check if we should build the parallel version dnl Check if we should build the parallel version
if test "x$enable_parallel" = "xyes"; then if test "x$enable_parallel" = "xyes"; then
FLAGS="-DHAVE_PARALLEL ${FLAGS}" FLAGS="-DHAVE_PARALLEL ${FLAGS}"
...@@ -581,6 +607,16 @@ case "$UNAME" in ...@@ -581,6 +607,16 @@ case "$UNAME" in
esac esac
dnl Compiler characteristics
dnl Check sizeof size_t (flag as 64 if not 32)
AC_CHECK_SIZEOF([size_t])
if test $ac_cv_sizeof_size_t != 4; then
FLAGS="$FLAGS -DHAVE_64BIT_SIZE_T"
if test $ac_cv_sizeof_size_t != 8; then
AC_MSG_WARN([Unsupported size of size_t - this may affect FNV hashing.])
fi
fi
dnl Write output dnl Write output
AC_SUBST(UNAME) AC_SUBST(UNAME)
AC_SUBST(FLAGS) AC_SUBST(FLAGS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment