Parcourir la source

build: Remove WITH_LIST

WITH_LIST is replaced in favor of bcond generator.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Jan Friesse il y a 7 ans
Parent
commit
f26ec675c0
2 fichiers modifiés avec 2 ajouts et 5 suppressions
  1. 2 2
      Makefile.am
  2. 0 3
      configure.ac

+ 2 - 2
Makefile.am

@@ -134,11 +134,11 @@ RPMBUILDOPTS	= --define "_sourcedir $(abs_builddir)" \
 
 srpm: clean
 	$(MAKE) $(SPEC) $(TARFILE)
-	rpmbuild $(WITH_LIST) $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
+	rpmbuild $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
 
 rpm: clean _version
 	$(MAKE) $(SPEC) $(TARFILE)
-	rpmbuild $(WITH_LIST) $(RPMBUILDOPTS) -ba $(SPEC)
+	rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
 
 # release/versioning
 BUILT_SOURCES	= .version

+ 0 - 3
configure.ac

@@ -25,8 +25,6 @@ AC_CANONICAL_HOST
 
 AC_LANG([C])
 
-AC_SUBST(WITH_LIST, [""])
-
 dnl Fix default variables - "prefix" variable if not specified
 if test "$prefix" = "NONE"; then
 	prefix="/usr"
@@ -199,7 +197,6 @@ if test "x${enable_systemd}" = xyes; then
 	PKG_CHECK_MODULES([libsystemd], [libsystemd])
 	AC_DEFINE([HAVE_LIBSYSTEMD], [1], [have systemd interface library])
 	PACKAGE_FEATURES="$PACKAGE_FEATURES systemd"
-        WITH_LIST="$WITH_LIST --with systemd"
 fi
 if test "x${enable_qdevices}" = xyes; then
 	PACKAGE_FEATURES="$PACKAGE_FEATURES qdevices"