From 6d2cef480fdc26ade9ea2b262b769c4072f20455 Mon Sep 17 00:00:00 2001 From: "benjamin.drung@gmail.com" Date: Thu, 14 Nov 2013 11:08:43 +0000 Subject: [PATCH] Make sure that we have expat enabled one way or another. --- configure | 5 +++++ configure.ac | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/configure b/configure index 10d163ec3..891b514f9 100755 --- a/configure +++ b/configure @@ -8670,11 +8670,16 @@ $as_echo "$as_me: disabling $lib at your request" >&6;} done # In some cases the choices made above might be inappropriate. +# * we need to have expat one way or another # * we need to have libwidgetextra one way or another # * we need to have libsndfile one way or another # * we need to have portaudio way or another # * we can only use one of libsoxr, libsamplerate and libresample +if test "$LIBEXPAT_USE_LOCAL" != "yes" -a "$LIBEXPAT_USE_SYSTEM" != "yes"; then + as_fn_error $? "Audacity requires expat to be enabled." "$LINENO" 5 +fi + if test "$WIDGETEXTRA_USE_LOCAL" != "yes" -a "$WIDGETEXTRA_USE_SYSTEM" != "yes"; then as_fn_error $? "Audacity requires libwidgetextra to be enabled." "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 74975d6ea..f440ce005 100644 --- a/configure.ac +++ b/configure.ac @@ -405,11 +405,16 @@ for lib in $LIBRARIES ; do done # In some cases the choices made above might be inappropriate. +# * we need to have expat one way or another # * we need to have libwidgetextra one way or another # * we need to have libsndfile one way or another # * we need to have portaudio way or another # * we can only use one of libsoxr, libsamplerate and libresample +if test "$LIBEXPAT_USE_LOCAL" != "yes" -a "$LIBEXPAT_USE_SYSTEM" != "yes"; then + AC_MSG_ERROR([Audacity requires expat to be enabled.]) +fi + if test "$WIDGETEXTRA_USE_LOCAL" != "yes" -a "$WIDGETEXTRA_USE_SYSTEM" != "yes"; then AC_MSG_ERROR([Audacity requires libwidgetextra to be enabled.]) fi