Try to figure out if we built the rest of the project using Autotools or

CMake automatically.

svn path=/trunk/; revision=47576

diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index b8b6bf5341a64a96b4c739b4996d41d5ff3196d2..33cdfa28d5d3a859da4fe4bb8467e93b659d7ce6 100644 (file)
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -269,7 +269,20 @@ macx:QMAKE_LFLAGS += \
     -framework CoreFoundation \
     -framework SystemConfiguration
 
-unix:LIBS += -L../../lib -Wl,-rpath ../../lib -lwireshark -lwiretap -lwsutil -lui \
+unix {
+    exists(../../epan/.libs/libw*) {
+        message( "Assuming Autotools library paths" )
+        LIBS += \
+            -L.. \
+            -L../../epan/.libs -Wl,-rpath ../../epan/.libs \
+            -L../../wiretap/.libs -Wl,-rpath ../../wiretap/.libs \
+            -L../../wsutil/.libs -Wl,-rpath ../../wsutil/.libs
+    } else:exists(../../lib/libw*) {
+        message( "Assuming CMake library path" )
+        LIBS += -L../../lib -Wl,-rpath ../../lib
+    }
+}
+unix:LIBS += -lwireshark -lwiretap -lwsutil -lui \
     -lpcap -lui_dirty
 macx:LIBS += -Wl,-macosx_version_min,10.5 -liconv -lz
 
@@ -280,8 +293,17 @@ EXTRA_BINFILES = \
 # http://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output
 unix: {
     EXTRA_BINFILES += \
-        ../../dumpcap \
-        ../../lib/*.so  \
+        ../../dumpcap
+
+    exists(../../epan/.libs/libw*) {
+        EXTRA_BINFILES += \
+            ../../epan/.libs/libwireshark.* \
+            ../../wiretap/.libs/libwiretap.* \
+            ../../wsutil/.libs/libwsutil.*
+    } else:exists(../../lib/libw*) {
+        EXTRA_BINFILES += ../../lib/libw*.so
+    }
+
 }
 unix:!macx {
     for(FILE,EXTRA_BINFILES){