cosmetics: more config.h reordering

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27711 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 213 insertions, 218 deletions

diff --git a/configure b/configure
index 13d7981573..4ff899c568 100755
--- a/configure
+++ b/configure
@@ -8003,10 +8003,13 @@ done
 
 echo "Creating config.h"
 cat > $TMPH << EOF
-/* -------- This file has been automatically generated by configure ---------
-   Note: Any changes in it will be lost when you run configure again. */
+/*----------------------------------------------------------------------------
+** This file has been automatically generated by configure any changes in it
+** will be lost when you run configure again.
+** Instead of modifying definitions here, use the --enable/--disable options
+** of the configure script! See ./configure --help for details.
+*---------------------------------------------------------------------------*/
 
-/* Protect against multiple inclusion */
 #ifndef MPLAYER_CONFIG_H
 #define MPLAYER_CONFIG_H
 
@@ -8032,6 +8035,11 @@ cat > $TMPH << EOF
 
 #define CONFIGURATION "$_configuration"
 
+/* Common data directory (for fonts, etc) */
+#define MPLAYER_DATADIR "$_datadir"
+#define MPLAYER_CONFDIR "$_confdir"
+#define MPLAYER_LIBDIR "$_libdir"
+
 /* yes, we have inttypes.h */
 #define HAVE_INTTYPES_H 1
 
@@ -8057,15 +8065,51 @@ $_def_fast_inttypes
 /* libdvdread */
 #define HAVE_UINTPTR_T 1
 
+/* C99 *lrint* and round* functions available */
+$_def_llrint
+$_def_lrint
+$_def_lrintf
+$_def_round
+$_def_roundf
+
+/* nanosleep support */
+$_def_nanosleep
+
 /* name of messages charset */
 $_def_charset
 
 /* Runtime CPU detection */
 $_def_runtime_cpudetection
 
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+$_def_words_endian
+
+/* Define if your processor can access unaligned data in a fast way */
+$_def_fast_unaligned
+
+`ff_config_enable "$_arch_all" "$_arch" "ARCH"`
+
+/* Extension defines */
+`ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"`
+
+/* altivec.h support */
+$_def_altivec_h
+
+/* For the PPC.  G5 has the dcbzl when in 64bit mode but G4s and earlier do not
+   have the instruction. */
+$_def_dcbzl
+
+/* Define this to any prefered value from 386 up to infinity with step 100 */
+#define __CPU__ $iproc
+
 /* Dynamic a/v plugins */
 $_def_dynamic_plugins
 
+/* Define this to compile stream-caching support, it can be enabled via
+   -cache <kilobytes> */
+$_def_stream_cache
+
 /* "restrict" keyword */
 $_def_restrict_keyword
 
@@ -8079,20 +8123,89 @@ $_def_builtin_expect
 # define attribute_used
 #endif
 
-/* extern symbol prefix */
-$_def_extern_prefix
-
 /* compiler support for named assembler arguments */
 $_def_named_asm_args
 
+/* assembler handling of .align */
+$_def_asmalign_pot
+
+/* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/
+$_def_fastmemcpy
+
+/* Define this if your system has the "malloc.h" header file */
+$_def_malloc
+
+/* memalign is mapped to malloc if unsupported */
+$_def_memalign
+$_def_map_memalign
+$_def_memalign_hack
+
+/* Define this if your system has the "alloca.h" header file */
+$_def_alloca
+
+/* Define this if your system has the "byteswap.h" header file */
+$_def_byteswap_h
+
+/* Define this if your system has the "sys/mman.h" header file */
+$_def_mman
+$_def_mman_has_map_failed
+
+/* Define this if your system has the header file for the OSS sound interface */
+$_def_sys_soundcard
+
+/* Define this if your system has the header file for the OSS sound interface
+ * in /usr/include */
+$_def_soundcard
+
+/* Define this if your system has the sysinfo header */
+$_def_sys_sysinfo
+
+/* do we have gethostbyname2? */
+$_def_gethostbyname2
+
+/* Define this if your system has swab */
+$_def_swab
+
+/* Define this if your system has posix select */
+$_def_posix_select
+
+/* Define this if your system has gettimeofday */
+$_def_gettimeofday
+
+/* Define this if your system has glob */
+$_def_glob
+
+/* Define this if your system has setenv */
+$_def_setenv
+#ifndef HAVE_SETENV
+int setenv(const char *name, const char *val, int overwrite);
+#endif
+
+/* Define this if your system has strsep */
+$_def_strsep
+
+/* Define this if your system has vsscanf */
+$_def_vsscanf
+
+/* Define this if your system has sysi86 */
+$_def_sysi86
+$_def_sysi86_iv
+
+/* Define this if your system has pthreads */
+$_def_pthreads
+
+/* Toggles debugging informations */
+$_def_debug
+
 /* enable/disable SIGHANDLER */
 $_def_sighandler
 
 /* enable/disable automatic gdb attach on crash, requires SIGHANDLER */
 $_def_crash_debug
 
