Get rid of the popt dependency

Makefile.am

@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \
 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
 AM_CFLAGS=$(WARN_CFLAGS)
-LDADD = lib/libiscsi.la -lpopt
+LDADD = lib/libiscsi.la
 XSLTPROC = /usr/bin/xsltproc
 
 # Manpages
@@ -46,7 +46,6 @@ lib_libiscsi_la_LDFLAGS = \
 
 # libiscsi utilities
 
-if PROGRAMS
 bin_PROGRAMS += bin/iscsi-inq bin/iscsi-ls bin/iscsi-readcapacity16
 bin_iscsi_inq_SOURCES = src/iscsi-inq.c
 bin_iscsi_ls_SOURCES = src/iscsi-ls.c
@@ -174,8 +173,6 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/1144_persistent_reserve_access_check_eaar.c \
 	test-tool/1145_persistent_reserve_access_check_wear.c
 
-endif
-
 
 if ISCSITEST
 # libiscsi test tool using cunit

configure.ac

@@ -57,40 +57,6 @@ if test x"$libiscsi_cv_HAVE_SOCKADDR_IN6" = x"yes"; then
 fi
 
 
-AC_MSG_CHECKING(whether libpopt is available)
-ac_save_CFLAGS="$CFLAGS"
-ac_save_LIBS="$LIBS"
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-LIBS="$GLIB_LIBS $LIBS -lpopt"
-AC_TRY_RUN([
-/*
- * Just see if we can compile/link with popt
- */
-#include <popt.h>
-
-int main(int argc, const char *argv[])
-{
-	struct poptOption popt_options[] = {
-		POPT_TABLEEND
-	};
-	poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
-
-	return 0;
-}
-], ac_cv_have_popt=yes, ac_cv_have_popt=no,
-   [echo $ac_n "compile with POPT. Assuming OK... $ac_c"
-    ac_cv_have_popt=yes])
-CFLAGS="$ac_save_CFLAGS"
-LIBS="$ac_save_LIBS"
-if test "$ac_cv_have_popt" = yes ; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_MSG_NOTICE(You need libpopt to compile the sample libiscsi clients.)
-  AC_MSG_NOTICE(Only the library will be compiled and installed.)
-fi
-AM_CONDITIONAL(PROGRAMS, [test "$ac_cv_have_popt" = yes])
-
 AC_MSG_CHECKING(whether libcunit is available)
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"

packaging/RPM/libiscsi.spec.in

@@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: popt-devel
 
 %description
 libiscsi is a library for attaching to iSCSI resources across