[cig-commits] r12398 - cs/autoconf/trunk

[leif at geodynamics.org]

Author: leif
Date: 2008-07-08 13:53:07 -0700 (Tue, 08 Jul 2008)
New Revision: 12398

Modified:
   cs/autoconf/trunk/cigma_hdf5.m4
   cs/autoconf/trunk/cigma_vtk.m4
Log:
Tweaks for building Cigma under Cygwin.


Modified: cs/autoconf/trunk/cigma_hdf5.m4
===================================================================
--- cs/autoconf/trunk/cigma_hdf5.m4	2008-07-08 14:28:37 UTC (rev 12397)
+++ cs/autoconf/trunk/cigma_hdf5.m4	2008-07-08 20:53:07 UTC (rev 12398)
@@ -56,7 +56,7 @@
             #HDF5_CXXFLAGS="$HDF5_CFLAGS"
 
             HDF5_INCLUDES="-I$HDF5_PREFIX/include"
-            HDF5_LIBS="-lhdf5"
+            HDF5_LIBS="-lhdf5 -lz"
             HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS"
             $1
 

Modified: cs/autoconf/trunk/cigma_vtk.m4
===================================================================
--- cs/autoconf/trunk/cigma_vtk.m4	2008-07-08 14:28:37 UTC (rev 12397)
+++ cs/autoconf/trunk/cigma_vtk.m4	2008-07-08 20:53:07 UTC (rev 12398)
@@ -70,13 +70,16 @@
 
             dnl figure out vtkCommon, vtkIO, vtkFiltering, plus dependencies (in case VTK libs are static)
             dnl order of libs is significant
-            VTK_SUPPORT_LIBS="-lvtktiff -lvtkpng -lvtkjpeg -lvtkzlib -lvtkexpat"
-            AC_CHECK_LIB(vtkIO, abort, [], [
-                VTK_SUPPORT_LIBS="-ltiff -lpng -ljpeg -lzlib -lexpat"
-                AC_CHECK_LIB(vtkIO, exit, [], [
-                    VTK_SUPPORT_LIBS=""
-                    AC_CHECK_LIB(vtkIO, strstr, [], [
-                        AC_MSG_ERROR([cannot link against VTK libraries])
+            VTK_SUPPORT_LIBS="-lvtktiff -lvtkpng -lvtkjpeg -lvtkzlib -lvtkexpat -lvfw32 -lgdi32"
+            AC_CHECK_LIB(vtkIO, strcmp, [], [
+                VTK_SUPPORT_LIBS="-lvtktiff -lvtkpng -lvtkjpeg -lvtkzlib -lvtkexpat"
+                AC_CHECK_LIB(vtkIO, abort, [], [
+                    VTK_SUPPORT_LIBS="-ltiff -lpng -ljpeg -lzlib -lexpat"
+                    AC_CHECK_LIB(vtkIO, exit, [], [
+                        VTK_SUPPORT_LIBS=""
+                        AC_CHECK_LIB(vtkIO, strstr, [], [
+                            AC_MSG_ERROR([cannot link against VTK libraries])
+                        ], [$VTK_SUPPORT_LIBS])
                     ], [$VTK_SUPPORT_LIBS])
                 ], [$VTK_SUPPORT_LIBS])
             ], [$VTK_SUPPORT_LIBS])