-/* Toggles debugging informations */
-$_def_debug
+/* enables / disables cdparanoia support */
+$_def_cdparanoia
+$_def_cddb
 
 /* Indicates that libcdio is available for VCD and CD-DA playback */
 $_def_libcdio
@@ -8116,14 +8229,37 @@ $_def_dvd_darwin
 $_def_sol_scsi_h
 $_def_hpux_scsi_h
 
-/* Common data directory (for fonts, etc) */
-#define MPLAYER_DATADIR "$_datadir"
-#define MPLAYER_CONFDIR "$_confdir"
-#define MPLAYER_LIBDIR "$_libdir"
+/* DVD navigation support using libdvdnav */
+$_def_dvdnav
+
+$_def_vcd
+
+#ifdef sun
+#define	DEFAULT_CDROM_DEVICE	"/vol/dev/aliases/cdrom0"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(WIN32) || defined(__OS2__)
+#define DEFAULT_CDROM_DEVICE    "D:"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__APPLE__) || defined(__DARWIN__)
+#define DEFAULT_CDROM_DEVICE    "/dev/disk1"
+#define DEFAULT_DVD_DEVICE	"/dev/rdiskN"
+#elif defined(__OpenBSD__)
+#define DEFAULT_CDROM_DEVICE	"/dev/rcd0a"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#define DEFAULT_CDROM_DEVICE	"/dev/acd0"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__DragonFly__)
+#define DEFAULT_CDROM_DEVICE	"/dev/cd0"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__AMIGAOS4__)
+#define DEFAULT_CDROM_DEVICE    "a1ide.device:2"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#else
+#define DEFAULT_CDROM_DEVICE    "/dev/cdrom"
+#define DEFAULT_DVD_DEVICE	"/dev/dvd"
+#endif
 
-/* Define this to compile stream-caching support, it can be enabled via
-   -cache <kilobytes> */
-$_def_stream_cache
 
 /* Define if you are using Xvid library */
 $_def_xvid
@@ -8143,11 +8279,6 @@ $_def_mp3lame
 $_def_mp3lame_preset
 $_def_mp3lame_preset_medium
 
-/* Undefine this if your sound card driver has no working select().
-   If you have kernel Oops, player hangups, or just no audio, you should
-   try to recompile MPlayer with this option disabled! */
-$_def_select
-
 /* define this to use iconv(3) function to codepage conversions */
 $_def_iconv
 
@@ -8157,36 +8288,10 @@ $_def_langinfo
 /* define this to use RTC (/dev/rtc) for video timers */
 $_def_rtc
 
-/* Define this if your system has the header file for the OSS sound interface */
-$_def_sys_soundcard
-
-/* Define this if your system has the header file for the OSS sound interface
- * in /usr/include */
-$_def_soundcard
-
-/* Define this if your system has the sysinfo header */
-$_def_sys_sysinfo
-
-/* Define this if your system has the "malloc.h" header file */
-$_def_malloc
-
-/* memalign is mapped to malloc if unsupported */
-$_def_memalign
-$_def_map_memalign
-$_def_memalign_hack
-
-/* assembler handling of .align */
-$_def_asmalign_pot
-
-/* Define this if your system has the "alloca.h" header file */
-$_def_alloca
-
-/* Define this if your system has the "byteswap.h" header file */
-$_def_byteswap_h
-
-/* Define this if your system has the "sys/mman.h" header file */
-$_def_mman
-$_def_mman_has_map_failed
+/* Undefine this if your sound card driver has no working select().
+   If you have kernel Oops, player hangups, or just no audio, you should
+   try to recompile MPlayer with this option disabled! */
+$_def_select
 
 /* Define this if you have the elf dynamic linker -ldl library */
 $_def_dl
