Mercurial > mplayer.hg
comparison configure @ 27391:1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.
author | diego |
---|---|
date | Thu, 07 Aug 2008 08:58:07 +0000 |
parents | 9d95dc936e66 |
children | 4876c89bafdd |
comparison
equal
deleted
inserted
replaced
27390:9d95dc936e66 | 27391:1d2faa1020fb |
---|---|
5564 && _ld_extra="$_ld_extra $_ld_tmp" && _inc_extra="$_inc_extra $_inc_tmp" | 5564 && _ld_extra="$_ld_extra $_ld_tmp" && _inc_extra="$_inc_extra $_inc_tmp" |
5565 fi | 5565 fi |
5566 fi | 5566 fi |
5567 if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then | 5567 if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then |
5568 _cdda='yes' | 5568 _cdda='yes' |
5569 _def_libcdio='#define HAVE_LIBCDIO' | 5569 _def_libcdio='#define CONFIG_LIBCDIO' |
5570 _def_havelibcdio='yes' | 5570 _def_havelibcdio='yes' |
5571 else | 5571 else |
5572 if test "$_cdparanoia" = yes ; then | 5572 if test "$_cdparanoia" = yes ; then |
5573 _res_comment="using cdparanoia" | 5573 _res_comment="using cdparanoia" |
5574 fi | 5574 fi |
5575 _def_libcdio='#undef HAVE_LIBCDIO' | 5575 _def_libcdio='#undef CONFIG_LIBCDIO' |
5576 _def_havelibcdio='no' | 5576 _def_havelibcdio='no' |
5577 fi | 5577 fi |
5578 echores "$_libcdio" | 5578 echores "$_libcdio" |
5579 | 5579 |
5580 if test "$_cdda" = yes ; then | 5580 if test "$_cdda" = yes ; then |
5581 test $_cddb = auto && test $_network = yes && _cddb=yes | 5581 test $_cddb = auto && test $_network = yes && _cddb=yes |
5582 _def_cdparanoia='#define HAVE_CDDA' | 5582 _def_cdparanoia='#define CONFIG_CDDA' |
5583 _inputmodules="cdda $_inputmodules" | 5583 _inputmodules="cdda $_inputmodules" |
5584 else | 5584 else |
5585 _def_cdparanoia='#undef HAVE_CDDA' | 5585 _def_cdparanoia='#undef CONFIG_CDDA' |
5586 _noinputmodules="cdda $_noinputmodules" | 5586 _noinputmodules="cdda $_noinputmodules" |
5587 fi | 5587 fi |
5588 | 5588 |
5589 if test "$_cddb" = yes ; then | 5589 if test "$_cddb" = yes ; then |
5590 _def_cddb='#define HAVE_CDDB' | 5590 _def_cddb='#define CONFIG_CDDB' |
5591 _inputmodules="cddb $_inputmodules" | 5591 _inputmodules="cddb $_inputmodules" |
5592 else | 5592 else |
5593 _cddb=no | 5593 _cddb=no |
5594 _def_cddb='#undef HAVE_CDDB' | 5594 _def_cddb='#undef CONFIG_CDDB' |
5595 _noinputmodules="cddb $_noinputmodules" | 5595 _noinputmodules="cddb $_noinputmodules" |
5596 fi | 5596 fi |
5597 | 5597 |
5598 echocheck "bitmap font support" | 5598 echocheck "bitmap font support" |
5599 if test "$_bitmap_font" = yes ; then | 5599 if test "$_bitmap_font" = yes ; then |
5600 _def_bitmap_font="#define HAVE_BITMAP_FONT 1" | 5600 _def_bitmap_font="#define CONFIG_BITMAP_FONT 1" |
5601 else | 5601 else |
5602 _def_bitmap_font="#undef HAVE_BITMAP_FONT" | 5602 _def_bitmap_font="#undef CONFIG_BITMAP_FONT" |
5603 fi | 5603 fi |
5604 echores "$_bitmap_font" | 5604 echores "$_bitmap_font" |
5605 | 5605 |
5606 | 5606 |
5607 echocheck "freetype >= 2.0.9" | 5607 echocheck "freetype >= 2.0.9" |
6221 EOF | 6221 EOF |
6222 _ladspa=no | 6222 _ladspa=no |
6223 cc_check && _ladspa=yes | 6223 cc_check && _ladspa=yes |
6224 fi | 6224 fi |
6225 if test "$_ladspa" = yes; then | 6225 if test "$_ladspa" = yes; then |
6226 _def_ladspa="#define HAVE_LADSPA" | 6226 _def_ladspa="#define CONFIG_LADSPA" |
6227 else | 6227 else |
6228 _def_ladspa="#undef HAVE_LADSPA" | 6228 _def_ladspa="#undef CONFIG_LADSPA" |
6229 fi | 6229 fi |
6230 echores "$_ladspa" | 6230 echores "$_ladspa" |
6231 | 6231 |
6232 | 6232 |
6233 if test -z "$_codecsdir" ; then | 6233 if test -z "$_codecsdir" ; then |
7222 echores "$_select" | 7222 echores "$_select" |
7223 | 7223 |
7224 | 7224 |
7225 echocheck "ftp" | 7225 echocheck "ftp" |
7226 if ! beos && test "$_ftp" = yes ; then | 7226 if ! beos && test "$_ftp" = yes ; then |
7227 _def_ftp='#define HAVE_FTP 1' | 7227 _def_ftp='#define CONFIG_FTP 1' |
7228 _inputmodules="ftp $_inputmodules" | 7228 _inputmodules="ftp $_inputmodules" |
7229 else | 7229 else |
7230 _noinputmodules="ftp $_noinputmodules" | 7230 _noinputmodules="ftp $_noinputmodules" |
7231 _def_ftp='#undef HAVE_FTP' | 7231 _def_ftp='#undef CONFIG_FTP' |
7232 fi | 7232 fi |
7233 echores "$_ftp" | 7233 echores "$_ftp" |
7234 | 7234 |
7235 echocheck "vstream client" | 7235 echocheck "vstream client" |
7236 if test "$_vstream" = auto ; then | 7236 if test "$_vstream" = auto ; then |
7241 int main(void) { vstream_start(); return 0; } | 7241 int main(void) { vstream_start(); return 0; } |
7242 EOF | 7242 EOF |
7243 cc_check -lvstream-client && _vstream=yes | 7243 cc_check -lvstream-client && _vstream=yes |
7244 fi | 7244 fi |
7245 if test "$_vstream" = yes ; then | 7245 if test "$_vstream" = yes ; then |
7246 _def_vstream='#define HAVE_VSTREAM 1' | 7246 _def_vstream='#define CONFIG_VSTREAM 1' |
7247 _inputmodules="vstream $_inputmodules" | 7247 _inputmodules="vstream $_inputmodules" |
7248 _ld_extra="$_ld_extra -lvstream-client" | 7248 _ld_extra="$_ld_extra -lvstream-client" |
7249 else | 7249 else |
7250 _noinputmodules="vstream $_noinputmodules" | 7250 _noinputmodules="vstream $_noinputmodules" |
7251 _def_vstream='#undef HAVE_VSTREAM' | 7251 _def_vstream='#undef CONFIG_VSTREAM' |
7252 fi | 7252 fi |
7253 echores "$_vstream" | 7253 echores "$_vstream" |
7254 | 7254 |
7255 # endian testing | 7255 # endian testing |
7256 echocheck "byte order" | 7256 echocheck "byte order" |
7307 else | 7307 else |
7308 _xmmsplugindir=/usr/lib/xmms/Input | 7308 _xmmsplugindir=/usr/lib/xmms/Input |
7309 _xmmslibdir=/usr/lib | 7309 _xmmslibdir=/usr/lib |
7310 fi | 7310 fi |
7311 | 7311 |
7312 _def_xmms='#define HAVE_XMMS 1' | 7312 _def_xmms='#define CONFIG_XMMS 1' |
7313 if darwin ; then | 7313 if darwin ; then |
7314 _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.dylib" | 7314 _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.dylib" |
7315 else | 7315 else |
7316 _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.so.1 -export-dynamic" | 7316 _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.so.1 -export-dynamic" |
7317 fi | 7317 fi |
7318 else | 7318 else |
7319 _def_xmms='#undef HAVE_XMMS' | 7319 _def_xmms='#undef CONFIG_XMMS' |
7320 fi | 7320 fi |
7321 echores "$_xmms" | 7321 echores "$_xmms" |
7322 | 7322 |
7323 echocheck "inet6" | 7323 echocheck "inet6" |
7324 if test "$_inet6" = auto ; then | 7324 if test "$_inet6" = auto ; then |
7558 _def_debug='#undef MP_DEBUG' | 7558 _def_debug='#undef MP_DEBUG' |
7559 test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' | 7559 test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' |
7560 | 7560 |
7561 | 7561 |
7562 echocheck "joystick" | 7562 echocheck "joystick" |
7563 _def_joystick='#undef HAVE_JOYSTICK' | 7563 _def_joystick='#undef CONFIG_JOYSTICK' |
7564 if test "$_joystick" = yes ; then | 7564 if test "$_joystick" = yes ; then |
7565 if linux ; then | 7565 if linux ; then |
7566 # TODO add some check | 7566 # TODO add some check |
7567 _def_joystick='#define HAVE_JOYSTICK 1' | 7567 _def_joystick='#define CONFIG_JOYSTICK 1' |
7568 else | 7568 else |
7569 _joystick="no" | 7569 _joystick="no" |
7570 _res_comment="unsupported under $system_name" | 7570 _res_comment="unsupported under $system_name" |
7571 fi | 7571 fi |
7572 fi | 7572 fi |
7580 int main(void) { return 0; } | 7580 int main(void) { return 0; } |
7581 EOF | 7581 EOF |
7582 cc_check -llirc_client && _lirc=yes | 7582 cc_check -llirc_client && _lirc=yes |
7583 fi | 7583 fi |
7584 if test "$_lirc" = yes ; then | 7584 if test "$_lirc" = yes ; then |
7585 _def_lirc='#define HAVE_LIRC 1' | 7585 _def_lirc='#define CONFIG_LIRC 1' |
7586 _ld_extra="$_ld_extra -llirc_client" | 7586 _ld_extra="$_ld_extra -llirc_client" |
7587 else | 7587 else |
7588 _def_lirc='#undef HAVE_LIRC' | 7588 _def_lirc='#undef CONFIG_LIRC' |
7589 fi | 7589 fi |
7590 echores "$_lirc" | 7590 echores "$_lirc" |
7591 | 7591 |
7592 echocheck "lircc" | 7592 echocheck "lircc" |
7593 if test "$_lircc" = auto ; then | 7593 if test "$_lircc" = auto ; then |
7597 int main(void) { return 0; } | 7597 int main(void) { return 0; } |
7598 EOF | 7598 EOF |
7599 cc_check -llircc && _lircc=yes | 7599 cc_check -llircc && _lircc=yes |
7600 fi | 7600 fi |
7601 if test "$_lircc" = yes ; then | 7601 if test "$_lircc" = yes ; then |
7602 _def_lircc='#define HAVE_LIRCC 1' | 7602 _def_lircc='#define CONFIG_LIRCC 1' |
7603 _ld_extra="$_ld_extra -llircc" | 7603 _ld_extra="$_ld_extra -llircc" |
7604 else | 7604 else |
7605 _def_lircc='#undef HAVE_LIRCC' | 7605 _def_lircc='#undef CONFIG_LIRCC' |
7606 fi | 7606 fi |
7607 echores "$_lircc" | 7607 echores "$_lircc" |
7608 | 7608 |
7609 if arm; then | 7609 if arm; then |
7610 # Detect maemo development platform libraries availability (http://www.maemo.org), | 7610 # Detect maemo development platform libraries availability (http://www.maemo.org), |
7617 int main(void) { (void) osso_initialize("", "", 0, NULL); return 0; } | 7617 int main(void) { (void) osso_initialize("", "", 0, NULL); return 0; } |
7618 EOF | 7618 EOF |
7619 cc_check `$_pkg_config --cflags --libs libosso 2>/dev/null` && _maemo=yes | 7619 cc_check `$_pkg_config --cflags --libs libosso 2>/dev/null` && _maemo=yes |
7620 fi | 7620 fi |
7621 if test "$_maemo" = yes ; then | 7621 if test "$_maemo" = yes ; then |
7622 _def_maemo='#define HAVE_MAEMO 1' | 7622 _def_maemo='#define CONFIG_MAEMO 1' |
7623 _inc_extra="$_inc_extra `$_pkg_config --cflags libosso`" | 7623 _inc_extra="$_inc_extra `$_pkg_config --cflags libosso`" |
7624 _ld_extra="$_ld_extra `$_pkg_config --libs libosso` -lXsp" | 7624 _ld_extra="$_ld_extra `$_pkg_config --libs libosso` -lXsp" |
7625 else | 7625 else |
7626 _def_maemo='#undef HAVE_MAEMO' | 7626 _def_maemo='#undef CONFIG_MAEMO' |
7627 fi | 7627 fi |
7628 echores "$_maemo" | 7628 echores "$_maemo" |
7629 fi | 7629 fi |
7630 | 7630 |
7631 #this must be the last test to be performed or the ones following it will likely fail | 7631 #this must be the last test to be performed or the ones following it will likely fail |