diff options
| author | Simon Horman <horms@verge.net.au> | 2012-09-17 10:24:43 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-05-22 15:04:56 +0900 |
| commit | 566c97146b8132ae65351734dca3b005027d3daf (patch) | |
| tree | cc6ee593d0cbc3cc42a6a80cb3b84ebc046f206c | |
| parent | 2e3d1f61c9ceea2c87143ca603ffffa6f86e57d5 (diff) | |
| download | ipvsadm-566c97146b8132ae65351734dca3b005027d3daf.tar.gz | |
Linking against libpopt is always requited
It used to be the case that ipvsadm could be compiled to use
getopt_long rather than libpopt. However, this is no longer the case
and linking against libpopt is always requited.
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | Makefile | 33 |
1 files changed, 1 insertions, 32 deletions
@@ -62,39 +62,8 @@ RPMBUILD = $(shell \ echo "/bin/rpm"; \ fi ) -ifeq (,$(FORCE_GETOPT)) -LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib -POPT_LIB = $(shell for i in $(LIB_SEARCH); do \ - if [ -f $$i/libpopt.a ]; then \ - if nm $$i/libpopt.a | fgrep -q poptGetContext; then \ - echo "-lpopt"; \ - break; \ - fi; \ - fi; \ -done) -ifeq (,$(POPT_LIB)) -POPT_LIB = $(shell for i in $(LIB_SEARCH); do \ - f1=""; \ - for so in $$i/libpopt.so*; do \ - if [ -f $$so ]; then \ - if objdump -T $$so | fgrep -q poptGetContext; then \ - echo "-lpopt"; \ - f1=y; \ - break; \ - fi; \ - fi; \ - done; \ - [ "$$f1" != "" ] && break; \ -done) -endif -endif - -ifneq (,$(POPT_LIB)) -POPT_DEFINE = -DHAVE_POPT -endif - OBJS = ipvsadm.o config_stream.o dynamic_array.o -LIBS = $(POPT_LIB) +LIBS = -lpopt ifneq (0,$(HAVE_NL)) LIBS += -lnl endif |