[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1168461 by kuemmel:

also use pkg-config's include path for gsl

 M  +8 -2      dataobjectplugin.pri  
 M  +0 -3      src/plugins/dataobject/dataobject.pro  
 M  +0 -1      src/plugins/filters/filters.pro  
 M  +0 -3      src/plugins/fits/fits.pro  
 M  +1 -0      src/plugins/plugins.pri  


--- branches/work/kst/portto4/kst/dataobjectplugin.pri #1168460:1168461
@@ -29,7 +29,13 @@
 			-l$$kstlib(kst2lib)
 
 
-win32:LibExists(gsl) {
+LibExists(gsl) {
+    win32 {
 	INCLUDEPATH += $$(GSLDIR)/include
 	LIBS += -L$$(GSLDIR)/lib
-}
\ No newline at end of file
+    } else {
+	CONFIG += link_pkgconfig
+	PKGCONFIG += gsl
+	INCLUDEPATH += $$pkginclude(gsl)
+    }
+}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/dataobject.pro #1168460:1168461
@@ -19,11 +19,8 @@
     syncbin
 
   LibExists(gsl) {
-     message(GSL configured.  Data Object plugins will be built.)
      SUBDIRS += convolution \
                 correlation \
                 interpolations \
                 noiseaddition
-     !win32:CONFIG += link_pkgconfig
-     !win32:PKGCONFIG += gsl
   }
--- branches/work/kst/portto4/kst/src/plugins/filters/filters.pro #1168460:1168461
@@ -9,7 +9,6 @@
     differentiation
 
 LibExists(gsl) {
-     message(GSL configured.  Filter plugins will be built.)
      SUBDIRS += butterworth_bandpass \
                 butterworth_bandstop \
                 butterworth_highpass \
--- branches/work/kst/portto4/kst/src/plugins/fits/fits.pro #1168460:1168461
@@ -4,7 +4,6 @@
 CONFIG += ordered
 
 LibExists(gsl) {
-  message(GSL configured.  Fits plugins will be built.)
   SUBDIRS += \
       exponential_unweighted \
       exponential_weighted \
@@ -21,6 +20,4 @@
       polynomial_weighted \
       sinusoid_unweighted \
       sinusoid_weighted
-    !win32:CONFIG += link_pkgconfig
-    !win32:PKGCONFIG += gsl
 }
--- branches/work/kst/portto4/kst/src/plugins/plugins.pri #1168460:1168461
@@ -1,2 +1,3 @@
 include($$PWD/../../kst.pri)
 include($$PWD/../../dataobjectplugin.pri)
+