|
 |
c401cc |
From 7c266d416edbbe69a874f70732cea545cfe61dba Mon Sep 17 00:00:00 2001
|
|
|
c401cc |
Message-Id: <7c266d416edbbe69a874f70732cea545cfe61dba@dist-git>
|
|
|
c401cc |
From: Eric Blake <eblake@redhat.com>
|
|
|
c401cc |
Date: Wed, 26 Feb 2014 14:35:04 +0100
|
|
|
c401cc |
Subject: [PATCH] build: use --with-systemd-daemon as configure option
|
|
|
c401cc |
|
|
|
c401cc |
https://bugzilla.redhat.com/show_bug.cgi?id=1032695
|
|
|
c401cc |
|
|
|
c401cc |
Commit 68954fb added a configure option --with-systemd_daemon,
|
|
|
c401cc |
which violates the conventions of configure files preferring
|
|
|
c401cc |
dash in all option names. This fixes it, before we hit a
|
|
|
c401cc |
release where the tarball is baked with an awkward name.
|
|
|
c401cc |
|
|
|
c401cc |
* m4/virt-lib.m4 (LIBVIRT_CHECK_LIB, LIBVIRT_CHECK_LIB_ALT)
|
|
|
c401cc |
(LIBVIRT_CHECK_PKG): Favor - over _ in configure option names.
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
c401cc |
(cherry picked from commit 25034b3c40fc7295511f80cad1d923b5f4efcb70)
|
|
|
c401cc |
|
|
|
c401cc |
Conflicts:
|
|
|
c401cc |
m4/virt-lib.m4: Context, as f92c7e31 is not backported yet
|
|
|
c401cc |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c401cc |
---
|
|
|
c401cc |
m4/virt-lib.m4 | 20 +++++++++++++-------
|
|
|
c401cc |
1 file changed, 13 insertions(+), 7 deletions(-)
|
|
|
c401cc |
|
|
|
c401cc |
diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4
|
|
|
c401cc |
index 778cd40..57e6b31 100644
|
|
|
c401cc |
--- a/m4/virt-lib.m4
|
|
|
c401cc |
+++ b/m4/virt-lib.m4
|
|
|
c401cc |
@@ -1,7 +1,7 @@
|
|
|
c401cc |
dnl
|
|
|
c401cc |
dnl virt-lib.m4: Helper macros for checking for libraries
|
|
|
c401cc |
dnl
|
|
|
c401cc |
-dnl Copyright (C) 2012-2013 Red Hat, Inc.
|
|
|
c401cc |
+dnl Copyright (C) 2012-2014 Red Hat, Inc.
|
|
|
c401cc |
dnl
|
|
|
c401cc |
dnl This library is free software; you can redistribute it and/or
|
|
|
c401cc |
dnl modify it under the terms of the GNU Lesser General Public
|
|
|
c401cc |
@@ -54,15 +54,16 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[
|
|
|
c401cc |
m4_pushdef([header_name], [$4])
|
|
|
c401cc |
|
|
|
c401cc |
m4_pushdef([check_name_lc], m4_tolower(check_name))
|
|
|
c401cc |
+ m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
|
|
|
c401cc |
|
|
|
c401cc |
m4_pushdef([config_var], [WITH_]check_name)
|
|
|
c401cc |
m4_pushdef([make_var], [WITH_]check_name)
|
|
|
c401cc |
m4_pushdef([cflags_var], check_name[_CFLAGS])
|
|
|
c401cc |
m4_pushdef([libs_var], check_name[_LIBS])
|
|
|
c401cc |
- m4_pushdef([arg_var], [with-]check_name_lc)
|
|
|
c401cc |
+ m4_pushdef([arg_var], [with-]check_name_dash)
|
|
|
c401cc |
m4_pushdef([with_var], [with_]check_name_lc)
|
|
|
c401cc |
|
|
|
c401cc |
- AC_ARG_WITH(check_name_lc,
|
|
|
c401cc |
+ AC_ARG_WITH(check_name_dash,
|
|
|
c401cc |
[AS_HELP_STRING([--arg_var],
|
|
|
c401cc |
[with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])],
|
|
|
c401cc |
[],[with_var][=check])
|
|
|
c401cc |
@@ -126,6 +127,7 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[
|
|
|
c401cc |
m4_popdef([make_var])
|
|
|
c401cc |
m4_popdef([config_var])
|
|
|
c401cc |
|
|
|
c401cc |
+ m4_popdef([check_name_dash])
|
|
|
c401cc |
m4_popdef([check_name_lc])
|
|
|
c401cc |
|
|
|
c401cc |
m4_popdef([header_name])
|
|
|
c401cc |
@@ -182,17 +184,18 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[
|
|
|
c401cc |
m4_pushdef([header_name_alt], [$8])
|
|
|
c401cc |
|
|
|
c401cc |
m4_pushdef([check_name_lc], m4_tolower(check_name))
|
|
|
c401cc |
+ m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
|
|
|
c401cc |
|
|
|
c401cc |
m4_pushdef([config_var], [WITH_]check_name)
|
|
|
c401cc |
m4_pushdef([make_var], [WITH_]check_name)
|
|
|
c401cc |
m4_pushdef([cflags_var], check_name[_CFLAGS])
|
|
|
c401cc |
m4_pushdef([libs_var], check_name[_LIBS])
|
|
|
c401cc |
- m4_pushdef([arg_var], [with-]check_name_lc)
|
|
|
c401cc |
+ m4_pushdef([arg_var], [with-]check_name_dash)
|
|
|
c401cc |
m4_pushdef([with_var], [with_]check_name_lc)
|
|
|
c401cc |
m4_pushdef([config_var_alt], [WITH_]check_name_alt)
|
|
|
c401cc |
m4_pushdef([make_var_alt], [WITH_]check_name_alt)
|
|
|
c401cc |
|
|
|
c401cc |
- AC_ARG_WITH(check_name_lc,
|
|
|
c401cc |
+ AC_ARG_WITH(check_name_dash,
|
|
|
c401cc |
[AS_HELP_STRING([--arg_var],
|
|
|
c401cc |
[with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])],
|
|
|
c401cc |
[],[with_var][=check])
|
|
|
c401cc |
@@ -273,6 +276,7 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[
|
|
|
c401cc |
m4_popdef([config_var])
|
|
|
c401cc |
|
|
|
c401cc |
m4_popdef([check_name_lc])
|
|
|
c401cc |
+ m4_popdef([check_name_dash])
|
|
|
c401cc |
|
|
|
c401cc |
m4_popdef([header_name_alt])
|
|
|
c401cc |
m4_popdef([function_name_alt])
|
|
|
c401cc |
@@ -310,15 +314,16 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[
|
|
|
c401cc |
m4_pushdef([pc_version], [$3])
|
|
|
c401cc |
|
|
|
c401cc |
m4_pushdef([check_name_lc], m4_tolower(check_name))
|
|
|
c401cc |
+ m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
|
|
|
c401cc |
|
|
|
c401cc |
m4_pushdef([config_var], [WITH_]check_name)
|
|
|
c401cc |
m4_pushdef([make_var], [WITH_]check_name)
|
|
|
c401cc |
m4_pushdef([cflags_var], check_name[_CFLAGS])
|
|
|
c401cc |
m4_pushdef([libs_var], check_name[_LIBS])
|
|
|
c401cc |
- m4_pushdef([arg_var], [with-]check_name_lc)
|
|
|
c401cc |
+ m4_pushdef([arg_var], [with-]check_name_dash)
|
|
|
c401cc |
m4_pushdef([with_var], [with_]check_name_lc)
|
|
|
c401cc |
|
|
|
c401cc |
- AC_ARG_WITH(check_name_lc,
|
|
|
c401cc |
+ AC_ARG_WITH(check_name_dash,
|
|
|
c401cc |
[AS_HELP_STRING([--arg_var],
|
|
|
c401cc |
[with ]]m4_dquote(pc_name)[[ (>= ]]m4_dquote(pc_version)[[) support @<:@default=check@:>@])],
|
|
|
c401cc |
[],[with_var][=check])
|
|
|
c401cc |
@@ -353,6 +358,7 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[
|
|
|
c401cc |
m4_popdef([config_var])
|
|
|
c401cc |
|
|
|
c401cc |
m4_popdef([check_name_lc])
|
|
|
c401cc |
+ m4_popdef([check_name_dash])
|
|
|
c401cc |
|
|
|
c401cc |
m4_popdef([pc_version])
|
|
|
c401cc |
m4_popdef([pc_name])
|
|
|
c401cc |
--
|
|
|
c401cc |
1.9.0
|
|
|
c401cc |
|