Mercurial > mplayer.hg
comparison configure @ 28260:4f02af17532d
Only print "using XYZ" comment if XYZ has been set.
author | diego |
---|---|
date | Sun, 11 Jan 2009 11:16:20 +0000 |
parents | 4811678e9f05 |
children | be9b682b9437 |
comparison
equal
deleted
inserted
replaced
28259:f313c0ff6882 | 28260:4f02af17532d |
---|---|
2889 _res_comment="using winsock2 functions instead" | 2889 _res_comment="using winsock2 functions instead" |
2890 echores "no" | 2890 echores "no" |
2891 elif cc_check $_ld_sock ; then | 2891 elif cc_check $_ld_sock ; then |
2892 # NOTE: Linux has libresolv but does not need it | 2892 # NOTE: Linux has libresolv but does not need it |
2893 : | 2893 : |
2894 _res_comment="using $_ld_sock" | 2894 test $_ld_sock && _res_comment="using $_ld_sock" |
2895 echores "yes" | 2895 echores "yes" |
2896 elif cc_check $_ld_sock -lresolv ; then | 2896 elif cc_check $_ld_sock -lresolv ; then |
2897 # NOTE: needed for SunOS at least | 2897 # NOTE: needed for SunOS at least |
2898 _ld_sock="$_ld_sock -lresolv" | 2898 _ld_sock="$_ld_sock -lresolv" |
2899 _res_comment="using $_ld_sock" | 2899 _res_comment="using $_ld_sock" |
2911 EOF | 2911 EOF |
2912 _use_aton=yes | 2912 _use_aton=yes |
2913 if cc_check $_ld_sock ; then | 2913 if cc_check $_ld_sock ; then |
2914 # NOTE: Linux has libresolv but does not need it | 2914 # NOTE: Linux has libresolv but does not need it |
2915 : | 2915 : |
2916 _res_comment="using $_ld_sock" | 2916 test $_ld_sock && _res_comment="using $_ld_sock" |
2917 elif cc_check $_ld_sock -lresolv ; then | 2917 elif cc_check $_ld_sock -lresolv ; then |
2918 # NOTE: needed for SunOS at least | 2918 # NOTE: needed for SunOS at least |
2919 _ld_sock="$_ld_sock -lresolv" | 2919 _ld_sock="$_ld_sock -lresolv" |
2920 _res_comment="using $_ld_sock" | 2920 _res_comment="using $_ld_sock" |
2921 else | 2921 else |
3149 cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break | 3149 cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break |
3150 done | 3150 done |
3151 fi | 3151 fi |
3152 fi | 3152 fi |
3153 if test "$_pthreads" = yes ; then | 3153 if test "$_pthreads" = yes ; then |
3154 _res_comment="using $_ld_pthread" | 3154 test $_ld_pthread && _res_comment="using $_ld_pthread" |
3155 _def_pthreads='#define HAVE_PTHREADS 1' | 3155 _def_pthreads='#define HAVE_PTHREADS 1' |
3156 _def_threads='#define HAVE_THREADS 1' | 3156 _def_threads='#define HAVE_THREADS 1' |
3157 else | 3157 else |
3158 _res_comment="v4l, v4l2, ao_nas, win32 loader disabled" | 3158 _res_comment="v4l, v4l2, ao_nas, win32 loader disabled" |
3159 _def_pthreads='#undef HAVE_PTHREADS' | 3159 _def_pthreads='#undef HAVE_PTHREADS' |
3394 && _termcap=yes && break | 3394 && _termcap=yes && break |
3395 done | 3395 done |
3396 fi | 3396 fi |
3397 if test "$_termcap" = yes ; then | 3397 if test "$_termcap" = yes ; then |
3398 _def_termcap='#define HAVE_TERMCAP 1' | 3398 _def_termcap='#define HAVE_TERMCAP 1' |
3399 _res_comment="using $_ld_tmp" | 3399 test $_ld_tmp && _res_comment="using $_ld_tmp" |
3400 else | 3400 else |
3401 _def_termcap='#undef HAVE_TERMCAP' | 3401 _def_termcap='#undef HAVE_TERMCAP' |
3402 fi | 3402 fi |
3403 echores "$_termcap" | 3403 echores "$_termcap" |
3404 | 3404 |
6498 _live_dist=yes | 6498 _live_dist=yes |
6499 fi | 6499 fi |
6500 fi | 6500 fi |
6501 fi | 6501 fi |
6502 if test "$_live" = yes && test "$_network" = yes; then | 6502 if test "$_live" = yes && test "$_network" = yes; then |
6503 _res_comment="using $_livelibdir" | 6503 test $_livelibdir && _res_comment="using $_livelibdir" |
6504 _def_live='#define CONFIG_LIVE555 1' | 6504 _def_live='#define CONFIG_LIVE555 1' |
6505 _inputmodules="live555 $_inputmodules" | 6505 _inputmodules="live555 $_inputmodules" |
6506 elif test "$_live_dist" = yes && test "$_network" = yes; then | 6506 elif test "$_live_dist" = yes && test "$_network" = yes; then |
6507 _res_comment="using distribution version" | 6507 _res_comment="using distribution version" |
6508 _live="yes" | 6508 _live="yes" |