Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

make sure WANT_APP_* runs first, to fix request modules

  • Loading branch information...
commit 8ee47c93f20a528c460ccf8729cc751178e591da 1 parent 700f8d0
@novas0x2a novas0x2a authored
Showing with 29 additions and 18 deletions.
  1. +15 −9 m4/ax_app.m4
  2. +14 −9 m4/ax_module.m4
View
24 m4/ax_app.m4
@@ -37,18 +37,24 @@ AC_DEFUN([AX_APP],
HAVE_PKG_$1_SRC=yes
- if test -n "$ENABLE_APP_$1"; then
- WANT_APP_$1="$ENABLE_APP_$1"
- fi
-
AC_DIVERT_PUSH(AX_DIVERSION_PROCESS_OPTIONS)dnl
- AC_ARG_ENABLE([app-]m4_tolower([[$1]]),
- AC_HELP_STRING([--enable-app-]m4_tolower([[$1]]), [enable the $1 app @<:@$3@:>@]),
- [ ENABLE_APP_$1=$enableval; WANT_APP_$1=$enableval; ],
- [ if test "x$ENABLE_APP_$1" = x; then ENABLE_APP_$1=`/bin/echo -n $3 | tr [A-Z] [a-z]` ; fi ]
- )
+ # Silently ignore apps that don't exist in this distribution
+ # I'm diverting the output, so i need to do this twice.
+ if test -d "$srcdir/$2" ; then
+
+ if test -n "$ENABLE_APP_$1"; then
+ WANT_APP_$1="$ENABLE_APP_$1"
+ fi
+
+ AC_ARG_ENABLE([app-]m4_tolower([[$1]]),
+ AC_HELP_STRING([--enable-app-]m4_tolower([[$1]]), [enable the $1 app @<:@$3@:>@]),
+ [ ENABLE_APP_$1=$enableval; WANT_APP_$1=$enableval; ],
+ [ if test "x$ENABLE_APP_$1" = x; then ENABLE_APP_$1=`/bin/echo -n $3 | tr [A-Z] [a-z]` ; fi ]
+ )
+ fi
AC_DIVERT_POP()dnl
+
AC_MSG_CHECKING([whether to build app $1])
ax_app_enable=$ENABLE_APP_$1
View
23 m4/ax_module.m4
@@ -37,16 +37,21 @@ AC_DEFUN([AX_MODULE],
HAVE_PKG_$1_SRC=yes
- if test -n "$ENABLE_MODULE_$1"; then
- WANT_MODULE_$1="$ENABLE_MODULE_$1"
- fi
-
AC_DIVERT_PUSH(AX_DIVERSION_PROCESS_OPTIONS)dnl
- AC_ARG_ENABLE([module-]m4_tolower([[$1]]),
- AC_HELP_STRING([--enable-module-]m4_tolower([[$1]]), [enable the $1 module @<:@$4@:>@]),
- [ ENABLE_MODULE_$1=$enableval; WANT_MODULE_$1=$enableval; ],
- [ if test x"$ENABLE_MODULE_$1" = x; then ENABLE_MODULE_$1=`/bin/echo -n $4 | tr [A-Z] [a-z]` ; fi ]
- )
+ # Silently ignore modules that don't exist in this distribution
+ # I'm diverting the output, so i need to do this twice.
+ if test -d "$srcdir/$2" ; then
+
+ if test -n "$ENABLE_MODULE_$1"; then
+ WANT_MODULE_$1="$ENABLE_MODULE_$1"
+ fi
+
+ AC_ARG_ENABLE([module-]m4_tolower([[$1]]),
+ AC_HELP_STRING([--enable-module-]m4_tolower([[$1]]), [enable the $1 module @<:@$4@:>@]),
+ [ ENABLE_MODULE_$1=$enableval; WANT_MODULE_$1=$enableval; ],
+ [ if test x"$ENABLE_MODULE_$1" = x; then ENABLE_MODULE_$1=`/bin/echo -n $4 | tr [A-Z] [a-z]` ; fi ]
+ )
+ fi
AC_DIVERT_POP()dnl
AC_MSG_CHECKING([whether to build module $1])
Please sign in to comment.
Something went wrong with that request. Please try again.