summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2012-02-16 09:52:48 -0800
committerSam Roberts <vieuxtech@gmail.com>2012-02-16 09:55:44 -0800
commit6485e9930260e845025709be8664e99cffdb1db9 (patch)
treef20dcfcbb9e8fef2c85cc67668cc60c88503a8df
parent22b428e121d6a8458da79b2aa2f58bf795dfba6a (diff)
downloadlibnet-6485e9930260e845025709be8664e99cffdb1db9.tar.gz
Autodetect whether dnet.h is provided as dumbnet.h
-rw-r--r--lua/.gitignore1
-rw-r--r--lua/Makefile5
-rw-r--r--lua/net.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/lua/.gitignore b/lua/.gitignore
index 2b7fc5c..8c096ef 100644
--- a/lua/.gitignore
+++ b/lua/.gitignore
@@ -1,6 +1,7 @@
*.so
*.test
_*
+dnet.h
recoded-*.pcap
passed-*.pcap
cap0.pcap
diff --git a/lua/Makefile b/lua/Makefile
index d37eb81..db25977 100644
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -45,6 +45,11 @@ CC.SO := $(CC) $(COPT) $(CFLAGS)
net.so: net.c libnet_decode.c
net.so: LDLIBS+=$(LDDNET) $(LDLNET)
net.so: CDEFS=$(DNETDEFS) $(LNETDEFS)
+net.so: dnet.h
+
+dnet.h:
+ if test -e /usr/include/dumbnet.h; then echo '#include<dumbnet.h>' > dnet.h; \
+ else echo '#include<dnet.h>' > dnet.h; fi
TNET=$(wildcard test-*.lua)
TOUT=$(TNET:.lua=.test)
diff --git a/lua/net.c b/lua/net.c
index 9b14897..f3510fb 100644
--- a/lua/net.c
+++ b/lua/net.c
@@ -32,7 +32,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
#include <time.h>
-#include <dnet.h>
+#include "dnet.h"
#include "libnet_decode.h"
#include <libnet.h>