From 1a398b79a010b2ba1db2e3f2b738e37de186b0c3 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Wed, 28 Jan 2009 21:58:53 +0000
Subject: [PATCH] * Fix disabling of a few libraries, they were being defined
 in acconf.h when   --without-* was being supplied.

Originally committed to SVN as r2707.
---
 configure.in | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/configure.in b/configure.in
index 6bed14c79..1bcb9fc42 100644
--- a/configure.in
+++ b/configure.in
@@ -468,7 +468,9 @@ fi
 if test "$agi_cv_with_pulseaudio" = "no" && test "$with_pulseaudio" = "yes"; then
   AC_MSG_WARN([PulseAudio detected, but it doesn't work...])
   with_pulseaudio="no"
-else
+fi
+
+if test "$agi_cv_with_pulseaudio" = "yes" && test "$with_pulseaudio" = "yes"; then
   AC_DEFINE(WITH_PULSEAUDIO, 1, [Enable PulseAudio support])
   found_audio="yes"
 fi
@@ -506,7 +508,9 @@ fi
 if test "$agi_cv_with_openal" = "no" && test "$with_openal" = "yes"; then
   AC_MSG_WARN([OpenAL detected, but it doesn't work...])
   with_openal="no"
-else
+fi
+
+if test "$agi_cv_with_openal" = "yes" && test "$with_openal" = "yes"; then
   found_audio="yes"
   AC_DEFINE(WITH_OPENAL, 1, [Enable OpenAL support])
 fi
@@ -574,25 +578,31 @@ int main (void) {
 } ])
 fi
 
-AC_SUBST(LIBAVFORMAT_LIBS)
-AC_SUBST(LIBAVFORMAT_CFLAGS)
-AC_SUBST(LIBAVCODEC_LIBS)
-AC_SUBST(LIBAVCODEC_CFLAGS)
-AC_SUBST(LIBSWSCALE_LIBS)
-AC_SUBST(LIBSWSCALE_CFLAGS)
-AC_SUBST(LIBAVUTIL_LIBS)
-AC_SUBST(LIBAVUTIL_CFLAGS)
+if test "$agi_cv_with_ffmpeg" = "no" && test "$with_ffmpeg" = "yes"; then
+  AC_MSG_WARN([FFMPEG detected, but it doesn't work...])
+  with_ffmpeg="no"
+fi
 
-AM_CONDITIONAL([HAVE_FFMPEG], [test "$agi_cv_with_ffmpeg" = "yes"])
+if test "$agi_cv_with_ffmpeg" = "yes" && test "$with_ffmpeg" = "yes"; then
+  AC_SUBST(LIBAVFORMAT_LIBS)
+  AC_SUBST(LIBAVFORMAT_CFLAGS)
+  AC_SUBST(LIBAVCODEC_LIBS)
+  AC_SUBST(LIBAVCODEC_CFLAGS)
+  AC_SUBST(LIBSWSCALE_LIBS)
+  AC_SUBST(LIBSWSCALE_CFLAGS)
+  AC_SUBST(LIBAVUTIL_LIBS)
+  AC_SUBST(LIBAVUTIL_CFLAGS)
+  with_ffmpeg="yes"
+fi
 
 if test "$agi_cv_with_ffmpeg" = "no" || test "$with_ffmpeg" = "no"; then
   ffmpegsource_provider_disabled="(disabled, requires FFMPEG)"
   ffmpeg_provider_disabled="(disabled, requires FFMPEG)"
   with_ffmpeg="no"
-else
-  with_ffmpeg="yes"
 fi
 
+AM_CONDITIONAL([HAVE_FFMPEG], [test "$agi_cv_with_ffmpeg" = "yes"])
+
 AC_ARG_WITH(provider-ffmpeg, [  --without-provider-ffmpeg
                           build without FFMPEG A/V provider. (default: auto)], ffmpeg_provider_disabled="(disabled)", with_provider_ffmpeg="yes")
 
@@ -708,7 +718,7 @@ if test "$agi_cv_with_hunspell" = "no" && test "$with_hunspell" = "yes"; then
   with_hunspell="no"
 fi
 
-if test "$with_hunspell" = "yes"; then
+if test "$agi_cv_with_hunspell" = "yes" && test "$with_hunspell" = "yes"; then
   AC_DEFINE(WITH_HUNSPELL, 1, [Enable Hunspell support.])
 fi
 
@@ -884,7 +894,7 @@ if test "$agi_cv_with_perl" = "no" && test "$with_cv_perl" = "yes"; then
   with_cv_perl="no"
 fi
 
-if test "$with_cv_perl" = "yes"; then
+if test "$agi_cv_with_perl" = "yes" && test "$with_cv_perl" = "yes"; then
   with_automation="yes"
   AC_SUBST(PERL_CFLAGS)
   AC_SUBST(PERL_LDFLAGS)
@@ -951,7 +961,7 @@ if test "$agi_cv_with_ruby" = "no" && test "$with_cv_ruby" = "yes"; then
   with_cv_ruby="no"
 fi
 
-if test "$with_cv_ruby" = "yes"; then
+if test "$agi_cv_with_ruby" = "yes" && test "$with_cv_ruby" = "yes"; then
   with_automation="yes"
   AC_SUBST(RUBY_CFLAGS)
   AC_SUBST(RUBY_LDFLAGS)