small fixes to cgns + occ win

Geo/GModel.h

@@ -177,10 +177,8 @@ class GModel
 	       double scalingFactor=1.0);
 
   // IO for CGNS files
-#if defined(HAVE_LIBCGNS)
   int readCGNS(const std::string &name);
   int writeCGNS(const std::string &name, double scalingFactor=1.0);
-#endif
 };
 
 #endif

Geo/GModelIO_CGNS.cpp

-#if defined(HAVE_LIBCGNS)
-
 // Copyright (C) 2006 S. Guzik, C. Geuzaine, J.-F. Remacle
 //
 // This program is free software; you can redistribute it and/or modify
@@ -33,6 +31,8 @@
 #include "MNeighbour.h"
 #include "MVertex.h"
 
+#if defined(HAVE_LIBCGNS)
+
 #include "cgnslib.h"
 
 int cgnsErr(const int cgIndexFile = -1)
@@ -558,4 +558,19 @@ int GModel::writeCGNS(const std::string &name, double scalingFactor)
   return 1;
 }
 
+#else
+
+int GModel::readCGNS(const std::string &name)
+{
+  Msg(GERROR, "This version of Gmsh was compiled without CGNS support");
+  return 0;
+}
+
+int GModel::writeCGNS(const std::string &name, double scalingFactor)
+{
+  Msg(GERROR, "This version of Gmsh was compiled without CGNS support");
+  return 0;
+}
+
 #endif
+

configure

@@ -4607,6 +4607,9 @@ case "$UNAME" in
     if test "x$enable_cygwin" != "xyes"; then
       FLAGS="${FLAGS} -DHAVE_NO_DLL"
     fi
+    if test "x${OCC}" = "xyes"; then
+      GMSH_LIBS="${GMSH_LIBS} -lwinspool"
+    fi
     if test "x$enable_gui" != "xno"; then
       GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"
     fi

configure.in

-dnl $Id: configure.in,v 1.111 2006-11-20 20:41:11 geuzaine Exp $
+dnl $Id: configure.in,v 1.112 2006-11-21 12:00:57 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 dnl
@@ -592,6 +592,9 @@ case "$UNAME" in
     if test "x$enable_cygwin" != "xyes"; then
       FLAGS="${FLAGS} -DHAVE_NO_DLL"
     fi
+    if test "x${OCC}" = "xyes"; then
+      GMSH_LIBS="${GMSH_LIBS} -lwinspool"
+    fi
     if test "x$enable_gui" != "xno"; then
       GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"
     fi