[Pkg-gnupg-commit] [gnupg2] 70/160: build: Improve GNUPG_BUILD_PROGRAM macro.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Fri Jul 15 09:36:37 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

commit d8ee0d79a702c92a257884bab86183d32d16ff0e
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 29 11:39:49 2016 +0200

    build: Improve GNUPG_BUILD_PROGRAM macro.
    
    * acinclude.m4 (GNUPG_BUILD_PROGRAM): Allow for dash in options.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 acinclude.m4 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 7c264a4..724c085 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -165,23 +165,25 @@ AC_DEFUN([GNUPG_CHECK_ENDIAN],
 # build_NAME and whether --enable-NAME or --disable-NAME is shown with
 # ./configure --help
 AC_DEFUN([GNUPG_BUILD_PROGRAM],
-  [build_$1=$2
+  [m4_define([my_build], [m4_bpatsubst(build_$1, [[^a-zA-Z0-9_]], [_])])
+   my_build=$2
    m4_if([$2],[yes],[
       AC_ARG_ENABLE([$1], AC_HELP_STRING([--disable-$1],
                                          [do not build the $1 program]),
-                           build_$1=$enableval, build_$1=$2)
+                           my_build=$enableval, my_build=$2)
     ],[
       AC_ARG_ENABLE([$1], AC_HELP_STRING([--enable-$1],
                                          [build the $1 program]),
-                           build_$1=$enableval, build_$1=$2)
+                           my_build=$enableval, my_build=$2)
     ])
-   case "$build_$1" in
+   case "$my_build" in
          no|yes)
            ;;
          *)
            AC_MSG_ERROR([only yes or no allowed for feature --enable-$1])
            ;;
    esac
+   m4_undefine([my_build])
   ])
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list