mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

fix auto* library referencing

Browse source 
Originally committed to SVN as r1282.
This commit is contained in:
David Lamparter 2007-06-21 20:41:17 +00:00
parent 2d4032d83b
commit 2d1df509f4
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/Makefile.am
View file

@ -26,15 +26,12 @@ endif
AUDIO_PLAYER=audio_player.cpp AUDIO_PLAYER=audio_player.cpp
if HAVE_PORTAUDIO if HAVE_PORTAUDIO
AUDIO_PLAYER += audio_player_portaudio.cpp AUDIO_PLAYER += audio_player_portaudio.cpp
aegisub_LDFLAGS += -lportaudio
endif endif
if HAVE_ALSA if HAVE_ALSA
AUDIO_PLAYER += audio_player_alsa.cpp AUDIO_PLAYER += audio_player_alsa.cpp
aegisub_LDFLAGS += -lasound
endif endif
if HAVE_PULSEAUDIO if HAVE_PULSEAUDIO
AUDIO_PLAYER += audio_player_pulse.cpp AUDIO_PLAYER += audio_player_pulse.cpp
aegisub_LDFLAGS += -lpulse
endif endif
AUTOMATION = auto4_base.cpp AUTOMATION = auto4_base.cpp

8
configure.ac
View file

@ -66,8 +66,8 @@ EOM
]) ])
AC_CHECK_LIB([asound], [snd_pcm_open], [found_audio=yes], [with_alsa=no]) AC_CHECK_LIB([asound], [snd_pcm_open], [LIBS="-lasound $LIBS"; found_audio=yes], [with_alsa=no])
AC_CHECK_LIB([portaudio], [Pa_Initialize], [found_audio=yes], [with_portaudio=no]) AC_CHECK_LIB([portaudio], [Pa_Initialize], [LIBS="-lportaudio $LIBS";found_audio=yes], [with_portaudio=no])
AC_CHECK_FUNCS([Pa_GetStreamTime]) AC_CHECK_FUNCS([Pa_GetStreamTime])
PKG_CHECK_MODULES([LIBPULSE], libpulse >= 0.5, [found_audio=yes], [with_pulseaudio=no]) PKG_CHECK_MODULES([LIBPULSE], libpulse >= 0.5, [found_audio=yes], [with_pulseaudio=no])
AC_CHECK_LIB([avcodec], [avcodec_init],, [with_ffmpeg=no]) AC_CHECK_LIB([avcodec], [avcodec_init],, [with_ffmpeg=no])
@ -110,8 +110,8 @@ else
AC_MSG_XFAILURE([wxWidgets is required. Try --with-wx-config.]) AC_MSG_XFAILURE([wxWidgets is required. Try --with-wx-config.])
fi fi
CPPFLAGS="$CPPFLAGS `$WXCONFIG --cppflags | sed -e 's/-fno-exceptions//'` $FREETYPE_CFLAGS" CPPFLAGS="$CPPFLAGS `$WXCONFIG --cppflags | sed -e 's/-fno-exceptions//'` $FREETYPE_CFLAGS $LIBPULSE_CFLAGS"
LIBS="$LIBS `$WXCONFIG --libs std,gl,stc` $FREETYPE_LIBS" LIBS="$LIBS `$WXCONFIG --libs std,gl,stc` $FREETYPE_LIBS $LIBPULSE_LIBS"
AC_MSG_CHECKING([wxWidgets OpenGL support]) AC_MSG_CHECKING([wxWidgets OpenGL support])
AC_LINK_IFELSE([ AC_LINK_IFELSE([