- add libpcap dir to lib- and include directory

4 files changed, 30 insertions, 5 deletions

diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
index 5fccd30..fbbff27 100644
--- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
+++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
@@ -1,13 +1,19 @@
 TEMPLATE        = app
-CONFIG          = qt warn_on 
+CONFIG          = qt warn_on
 HEADERS         =
 SOURCES         = miniwellenreiter.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2 -lopienet2
 TARGET          = miniwellenreiter
 MOC_DIR         = moc
 OBJECTS_DIR     = obj
 
 include ( $(OPIEDIR)/include.pro )
 
+!isEmpty( LIBPCAP_INC_DIR ) {
+    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBPCAP_LIB_DIR ) {
+    LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS
+}
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index 4aef6c2..da062e4 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -1,34 +1,40 @@
 TEMPLATE    = lib
-CONFIG      += qt warn_on 
+CONFIG      += qt warn_on
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = 802_11_user.h       \
               dhcp.h              \
               udp_ports.h         \
               odebugmapper.h      \
               omanufacturerdb.h   \
               onetutils.h         \
               onetwork.h          \
               opcap.h             \
               ostation.h
 SOURCES     = odebugmapper.cpp    \
               omanufacturerdb.cpp \
               onetutils.cpp       \
               onetwork.cpp        \
               opcap.cpp           \
               ostation.cpp
 INTERFACES  =
 TARGET      = opienet2
 VERSION     = 1.8.4
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lpcap
 
 
 !contains( platform, x11 ) {
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
-  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
+  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
 }
 
+!isEmpty( LIBPCAP_INC_DIR ) {
+    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBPCAP_LIB_DIR ) {
+    LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS
+}
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 93d42ed..f773cf3 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,19 +1,19 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
-CONFIG          = qt warn_on 
+CONFIG          = qt warn_on
 
 HEADERS         = wellenreiterbase.h \
                   mainwindow.h \
                   wellenreiter.h \
                   scanlist.h \
                   logwindow.h \
                   hexwindow.h \
                   statwindow.h \
                   configwindow.h \
                   graphwindow.h \
                   packetview.h \
                   protolistview.h \
                   gps.h
 
 SOURCES         = main.cpp \
                   mainwindow.cpp \
@@ -34,16 +34,22 @@ DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
   LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
 }
 
 contains( platform, x11 ) {
   LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
   SOURCES += resource.cpp
   HEADERS += resource.h
   DESTDIR = $(OPIEDIR)/output/bin
 }
 
+!isEmpty( LIBPCAP_INC_DIR ) {
+    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBPCAP_LIB_DIR ) {
+    LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS
+}
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index c94dc0e..c04d2c0 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,25 +1,32 @@
 TEMPLATE        = lib
-CONFIG          += qt plugin warn_on 
+CONFIG          += qt plugin warn_on
 DESTDIR         = $(OPIEDIR)/plugins/networksettings
         HEADERS         = infoimp.h wlanmodule.h wextensions.h keyedit.h
         SOURCES         = infoimp.cpp wlanmodule.cpp wextensions.cpp keyedit.cpp
         INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces -lopiecore2 -lopienet2
         INTERFACES= wlan.ui info.ui
         TARGET  = wlan
         VERSION         = 1.0.0
 
 #CONFIG += wirelessopts
 
 wirelessopts {
                 HEADERS+= wlanimp.h
                 SOURCES+= wlanimp.cpp
 }
 
 ! wirelessopts {
                 HEADERS+= wlanimp2.h
         SOURCES += wlanimp2.cpp
 }
 
 include ( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBPCAP_INC_DIR ) {
+    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBPCAP_LIB_DIR ) {
+    LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS
+}