# HG changeset patch # User diego # Date 1223118410 0 # Node ID bcb0f2fb9d3721da90485cb885d476f78e01282c # Parent 9ec6cc5d70179d4542ddef9b3ee7a564c4206266 cosmetics: Move around stuff in config.mak. diff -r 9ec6cc5d7017 -r bcb0f2fb9d37 configure --- a/configure Sat Oct 04 10:57:57 2008 +0000 +++ b/configure Sat Oct 04 11:06:50 2008 +0000 @@ -7796,16 +7796,6 @@ MENCODER = $_mencoder MPLAYER = $_mplayer -#internal libraries -LIBA52 = $_liba52 -LIBA52_INTERNAL = $_liba52_internal -LIBMPEG2 = $_libmpeg2 -MP3LIB = $_mp3lib -TREMOR_INTERNAL = $_tremor_internal - -HAVE_SYS_MMAN_H = $_mman -HAVE_POSIX_SELECT = $_posix_select - NEED_GETTIMEOFDAY = $_need_gettimeofday NEED_GLOB = $_need_glob NEED_MMAP = $_need_mmap @@ -7815,12 +7805,9 @@ NEED_SWAB = $_need_swab NEED_VSSCANF = $_need_vsscanf -# audio output -OSS = $_ossaudio +# features +ALSA1X = $_alsa1x ALSA9 = $_alsa9 -ALSA1X = $_alsa1x - -# features APPLE_IR = $_apple_ir APPLE_REMOTE = $_apple_remote AUDIO_INPUT = $_audio_input @@ -7842,9 +7829,13 @@ GUI = $_gui GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 +HAVE_POSIX_SELECT = $_posix_select +HAVE_SYS_MMAN_H = $_mman JOYSTICK = $_joystick JPEG = $_jpeg LADSPA = $_ladspa +LIBA52 = $_liba52 +LIBA52_INTERNAL = $_liba52_internal LIBASS = $_ass LIBDCA = $_libdca LIBDV = $_libdv @@ -7853,6 +7844,7 @@ LIBMAD = $_mad LIBMENU = $_menu LIBMENU_DVBIN = $_menu_dvbin +LIBMPEG2 = $_libmpeg2 LIBNEMESI = $_nemesi LIBNUT = $_libnut LIBSMBCLIENT = $_smb @@ -7863,9 +7855,11 @@ MACOSX_BUNDLE = $_macosx_bundle MACOSX_FINDER = $_macosx_finder MP3LAME = $_mp3lame +MP3LIB = $_mp3lib MUSEPACK = $_musepack NATIVE_RTSP = $_native_rtsp NETWORK = $_network +OSS = $_ossaudio PE_EXECUTABLE = $_pe_executable PNG = $_png PVR = $_pvr @@ -7879,6 +7873,7 @@ SPEEX = $_speex STREAM_CACHE = $_stream_cache TOOLAME=$_toolame +TREMOR_INTERNAL = $_tremor_internal TV = $_tv TV_BSDBT848 = $_tv_bsdbt848 TV_DSHOW = $_tv_dshow