From bfddae7ceefa4a419ff56848122a46c71c4d6a3c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 22 Dec 2012 17:26:44 +0000
Subject: [PATCH] build: Change --with-febootstrap-yum-config to
 --with-febootstrap-packager-config

For the rationale behind this renaming, see:
https://github.com/libguestfs/febootstrap/commit/b8cbe191d0f03af1f6a42a07795995b16d5a8c24

You can still, for the time being, use
./configure --with-febootstrap-yum-config
but it's preferred to switch to the new option.  The new option is
identical, just renamed.

Qe still pass the deprecated --yum-config option to febootstrap
itself, since both old and new febootstrap support this.
---
 appliance/make.sh.in |  6 ++++--
 configure.ac         | 25 +++++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index 0335f6e0f..05d663251 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -28,8 +28,10 @@ done
 exec 5<&-
 
 # Run febootstrap on the package list.
-if [ "x@FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then
-    extra="--yum-config @FEBOOTSTRAP_YUM_CONFIG@"
+# NB: Keep using --yum-config (deprecated alias) here since both old
+# and new febootstrap still support it.
+if [ "x@FEBOOTSTRAP_PACKAGER_CONFIG@" != "xno" ]; then
+    extra="--yum-config @FEBOOTSTRAP_PACKAGER_CONFIG@"
 fi
 
 echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
diff --git a/configure.ac b/configure.ac
index e6e942455..3f67869e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,14 +365,27 @@ AC_CHECK_PROG([FEBOOTSTRAP],
               [febootstrap],[febootstrap],[no])
 
 dnl Pass a febootstrap --yum-config option.
-AC_MSG_CHECKING([if user requested febootstrap --yum-config option])
+dnl
+dnl Note that in febootstrap >= 3.21, this option is now called
+dnl --packager-config, although --yum-config can still be used
+dnl as a deprecated alias.
+AC_MSG_CHECKING([for --with-febootstrap-yum-config option (deprecated)])
 AC_ARG_WITH([febootstrap-yum-config],
     [AS_HELP_STRING([--with-febootstrap-yum-config=FILE],
-      [pass febootstrap --yum-config option @<:@default=no@:>@])],
-    [FEBOOTSTRAP_YUM_CONFIG="$withval"],
-    [FEBOOTSTRAP_YUM_CONFIG=no])
-AC_MSG_RESULT([$FEBOOTSTRAP_YUM_CONFIG])
-AC_SUBST([FEBOOTSTRAP_YUM_CONFIG])
+      [pass febootstrap --packager-config option @<:@default=no@:>@])],
+    [FEBOOTSTRAP_PACKAGER_CONFIG="$withval"],
+    [FEBOOTSTRAP_PACKAGER_CONFIG=no])
+AC_MSG_RESULT([$FEBOOTSTRAP_PACKAGER_CONFIG])
+AC_SUBST([FEBOOTSTRAP_PACKAGER_CONFIG])
+
+AC_MSG_CHECKING([for --with-febootstrap-packager-config option])
+AC_ARG_WITH([febootstrap-packager-config],
+    [AS_HELP_STRING([--with-febootstrap-packager-config=FILE],
+      [pass febootstrap --packager-config option @<:@default=no@:>@])],
+    [FEBOOTSTRAP_PACKAGER_CONFIG="$withval"],
+    [FEBOOTSTRAP_PACKAGER_CONFIG=no])
+AC_MSG_RESULT([$FEBOOTSTRAP_PACKAGER_CONFIG])
+AC_SUBST([FEBOOTSTRAP_PACKAGER_CONFIG])
 
 if test "x$enable_appliance" = "xyes"; then
     test "x$FEBOOTSTRAP" = "xno" &&