Updated OMK configuration for FWP

git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1350 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/Makefile.omk b/Makefile.omk
index 80006e614217172033c4bdc831b7195eedc60fb7..b5a6dfb8da4bed338208e4079ed060c781c4b6d4 100644 (file)
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -1,6 +1,6 @@
 SUBDIRS=include src
 
-default_CONFIG = CONFIG_FNA_RTEP=n CONFIG_FNA_UNIX=n CONFIG_FNA_FRESCAN=n CONFIG_FNA_FWP=n
+default_CONFIG = CONFIG_FNA_RTEP=n CONFIG_FNA_UNIX=n CONFIG_FNA_FRESCAN=n
 
 lib_LIBRARIES = fna
 fna_SOURCES = src/fna_configuration.c
@@ -20,7 +20,6 @@ SUBDIRS+=src_frescan
 CFLAGS+=-DFRESCAN_FNA_ENABLED
 endif
 
-ifeq ($(CONFIG_FNA_FWP),y)
-SUBDIRS+=src_fwp
+ifeq ($(CONFIG_FWP),y)
 CFLAGS+=-DFWP_FNA_ENABLED
 endif

diff --git a/src/fna_configuration.c b/src/fna_configuration.c
index 3965553a8fe3e037a22e56d3472cf6b55bddcd59..40b80712762946677bac3ce03c9ebed5cb8b4d06 100644 (file)
--- a/src/fna_configuration.c
+++ b/src/fna_configuration.c
@@ -84,7 +84,7 @@
 #endif
 
 #ifdef FWP_FNA_ENABLED
-        #include "fwp_fna.h" // for fwp_fna_operations
+        #include <fwp_fna.h> // for fwp_fna_operations
 #endif
 
 fna_operations_t  *fna_operations[FNA_MAX_NETWORKS] = {