aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/mpd_auto.m46
-rw-r--r--m4/mpd_define_conditional.m48
2 files changed, 9 insertions, 5 deletions
diff --git a/m4/mpd_auto.m4 b/m4/mpd_auto.m4
index 5a6c25861..a57ee2d5a 100644
--- 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
diff --git a/m4/mpd_define_conditional.m4 b/m4/mpd_define_conditional.m4
new file mode 100644
index 000000000..4bc849984
--- /dev/null
+++ b/m4/mpd_define_conditional.m4
@@ -0,0 +1,8 @@
+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])