Early morning code-o, setting AM_CONDITIONAL _after_ the Makefiles are

generated isn't going to work very well.

Originally committed to SVN as r2793.
This commit is contained in:
Amar Takhar 2009-04-12 10:48:20 +00:00
parent 733814793e
commit dc34db7f62
1 changed files with 8 additions and 2 deletions

View File

@ -1310,6 +1310,14 @@ fi
AC_DEFINE_UNQUOTED([DEFAULT_PLAYER_AUDIO], ["$default_player_audio"], [Default audio player.]) AC_DEFINE_UNQUOTED([DEFAULT_PLAYER_AUDIO], ["$default_player_audio"], [Default audio player.])
###############
# Misc settings
###############
AM_CONDITIONAL([FOUND_AUDIO_PLAYER], [test "$found_audio_player" = "yes"])
AM_CONDITIONAL([FOUND_VIDEO_PROVIDER], [test "$found_video_provider" = "yes"])
# Makefiles # Makefiles
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
@ -1334,7 +1342,6 @@ scripts/osx-bundle.sed
AC_OUTPUT AC_OUTPUT
AM_CONDITIONAL([FOUND_AUDIO_PLAYER], [test -z "$found_audio_player"])
if test -z "$found_audio_player"; then if test -z "$found_audio_player"; then
AC_MSG_NOTICE([ AC_MSG_NOTICE([
@ -1352,7 +1359,6 @@ if test -z "$found_audio_player"; then
]) ])
fi fi
AM_CONDITIONAL([FOUND_VIDEO_PROVIDER], [test -z "$found_video_provider"])
if test -z "$found_video_provider"; then if test -z "$found_video_provider"; then
AC_MSG_NOTICE([ AC_MSG_NOTICE([