summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2009-11-16 19:00:52 -1000
committerDavid Cantrell <dcantrell@redhat.com>2009-11-18 14:42:13 -1000
commit3520edec88cd52222b02aea1a7e3a91863e06a85 (patch)
tree05b9627f1e582a3928146e086a621232296a5227 /isys
parent5a29882c8c85d94d7cc4705f719512f59e48bb24 (diff)
downloadanaconda-3520edec88cd52222b02aea1a7e3a91863e06a85.tar.gz
anaconda-3520edec88cd52222b02aea1a7e3a91863e06a85.tar.xz
anaconda-3520edec88cd52222b02aea1a7e3a91863e06a85.zip
Replace all popt use with glib's option parsing code.
We have glib for other things, so we can use it for option parsing and dump another library dependency.
Diffstat (limited to 'isys')
-rw-r--r--isys/Makefile.am2
-rw-r--r--isys/isys.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/isys/Makefile.am b/isys/Makefile.am
index e591b4020..420e78d21 100644
--- a/isys/Makefile.am
+++ b/isys/Makefile.am
@@ -30,7 +30,7 @@ dist_noinst_HEADERS = *.h
ISYS_CFLAGS = -DVERSION='"$(PACKAGE_VERSION)"' $(NFS_CFLAGS) \
$(NETWORKMANAGER_CFLAGS) $(LIBNL_CFLAGS) $(LIBNM_GLIB_CFLAGS) \
$(SELINUX_CFLAGS)
-ISYS_LIBS = $(RESOLV_LIBS) $(POPT_LIBS) $(EXT2FS_LIBS) $(ZLIB_LIBS) \
+ISYS_LIBS = $(RESOLV_LIBS) $(EXT2FS_LIBS) $(ZLIB_LIBS) \
$(DEVMAPPER_LIBS) $(BLKID_LIBS) $(X11_LIBS) $(SELINUX_LIBS) \
$(LIBNL_LIBS) $(LIBNM_GLIB_LIBS)
diff --git a/isys/isys.c b/isys/isys.c
index 3c0c573ad..4c315126c 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -25,7 +25,6 @@
#define u32 __u32
#include <ext2fs/ext2fs.h>
#include <fcntl.h>
-#include <popt.h>
/* Need to tell loop.h what the actual dev_t type is. */
#undef dev_t
#if defined(__alpha) || (defined(__sparc__) && defined(__arch64__))