Sophie

Sophie

distrib > Mandriva > 2010.1 > i586 > media > contrib-updates-src > by-pkgid > 11ecebdeaf164337770dee7b98538920 > files > 7

elmer-5.4.1.4579-4mdv2010.1.src.rpm

diff -p -up elmer-5.4.1.4579/ElmerGUI/ElmerGUI.pri.orig elmer-5.4.1.4579/ElmerGUI/ElmerGUI.pri
--- elmer-5.4.1.4579/ElmerGUI/ElmerGUI.pri.orig	2010-08-22 15:08:42.000000000 -0300
+++ elmer-5.4.1.4579/ElmerGUI/ElmerGUI.pri	2010-08-22 15:10:53.000000000 -0300
@@ -11,7 +11,7 @@ DEFINES += EG_QWT      # Use QWT for con
 DEFINES += EG_VTK      # Use VTK for postprocessing?
 DEFINES += EG_MATC     # Use MATC for internal operations in postprocessing?
 DEFINES += EG_OCC      # Use OpenCASCADE 6.3 for importing CAD files? Needs VTK.
-DEFINES -= EG_PYTHONQT # Use PythonQt for scripting in post processor?
+DEFINES += EG_PYTHONQT # Use PythonQt for scripting in post processor?
 
 #------------------------------------------------------------------------------
 # 64 bit system?
@@ -36,9 +36,9 @@ isEmpty(ELMERGUI_HOME) {
 # Python library:
 #------------------------------------------------------------------------------
 unix {
-   PY_INCLUDEPATH = /usr/include/python2.5
+   PY_INCLUDEPATH = /usr/include/python2.6
    PY_LIBPATH = /usr/lib
-   PY_LIBS = -lpython2.5
+   PY_LIBS = -lpython2.6
 }
 
 win32 {
@@ -54,9 +54,9 @@ macx {
 # QWT library:
 #------------------------------------------------------------------------------
 unix {
-  QWT_INCLUDEPATH = /usr/include/qwt-qt4
+  QWT_INCLUDEPATH = /usr/include
   QWT_LIBPATH = /usr/lib
-  QWT_LIBS = -lqwt-qt4
+  QWT_LIBS = -lqwt
 }
 
 win32 {
@@ -75,7 +75,7 @@ macx {
 # VTK library:
 #------------------------------------------------------------------------------
 unix {
-   VTK_INCLUDEPATH = /usr/include/vtk-5.2
+   VTK_INCLUDEPATH = /usr/include/vtk
    VTK_LIBPATH = /usr/lib
    VTK_LIBS = -lvtkHybrid \
               -lvtkWidgets \