Commit f4058466 authored by Mike Hibler's avatar Mike Hibler
Browse files

Minor changes to makefiles for FC6. Apps that link with kerberos (i.e.,

event clients) need slightly different args.
parent d14adff9
......@@ -35,8 +35,11 @@ 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`
ifneq ($(wildcard /usr/lib/libkrb5support.a),)
LIBS += -lkrb5support
endif
LIBS += -ldl
endif
LIBS += -ldl -lz
endif
endif
......
......@@ -52,12 +52,12 @@ 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`
ifneq ($(wildcard /usr/lib/libkrb5support.a),)
LIBS += -lkrb5support
endif
endif
LIBS += -ldl -lz
endif
ifeq ($(SYSTEM),Linux)
LIBS += -ldl
endif
LIBTB_OBJS = $(LIBTBDIR)/log.o $(LIBTBDIR)/tbdefs.o $(LIBTBDIR)/be_user.o
......
......@@ -50,8 +50,11 @@ endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
ifneq ($(wildcard /usr/lib/libkrb5support.a),)
LIBS += -lkrb5support
endif
LIBS += -ldl
endif
LIBS += -ldl -lz
endif
endif
......
......@@ -68,8 +68,11 @@ endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
ifneq ($(wildcard /usr/lib/libkrb5support.a),)
LIBS += -lkrb5support
endif
LIBS += -ldl
endif
LIBS += -ldl -lz
endif
endif
......@@ -110,4 +113,4 @@ client-install: client
$(INSTALL_PROGRAM) evproxy$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy$(EXE)
clean:
/bin/rm -f *.o $(PROGRAMS)
/bin/rm -f *.o $(PROGRAMS) *-debug
......@@ -46,8 +46,11 @@ 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`
ifneq ($(wildcard /usr/lib/libkrb5support.a),)
LIBS += -lkrb5support
endif
LIBS += -ldl
endif
LIBS += -ldl -lz
endif
endif
......
......@@ -82,14 +82,17 @@ 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`
ifneq ($(wildcard /usr/lib/libkrb5support.a),)
LIBS += -lkrb5support
endif
endif
LIBS += -ldl -lz
endif
endif
ifeq ($(SYSTEM),Linux)
CFLAGS += -DLINUX
YCFLAGS += -I. -I$(TGSRCDIR) -DUSEEVENTS -DLINUX -t
LIBS += -ldl
endif
LEX = flex -l
......
......@@ -56,7 +56,10 @@ endif
LIBS_FBSD = $(PTHREADLIBS) $(TBLIBS) $(PCAPLIBS)
LIBS_FBSD_NE = $(PTHREADLIBS) $(PCAPLIBS)
LIBS_LINUX = -L/usr/lib -lpthread -lpcap $(TBLIBS) \
`/usr/kerberos/bin/krb5-config --libs krb5` -ldl
`/usr/kerberos/bin/krb5-config --libs krb5` -ldl -lz
ifneq ($(wildcard /usr/lib/libkrb5support.a),)
LIBS_LINUX += -lkrb5support
endif
# virtual (encapsulated) ethernet
#CFLAGS_FBSD += -DVETH
......
Supports Markdown
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