LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File qwt_version.diff of Package dream (Project hamradio)

diff -u --recursive --new-file dream-1.16_orig/dream.pro dream-1.16/dream.pro
--- dream-1.16_orig/dream.pro	2012-11-17 14:18:56.000000000 +0100
+++ dream-1.16/dream.pro	2012-11-18 16:28:56.000000000 +0100
@@ -52,44 +52,33 @@
                 }
             }
             else {
-                exists($$(QWT)) {
-                    message("with qwt6")
-                    INCLUDEPATH += $$(QWT)/include
-                    LIBS += $$(QWT)/lib/libqwt.so
-                }
-                else {
-                    exists(/usr/lib/libqwt.so.6) {
+                    exists(/usr/include/qwt6) {
                         message("with qwt6")
-                        LIBS += /usr/lib/libqwt.so.6
-                        exists(/usr/include/qwt6) {
+                        LIBS += -lqwt
                             INCLUDEPATH += /usr/include/qwt6
-                        }
-                        else {
-                            exists(libs/qwt) {
-                                INCLUDEPATH += libs/qwt
-                            } else {
-                                INCLUDEPATH += /usr/include/qwt
-                            }
-                        }
                     }
                     else {
-                        exists(/usr/lib/libqwt-qt4.so.5) {
+                        exists(/usr/include/qwt-qt4) {
                             message("with qwt5")
-                            LIBS += /usr/lib/libqwt-qt4.so.5
-                            exists(/usr/include/qwt-qt4) {
-                                INCLUDEPATH += /usr/include/qwt-qt4
-                            } 
+                            LIBS += -lqwt-qt4
+                            INCLUDEPATH += /usr/include/qwt-qt4
+                        } 
+                        else {
+                          exists(/usr/include/qwt5) {
+                            message("with qwt5")
+                            LIBS += -lqwt
+                            INCLUDEPATH += /usr/include/qwt5
+                          } 
+                          else {
+                            exists(/usr/include/qwt) {
+                              message("with qwt5")
+                              LIBS += -lqwt
+                              INCLUDEPATH += /usr/include/qwt
+                            }
                             else {
-                                exists(libs/qwt) {
-                                    INCLUDEPATH += libs/qwt
-                                } else {
-                                    INCLUDEPATH += /usr/include/qwt
-                                }
+                              error("no usable qwt version found")
                             }
                         }
-                        else {
-                            error("no usable qwt version found")
-                        }
                     }
                 }
             }