Commit c0d5abb4 authored by Mike Hibler's avatar Mike Hibler

Believe it or not: changes to make things build on RHL73 again (for IXP image)

parent c1f184cf
......@@ -31,8 +31,11 @@ CFLAGS += -g -O2 -DLOG_DROPS -I${OBJDIR} -DLOG_TESTBED=$(LOG_TESTBED)
ifeq ($(SYSTEM),Linux)
ifeq ($(host_cpu),arm)
else
CFLAGS += -I/usr/kerberos/include
LDFLAGS += -L/usr/kerberos/lib -lkrb5 -lk5crypto -lcom_err
NEEDKERB := $(shell nm /usr/lib/libssl.a | grep -q krb; echo $$?)
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
endif
endif
else
LDFLAGS += -static
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2003, 2005, 2006 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -19,8 +19,8 @@ include $(TESTBED_SRCDIR)/GNUmakerules
PTHREADCFLAGS = -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads
PTHREADLIBS = -L/usr/local/lib -llthread -llgcc_r
ELVINFLAGS = `elvin-config --cflags vin4c`
ELVINLIBS = `elvin-config --libs vin4c`
ELVINFLAGS = `$(ELVIN_CONFIG) --cflags vin4c`
ELVINLIBS = `$(ELVIN_CONFIG) --libs vin4c`
EVENTFLAGS = -DEVENTSYS -I$(TESTBED_SRCDIR)/event/lib $(ELVINFLAGS)
EVENTOBJS = $(OBJDIR)/event/lib/event.o $(OBJDIR)/event/lib/util.o
EVENTLIBS = $(ELVINLIBS) -lcrypto
......@@ -41,7 +41,7 @@ CFLAGS_LINUX = $(CFLAGS) -I/usr/include/pcap $(TBCFLAGS)
LIBS_FBSD = $(PTHREADLIBS) $(TBLIBS) $(PCAPLIBS)
LIBS_FBSD_NE = $(PTHREADLIBS) $(PCAPLIBS)
LIBS_LINUX = -L/usr/lib -lpthread -lpcap $(TBLIBS)
LIBS_LINUX = -L/usr/lib -lpthread -lpcap $(TBLIBS) -ldl
# virtual (encapsulated) ethernet
#CFLAGS_FBSD += -DVETH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment