iSCSI: open-iscsi patchwork: add -lslp to LDFLAGS, and properly call autoconf

cleanup-cruft
Fabio Erculiani 14 years ago
parent c579bd1194
commit ad2842f670

@ -690,6 +690,9 @@ compile_iscsi() {
# Only build userspace # Only build userspace
print_info 1 'iSCSI: >> Configuring userspace...' print_info 1 'iSCSI: >> Configuring userspace...'
cd utils/open-isns || gen_die 'Could not enter open-isns dir' cd utils/open-isns || gen_die 'Could not enter open-isns dir'
# we currently have a patch that changes configure.ac
# once given patch is dropped, drop autoconf too
autoconf || gen_die 'Could not tweak open-iscsi configuration'
./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace' ./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace'
cd ../.. || gen_die 'wtf?' cd ../.. || gen_die 'wtf?'
MAKE=${UTILS_MAKE} compile_generic "user" "" MAKE=${UTILS_MAKE} compile_generic "user" ""

@ -1,11 +1,11 @@
--- open-iscsi-2.0-872.orig/utils/open-isns/configure.ac --- a/utils/open-isns/configure.ac
+++ open-iscsi-2.0-872/utils/open-isns/configure.ac +++ b/utils/open-isns/configure.ac
@@ -79,7 +79,7 @@ AC_ARG_WITH(slp, @@ -80,7 +80,7 @@ AC_ARG_WITH(slp,
WITH_SLP=$withval
else else
WITH_SLP=yes WITH_SLP=yes
- CPPFLAGS="$CPPFLAGS -I${withval}" CPPFLAGS="$CPPFLAGS -I${withval}"
+ CPPFLAGS="$CPPFLAGS -I${withval} -lslp" - LDFLAGS="$LDFLAGS -L${withval}"
LDFLAGS="$LDFLAGS -L${withval}" + LDFLAGS="$LDFLAGS -L${withval} -lslp"
fi fi
] ]
)

Loading…
Cancel
Save