@@ -8197,43 +8302,15 @@ $_def_kstat
 /* Define this if you have zlib */
 $_def_zlib
 
-/* Define this if you have shm support */
-$_def_shm
-
-/* Define this if your system has strsep */
-$_def_strsep
-
-/* Define this if your system has vsscanf */
-$_def_vsscanf
-
-/* Define this if your system has swab */
-$_def_swab
-
-/* Define this if your system has posix select */
-$_def_posix_select
-
-/* Define this if your system has gettimeofday */
-$_def_gettimeofday
-
-/* Define this if your system has glob */
-$_def_glob
-
-/* Define this if your system has setenv */
-$_def_setenv
-#ifndef HAVE_SETENV
-int setenv(const char *name, const char *val, int overwrite);
-#endif
-
-/* Define this if your system has sysi86 */
-$_def_sysi86
-$_def_sysi86_iv
-
-/* Define this if your system has pthreads */
-$_def_pthreads
-
 /* LIRC (remote control, see www.lirc.org) support: */
 $_def_lirc
 
+/*
+ * LIRCCD (LIRC client daemon)
+ * See http://www.dolda2000.cjb.net/~fredrik/lirccd/
+ */
+$_def_lircc
+
 /* Apple Remote (remote control, see http://docs.info.apple.com/article.html?artnum=302504) support: */
 $_def_apple_remote
 
@@ -8243,19 +8320,6 @@ $_def_apple_ir
 /* Support for maemo (http://www.maemo.org) */
 $_def_maemo
 
-/*
- * LIRCCD (LIRC client daemon)
- * See http://www.dolda2000.cjb.net/~fredrik/lirccd/
- */
-$_def_lircc
-
-/* DVD navigation support using libdvdnav */
-$_def_dvdnav
-
-/* Win32 DLL support */
-$_def_win32dll
-#define WIN32_PATH "$_win32codecsdir"
-
 /* Mac OS X specific features */
 $_def_macosx_finder
 $_def_macosx_bundle
@@ -8264,9 +8328,6 @@ $_def_corevideo
 $_def_quartz
 $_def_quicktime
 
-/* Win32-loader support */
-$_def_win32_loader
-
 /* Use codec libs included in mplayer CVS / source dist: */
 $_def_mp3lib
 
@@ -8280,6 +8341,42 @@ $_def_libmpeg2
 /* maximum alignment used by libmpeg2 */
 #define ATTRIBUTE_ALIGNED_MAX 16
 
+/* liblzo support */
+$_def_liblzo
+
+/* libmad support */
+$_def_mad
+
+/* enable OggVorbis support */
+$_def_vorbis
+$_def_tremor
+
+/* enable Speex support */
+$_def_speex
+
+/* enable musepack support */
+$_def_musepack
+
+/* 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
+
+/* Win32 DLL support */
+$_def_win32dll
+#define WIN32_PATH "$_win32codecsdir"
+
+/* Win32-loader support */
+$_def_win32_loader
+
 /* XAnim DLL support */
 $_def_xanim
 /* Default search path */
@@ -8290,15 +8387,16 @@ $_def_real
 /* Default search path */
 $_def_real_path
 
+/* enables / disables QTX codecs */
+$_def_qtx
+$_def_qtx_win32
+
 /* LIVE555 Streaming Media library support */
 $_def_live
 
 /* libnemesi Streaming Media library support */
 $_def_nemesi
 
-/* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/
-$_def_fastmemcpy
-
 /* Use UnRAR executable for Vobsubs */
 $_def_unrar_exec
 
@@ -8371,72 +8469,9 @@ $_def_radio_bsdbt848
 /* Enable Video 4 Linux 2 MPEG PVR support */
 $_def_pvr
 
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-$_def_words_endian
-
-/* Define if your processor can access unaligned data in a fast way */
-$_def_fast_unaligned
-
-`ff_config_enable "$_arch_all" "$_arch" "ARCH"`
-
-/* For the PPC.  G5 has the dcbzl when in 64bit mode but G4s and earlier do not
-   have the instruction. */
-$_def_dcbzl
-
 /* Define this for Cygwin build for win32 */
 $_def_confwin32
 
