Remove WITH_MAGIC_SUBDIR.

diff --git a/Makefile.am b/Makefile.am
index 763db8d..08d4573 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = CHANGES ChangeLog CREDITS Doxyheader GROUPS INSTALL \
        config.site db db3/configure installplatform platform* \
        rpm.magic rpmpopt-$(VERSION)
 
-SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ lua rpmio rpmdb lib build python tools scripts doc .
+SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ lua rpmio rpmdb lib build python tools scripts doc .
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = rpm.pc

diff --git a/configure.ac b/configure.ac
index a61a53d..c6eead5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -478,13 +478,11 @@ AC_SUBST(WITH_NEON_LIB)
 
 #=================
 # Check for magic library.
-WITH_MAGIC_SUBDIR=
 WITH_MAGIC_INCLUDE=
 WITH_MAGIC_LIB=
 
 AC_CHECK_HEADER([magic.h], [
     AC_CHECK_LIB(magic, magic_open, [
-      WITH_MAGIC_SUBDIR=
       WITH_MAGIC_INCLUDE=
       WITH_MAGIC_LIB="-lmagic"
     ])
@@ -493,7 +491,6 @@ if test -z "${WITH_MAGIC_LIB}" ; then
    AC_MSG_ERROR([rpm requires libmagic]) 
 fi
 
-AC_SUBST(WITH_MAGIC_SUBDIR)
 AC_SUBST(WITH_MAGIC_INCLUDE)
 AC_SUBST(WITH_MAGIC_LIB)