[people/stevee/ipfire-3.x.git] / ipvsadm / patches / ipvsadm-1.26-popt.patch

diff -Naupr ipvsadm-1.26.orig/Makefile ipvsadm-1.26/Makefile
--- ipvsadm-1.26.orig/Makefile	2011-02-08 01:24:23.000000000 +0100
+++ ipvsadm-1.26/Makefile	2011-07-09 23:22:54.834017156 +0200
@@ -63,15 +63,7 @@ RPMBUILD = $(shell				\
 	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)
+POPT_LIB = "-lpopt"
 endif
 
 ifneq (,$(POPT_LIB))
Commit	Line	Data
a5e024f4 MT	1	diff -Naupr ipvsadm-1.26.orig/Makefile ipvsadm-1.26/Makefile
	2	--- ipvsadm-1.26.orig/Makefile 2011-02-08 01:24:23.000000000 +0100
	3	+++ ipvsadm-1.26/Makefile 2011-07-09 23:22:54.834017156 +0200
	4	@@ -63,15 +63,7 @@ RPMBUILD = $(shell \
	5	fi )
	6
	7	ifeq (,$(FORCE_GETOPT))
	8	-LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib
	9	-POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
	10	- if [ -f $$i/libpopt.a ]; then \
	11	- if nm $$i/libpopt.a \| fgrep -q poptGetContext; then \
	12	- echo "-lpopt"; \
	13	- break; \
	14	- fi; \
	15	- fi; \
	16	-done)
	17	+POPT_LIB = "-lpopt"
	18	endif
	19
	20	ifneq (,$(POPT_LIB))