-/* Define this to any prefered value from 386 up to infinity with step 100 */
-#define __CPU__ $iproc
-
-$_def_vcd
-
-#ifdef sun
-#define	DEFAULT_CDROM_DEVICE	"/vol/dev/aliases/cdrom0"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(WIN32) || defined(__OS2__)
-#define DEFAULT_CDROM_DEVICE    "D:"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__APPLE__) || defined(__DARWIN__)
-#define DEFAULT_CDROM_DEVICE    "/dev/disk1"
-#define DEFAULT_DVD_DEVICE	"/dev/rdiskN"
-#elif defined(__OpenBSD__)
-#define DEFAULT_CDROM_DEVICE	"/dev/rcd0a"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#define DEFAULT_CDROM_DEVICE	"/dev/acd0"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__DragonFly__)
-#define DEFAULT_CDROM_DEVICE	"/dev/cd0"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__AMIGAOS4__)
-#define DEFAULT_CDROM_DEVICE    "a1ide.device:2"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#else
-#define DEFAULT_CDROM_DEVICE    "/dev/cdrom"
-#define DEFAULT_DVD_DEVICE	"/dev/dvd"
-#endif
-
-
-/*----------------------------------------------------------------------------
-**
-** NOTE: Instead of modifying these definitions here, use the
-**       --enable/--disable options of the ./configure script!
-**       See ./configure --help for details.
-**
-*---------------------------------------------------------------------------*/
-
-/* C99 *lrint* and round* functions available */
-$_def_llrint
-$_def_lrint
-$_def_lrintf
-$_def_round
-$_def_roundf
-
-/* nanosleep support */
-$_def_nanosleep
-
 /* SMB support */
 $_def_smb
 
@@ -8486,34 +8521,11 @@ $_def_fribidi
 /* enable ENCA usage */
 $_def_enca
 
-/* liblzo support */
-$_def_liblzo
-
-/* libmad support */
-$_def_mad
-
-/* enable OggVorbis support */
-$_def_vorbis
-$_def_tremor
-
-/* enable Speex support */
-$_def_speex
-
-/* enable musepack support */
-$_def_musepack
-
-/* enable OggTheora support */
-$_def_theora
-
-/* enable FAAD (AAC) support */
-$_def_faad
-$_def_faad_internal
-
-/* enable FAAC (AAC encoder) support */
-$_def_faac
+/* enables / disables osd menu */
+$_def_menu
 
-/* enable libdca support */
-$_def_libdca
+/* enables / disables subtitles sorting */
+$_def_sortsub
 
 /* enable LADSPA plugin support */
 $_def_ladspa
@@ -8543,9 +8555,8 @@ typedef int socklen_t;
 /* closesocket() support */
 $_def_closesocket
 
-/* enables / disables cdparanoia support */
-$_def_cdparanoia
-$_def_cddb
+/* enables inet6 support */
+$_def_inet6
 
 /* enables / disables VIDIX usage */
 $_def_vidix
@@ -8567,32 +8578,10 @@ $_def_vidix_pfx
 /* enables / disables new input joystick support */
 $_def_joystick
 
-/* enables / disables QTX codecs */
-$_def_qtx
-$_def_qtx_win32
-
-/* enables / disables osd menu */
-$_def_menu
-
-/* enables / disables subtitles sorting */
-$_def_sortsub
-
 /* XMMS input plugin support */
 $_def_xmms
 #define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir"
 
-/* enables inet6 support */
-$_def_inet6
-
-/* do we have gethostbyname2? */
-$_def_gethostbyname2
-
-/* Extension defines */
-`ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"`
-
-/* altivec.h support */
-$_def_altivec_h
-
 /* libvo options */
 #define SCREEN_SIZE_X 1
 #define SCREEN_SIZE_Y 1
@@ -8644,6 +8633,9 @@ $_def_tga
 $_def_toolame
 $_def_twolame
 
+/* Define this if you have shm support */
+$_def_shm
+
 /* used by GUI: */
 $_def_xshape
 
@@ -8721,6 +8713,9 @@ $_def_xvid_lavc
 /* mkstemp support */
 $_def_mkstemp
 
+/* extern symbol prefix */
+$_def_extern_prefix
+
 /* Use specific parts from FFmpeg. */
 `ff_config_enable "$_libavdecoders_all" "$_libavdecoders"`
 `ff_config_enable "$_libavencoders_all" "$_libavencoders"`