Permalink
Browse files

Minor cleanup of m4 files, mainly removing commented calls to AC_CHEC…

…K_FILE.
  • Loading branch information...
1 parent e0ff624 commit f7aebc7d9f89ae2e5c9f49782009b3a8d98293ed @jwpeterson jwpeterson committed Dec 18, 2012
Showing with 7 additions and 17 deletions.
  1. +0 −1 m4/eigen.m4
  2. +1 −5 m4/glpk.m4
  3. +1 −1 m4/laspack.m4
  4. +1 −1 m4/parmetis.m4
  5. +1 −1 m4/sfc.m4
  6. +2 −2 m4/tbb.m4
  7. +1 −6 m4/vtk.m4
View
@@ -60,7 +60,6 @@ AC_DEFUN([CONFIGURE_EIGEN],
# Check for existence of a header file in the specified location. Note: here
# we are checking for the header file "Eigen" in the Eigen directory.
- # AC_CHECK_FILE([$EIGEN_INC/Eigen], [eigenincFound="OK"], [eigenincFound="FAIL"])
eigenincFound=no;
AC_CHECK_HEADERS($EIGEN_INC/Eigen/Eigen, eigenincFound=yes)
View
@@ -75,7 +75,6 @@ AC_DEFUN([CONFIGURE_GLPK],
if (test $enableglpk = yes); then
# Check for existence of a header file in the specified location
- # AC_CHECK_FILE([$GLPK_INC/glpk.h], [glpkincFound="OK"], [glpkincFound="FAIL"])
glpkincFound=no;
AC_CHECK_HEADERS($GLPK_INC/glpk.h, glpkincFound=yes)
@@ -95,10 +94,7 @@ AC_DEFUN([CONFIGURE_GLPK],
fi
if (test $enableglpk = yes); then
- # Also Check for existence of required libraries. This is not really the
- # right way to do it -- it's not portable to Macs, where .so's are called
- # .dylib's instead.
- # AC_CHECK_FILE($GLPK_LIB/glpk.so, [enableglpk=yes], [enableglpk=no])
+ # Also Check for existence of required libraries.
# AC_HAVE_LIBRARY (library, [action-if-found], [action-if-not-found], [other-libraries])
# Note: Basically tries to compile a function which calls main().
View
@@ -42,7 +42,7 @@ AC_DEFUN([CONFIGURE_LASPACK],
# dnl Sanity check: make sure the user really has the contrib directory
# if (test $enablelaspack = yes); then
-# AC_CHECK_FILE(./contrib/laspack/lastypes.h, [enablelaspack=yes], [enablelaspack=no])
+# AC_CHECK_HEADER(./contrib/laspack/lastypes.h, [enablelaspack=yes], [enablelaspack=no])
# fi
View
@@ -48,7 +48,7 @@ AC_DEFUN([CONFIGURE_PARMETIS],
# AC_REQUIRE([CONFIGURE_METIS])
# if (test $enablemetis = yes) ; then
-# AC_CHECK_FILE(./contrib/parmetis/Lib/parmetis.h,
+# AC_CHECK_HEADER(./contrib/parmetis/Lib/parmetis.h,
# [
# PARMETIS_INCLUDE_PATH=$PWD/contrib/parmetis/Lib
View
@@ -40,7 +40,7 @@ AC_DEFUN([CONFIGURE_SFC],
# dnl Sanity check: make sure the user really has the contrib directory
# if (test $enablesfc = yes); then
-# AC_CHECK_FILE(./contrib/sfcurves/sfcurves.h, [enablesfc=yes], [enablesfc=no])
+# AC_CHECK_HEADER(./contrib/sfcurves/sfcurves.h, [enablesfc=yes], [enablesfc=no])
# fi
View
@@ -30,8 +30,8 @@ AC_DEFUN([CONFIGURE_TBB],
if test "x$withtbb" = x ; then
withtbb=/usr
fi
- AC_CHECK_FILE($withtbb/include/tbb/task_scheduler_init.h,
- TBB_INCLUDE_PATH=$withtbb/include)
+ AC_CHECK_HEADER($withtbb/include/tbb/task_scheduler_init.h,
+ TBB_INCLUDE_PATH=$withtbb/include)
if test "x$withtbblib" != "x" ; then
TBB_LIBS=$withtbblib
else
View
@@ -76,7 +76,6 @@ AC_DEFUN([CONFIGURE_VTK],
if (test $enablevtk = yes); then
dnl Check for existence of a header file in the specified location
- dnl AC_CHECK_FILE([$VTK_INC/vtkConfigure.h], [vtkincFound="OK"], [vtkincFound="FAIL"])
vtkincFound=no;
AC_CHECK_HEADERS($VTK_INC/vtkConfigure.h, vtkincFound=yes)
@@ -97,11 +96,7 @@ AC_DEFUN([CONFIGURE_VTK],
fi
if (test x$enablevtk = xyes); then
- dnl Also Check for existence of required libraries. This is not really
- dnl right way to do it -- it's not portable to Macs, where .so's are called
- dnl .dylib's instead.
- dnl AC_CHECK_FILE($VTK_LIB/libvtkIO.so, [enablevtk=yes], [enablevtk=no])
- dnl AC_CHECK_FILE($VTK_LIB/libvtkCommon.so, [enablevtk=yes], [enablevtk=no])
+ dnl Also Check for existence of required libraries.
dnl AC_HAVE_LIBRARY (library, [action-if-found], [action-if-not-found], [other-libraries])
dnl Note: Basically tries to compile a function which calls main().

0 comments on commit f7aebc7

Please sign in to comment.