[gnome-software/wip/ubuntu-master: 5/6] configure: allow apt and rpm to be configured

[Robert Ancell <rancell src gnome org>]

commit 3cb5c8a365dcd6061b0cbc585031e0f52430e1de
Author: Iain Lane <iain orangesquash org uk>
Date:   Wed Apr 26 16:24:18 2017 +0100

    configure: allow apt and rpm to be configured
    
    We need a more generic solution for the meson options.

 configure |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/configure b/configure
index b2a0754..b18e647 100755
--- a/configure
+++ b/configure
@@ -78,13 +78,17 @@ while (($# > 0)); do
        --disable-man) enable_man='-Denable-man=false';;
        --enable-introspection) enable_introspection='';;
        --disable-introspection) enable_introspection='-Ddisable_introspection=true';;
+       --enable-rpm) enable_rpm='';;
+       --disable-rpm) enable_rpm='-Denable-rpm=false';;
+       --enable-apt) enable_apt='-Denable-apt=true';;
+       --disable-apt) enable_apt='-Denable-apt=false';;
        *) echo -e "\e[1;33mINFO\e[0m: Ignoring unknown option '$1'";;
     esac
     shift
 done
 
 # Defaults
-test -z ${prefix} && prefix="/usr/local"
+test -z ${prefix} && prefix="/usr/local" || prefix=${prefix%/}
 test -z ${bindir} && bindir=${prefix}/bin
 test -z ${sbindir} && sbindir=${prefix}/sbin
 test -z ${libexecdir} && libexecdir=${prefix}/bin
@@ -123,7 +127,7 @@ echo "  libdir:...... ${libdir}"
 echo "  mandir:...... ${mandir}"
 echo "  includedir:.. ${includedir}"
 echo "  additional:.."
-echo "    - ${enable_docs} ${enable_man} ${enable_introspection}"
+echo "    - ${enable_docs} ${enable_man} ${enable_rpm} ${enable_apt} ${enable_introspection}"
 
 exec ${MESON} \
        --prefix=${prefix} \
@@ -138,6 +142,8 @@ exec ${MESON} \
        ${enable_docs} \
        ${enable_man} \
        ${enable_introspection} \
+       ${enable_rpm} \
+       ${enable_apt} \
        ${srcdir}
 
 # vim: ai ts=8 noet sts=2 ft=sh