configure.ac: add macro MPD_DEFINE_CONDITIONAL

373706c9 · Max Kellermann · 7afe63aa · 373706c9 · 373706c9 · 373706c9
Commit 373706c9 authored Dec 21, 2014 by Max Kellermann
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 46 additions and 86 deletions

configure.ac configure.ac +37 -81

mpd_auto.m4 m4/mpd_auto.m4 +1 -5

mpd_define_conditional.m4 m4/mpd_define_conditional.m4 +8 -0

No files found.
--- a/configure.ac
+++ b/configure.ac
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -93,11 +93,7 @@ AC_DEFUN([MPD_ARG_ENABLE], [

 	$5

-	if test x$[]enable_$1 = xyes; then
-		AC_DEFINE(ENABLE_$2, 1,
-			[Define to enable $3])
-	fi
-	AM_CONDITIONAL(ENABLE_$2, test x$[]enable_$1 = xyes)
+	MPD_DEFINE_CONDITIONAL(enable_$1, ENABLE_$2, [$3])
 ])

 dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG

--- a/m4/mpd_define_conditional.m4
+++ b/m4/mpd_define_conditional.m4
+dnl Wrapper for AC_DEFINE and AM_CONDITIONAL
+dnl
+dnl Parameters: varname1, varname2, description
+AC_DEFUN([MPD_DEFINE_CONDITIONAL], [dnl
+	AM_CONDITIONAL($2, test x$[]$1 = xyes)
+	if test x$[]$1 = xyes; then
+		AC_DEFINE($2, 1, [Define to enable $3])
+	fi])