# HG changeset patch
# User diego
# Date 1223616889 0
# Node ID 8b6bc2bcc2409180a6fa3f1e8826bddb69c0fd07
# Parent  32b1202fbd728ed39384d8261ad96512d29b9567
cosmetics: Group codec-, network- and gui-related options together in config.h.

diff -r 32b1202fbd72 -r 8b6bc2bcc240 configure
--- a/configure	Thu Oct 09 22:11:56 2008 +0000
+++ b/configure	Fri Oct 10 05:34:49 2008 +0000
@@ -8273,24 +8273,6 @@
 #endif
 
 
-/* Define if you are using Xvid library */
-$_def_xvid
-
-/* Define if you are using the X.264 library */
-$_def_x264
-
-/* Define if you are using libnut */
-$_def_libnut
-
-/* Define to include support for libdv-0.9.5 */
-$_def_libdv
-
-/* Indicates if libmp3lame is available
-   Note: for mencoder */
-$_def_mp3lame
-$_def_mp3lame_preset
-$_def_mp3lame_preset_medium
-
 /* define this to use iconv(3) function to codepage conversions */
 $_def_iconv
 
@@ -8350,6 +8332,28 @@
 /* maximum alignment used by libmpeg2 */
 #define ATTRIBUTE_ALIGNED_MAX 16
 
+/* enable FAAD (AAC) support */
+$_def_faad
+$_def_faad_internal
+
+/* enable FAAC (AAC encoder) support */
+$_def_faac
+
+/* Define if you are using the Xvid library */
+$_def_xvid
+
+/* Define if you are using the X.264 library */
+$_def_x264
+
+/* Define to include support for libdv-0.9.5 */
+$_def_libdv
+
+/* Indicates if libmp3lame is available
+   Note: for mencoder */
+$_def_mp3lame
+$_def_mp3lame_preset
+$_def_mp3lame_preset_medium
+
 /* liblzo support */
 $_def_liblzo
 
@@ -8369,13 +8373,6 @@
 /* enable OggTheora support */
 $_def_theora
 
-/* enable FAAD (AAC) support */
-$_def_faad
-$_def_faad_internal
-
-/* enable FAAC (AAC encoder) support */
-$_def_faac
-
 /* enable libdca support */
 $_def_libdca
 
@@ -8400,11 +8397,12 @@
 $_def_qtx
 $_def_qtx_win32
 
-/* LIVE555 Streaming Media library support */
-$_def_live
-
-/* libnemesi Streaming Media library support */
-$_def_nemesi
+/* Define if you are using libnut */
+$_def_libnut
+
+/* XMMS input plugin support */
+$_def_xmms
+#define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir"
 
 /* Use UnRAR executable for Vobsubs */
 $_def_unrar_exec
@@ -8413,6 +8411,9 @@
 $_def_gui
 $_def_gtk2
 
+/* used by GUI: */
+$_def_xshape
+
 /* Audio output drivers */
 $_def_ossaudio
 $_def_ossaudio_devdsp
@@ -8481,9 +8482,6 @@
 /* Define this for Cygwin build for win32 */
 $_def_confwin32
 
-/* SMB support */
-$_def_smb
-
 /* termcap flag for getch2.c */
 $_def_termcap
 
@@ -8542,6 +8540,15 @@
 /* enable network */
 $_def_network
 
+/* LIVE555 Streaming Media library support */
+$_def_live
+
+/* libnemesi Streaming Media library support */
+$_def_nemesi
+
+/* SMB support */
+$_def_smb
+
 /* enable ftp support */
 $_def_ftp
 
@@ -8587,10 +8594,6 @@
 /* enables / disables new input joystick support */
 $_def_joystick
 
-/* XMMS input plugin support */
-$_def_xmms
-#define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir"
-
 /* libvo options */
 #define SCREEN_SIZE_X 1
 #define SCREEN_SIZE_Y 1
@@ -8645,9 +8648,6 @@
 /* Define this if you have shm support */
 $_def_shm
 
-/* used by GUI: */
-$_def_xshape
-
 #if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)
 #define X11_FULLSCREEN 1
 #endif