summaryrefslogtreecommitdiff
blob: 5e96534ea373be5e0c5b4fc8809e3847dc1aeb78 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
--- src/LabPlotDialog.cc	2004-10-28 23:18:53.000000000 +0200
+++ ../LabPlot-1.4.0-new/src/LabPlotDialog.cc	2005-01-05 14:04:35.017794811 +0100
@@ -21,7 +21,7 @@
 #endif
 
 #ifdef HAVE_FFTW
-#include <fftw-config.h>
+#include <fftw.h>
 #endif
 
 #ifdef HAVE_MAGICK
@@ -33,10 +33,6 @@
 #include <qsaglobal.h>
 #endif
 
-#ifdef HAVE_CDF
-#include <cdfrev.h>
-#endif
-
 LabPlotDialog::LabPlotDialog(const char *name)
 	: Dialog(0, name)
 {
@@ -82,7 +78,7 @@
 #ifdef HAVE_FFTW3
 	s="not used";
 #elif HAVE_FFTW
-	s=FFTW_VERSION;
+	s=fftw_version;
 #endif
 	tmp = new QLabel(s,hb);
 	tmp->setAlignment(Qt::AlignRight);
@@ -132,8 +128,7 @@
 	new QLabel(i18n("Common Data Form library (CDF) : "),hb);
 	s = "no";
 #ifdef HAVE_CDF
-	s = QString::number(CDF_LIBRARY_VERSION)+'.'+QString::number(CDF_LIBRARY_RELEASE)+'.'+ 
-		QString::number(CDF_LIBRARY_INCREMENT);
+	s = CDF_VERSION;
 #endif
 	tmp = new QLabel(s,hb);
 	tmp->setAlignment(Qt::AlignRight);