configure.in
changeset 3392 efc22582afc5
parent 3391 188fc5ecc58c
child 3394 2b0a3b2f2fc6
     1.1 --- a/configure.in	Tue Oct 13 06:40:08 2009 +0000
     1.2 +++ b/configure.in	Tue Oct 13 06:49:29 2009 +0000
     1.3 @@ -365,7 +365,7 @@
     1.4              # x86 64-bit architectures all have SSE instructions
     1.5              default_ssemath=yes
     1.6              ;;
     1.7 -	*)
     1.8 +        *)
     1.9              default_ssemath=no
    1.10              ;;
    1.11      esac
    1.12 @@ -538,7 +538,7 @@
    1.13              have_altivec_h_hdr=yes
    1.14              ])
    1.15              AC_MSG_RESULT($have_gcc_altivec)
    1.16 -	fi
    1.17 +        fi
    1.18  
    1.19          if test x$have_gcc_altivec = xno; then
    1.20              AC_MSG_CHECKING(for Altivec with GCC -faltivec option)
    1.21 @@ -625,7 +625,6 @@
    1.22  AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
    1.23                            , enable_alsa_shared=yes)
    1.24              alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
    1.25 -            echo "-- dynamic libasound -> $alsa_lib"
    1.26  
    1.27              AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
    1.28              SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
    1.29 @@ -636,6 +635,7 @@
    1.30              fi
    1.31              if test x$have_loadso = xyes && \
    1.32                 test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
    1.33 +                echo "-- dynamic libasound -> $alsa_lib"
    1.34                  AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
    1.35              else
    1.36                  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
    1.37 @@ -720,7 +720,6 @@
    1.38  AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
    1.39                            , enable_esd_shared=yes)
    1.40              esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
    1.41 -            echo "-- dynamic libesd -> $esd_lib"
    1.42  
    1.43              AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
    1.44              SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
    1.45 @@ -731,6 +730,7 @@
    1.46              fi
    1.47              if test x$have_loadso = xyes && \
    1.48                 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
    1.49 +                echo "-- dynamic libesd -> $esd_lib"
    1.50                  AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
    1.51              else
    1.52                  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
    1.53 @@ -767,7 +767,6 @@
    1.54  AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
    1.55                            , enable_pulseaudio_shared=yes)
    1.56              pulseaudio_lib=[`find_lib "libpulse-simple.so.*" "$PULSEAUDIO_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
    1.57 -            echo "-- dynamic libpulse-simple -> $pulseaudio_lib"
    1.58  
    1.59              AC_DEFINE(SDL_AUDIO_DRIVER_PULSEAUDIO)
    1.60              SOURCES="$SOURCES $srcdir/src/audio/pulseaudio/*.c"
    1.61 @@ -778,6 +777,7 @@
    1.62              fi
    1.63              if test x$have_loadso = xyes && \
    1.64                 test x$enable_pulseaudio_shared = xyes && test x$pulseaudio_lib != x; then
    1.65 +                echo "-- dynamic libpulse-simple -> $pulseaudio_lib"
    1.66                  AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC, "$pulseaudio_lib")
    1.67              else
    1.68                  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSEAUDIO_LIBS"
    1.69 @@ -817,7 +817,6 @@
    1.70  AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
    1.71                                , enable_arts_shared=yes)
    1.72                  arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
    1.73 -                echo "-- dynamic libartsc -> $arts_lib"
    1.74  
    1.75                  AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
    1.76                  SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
    1.77 @@ -828,6 +827,7 @@
    1.78                  fi
    1.79                  if test x$have_loadso = xyes && \
    1.80                     test x$enable_arts_shared = xyes && test x$arts_lib != x; then
    1.81 +                    echo "-- dynamic libartsc -> $arts_lib"
    1.82                      AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
    1.83                  else
    1.84                      EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
    1.85 @@ -875,7 +875,6 @@
    1.86  AC_HELP_STRING([--enable-nas-shared], [dynamically load NAS audio support [[default=yes]]]),
    1.87                            , enable_nas_shared=yes)
    1.88              nas_lib=[`find_lib "libaudio.so.*" "$NAS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
    1.89 -            echo "-- dynamic libaudio -> $nas_lib"
    1.90  
    1.91              if test x$have_loadso != xyes && \
    1.92                 test x$enable_nas_shared = xyes; then
    1.93 @@ -883,6 +882,7 @@
    1.94              fi
    1.95              if test x$have_loadso = xyes && \
    1.96                 test x$enable_nas_shared = xyes && test x$nas_lib != x; then
    1.97 +                echo "-- dynamic libaudio -> $nas_lib"
    1.98                  AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_NAS_DYNAMIC, "$nas_lib")
    1.99              else
   1.100                  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
   1.101 @@ -1338,11 +1338,9 @@
   1.102              SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
   1.103              EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
   1.104  
   1.105 -	        AC_MSG_CHECKING(for directfb dynamic loading support)
   1.106 -			directfb_shared=no
   1.107 -            directfb_lib_spec="$DIRECTFB_PREFIX/lib/libdirectfb.so*"
   1.108 -            directfb_lib=`ls -- $directfb_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
   1.109 -            dnl echo "-- $directfb_lib_spec -> $directfb_lib"
   1.110 +            AC_MSG_CHECKING(for directfb dynamic loading support)
   1.111 +            directfb_shared=no
   1.112 +            directfb_lib=[`find_lib "libdirectfb.so.*" "$DIRECTFB_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
   1.113  
   1.114              if test x$have_loadso != xyes && \
   1.115                 test x$enable_directfb_shared = xyes; then
   1.116 @@ -1350,12 +1348,13 @@
   1.117              fi
   1.118              if test x$have_loadso = xyes && \
   1.119                 test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then
   1.120 -				directfb_shared=yes
   1.121 +                directfb_shared=yes
   1.122 +                echo "-- $directfb_lib_spec -> $directfb_lib"
   1.123                  AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC, "$directfb_lib")
   1.124              else
   1.125 -	            EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
   1.126 +                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
   1.127              fi
   1.128 -	        AC_MSG_RESULT($directfb_shared)
   1.129 +            AC_MSG_RESULT($directfb_shared)
   1.130              have_video=yes
   1.131          fi
   1.132      fi
   1.133 @@ -1392,7 +1391,7 @@
   1.134  AC_HELP_STRING([--enable-fusionsound-shared], [dynamically load fusionsound audio support [[default=yes]]]),
   1.135                            , enable_fusionsound_shared=yes)
   1.136              fusionsound_shared=no
   1.137 -	        AC_MSG_CHECKING(for FusionSound dynamic loading support)
   1.138 +            AC_MSG_CHECKING(for FusionSound dynamic loading support)
   1.139              if test x$have_loadso != xyes && \
   1.140                 test x$enable_fusionsound_shared = xyes; then
   1.141                  AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic fusionsound loading])
   1.142 @@ -1400,11 +1399,11 @@
   1.143              if test x$have_loadso = xyes && \
   1.144                 test x$enable_fusionsound_shared = xyes; then
   1.145                  AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC, "libfusionsound.so")
   1.146 -            	fusionsound_shared=yes
   1.147 +                fusionsound_shared=yes
   1.148              else
   1.149 -	            EXTRA_LDFLAGS="$EXTRA_LDFLAGS $FUSIONSOUND_LIBS"
   1.150 +                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $FUSIONSOUND_LIBS"
   1.151              fi
   1.152 -	        AC_MSG_RESULT($fusionsound_shared)
   1.153 +            AC_MSG_RESULT($fusionsound_shared)
   1.154              
   1.155              have_audio=yes
   1.156          fi
   1.157 @@ -1446,9 +1445,9 @@
   1.158      video_ps3=no
   1.159      AC_CHECK_HEADER([linux/fb.h])
   1.160      AC_CHECK_HEADER([asm/ps3fb.h], [have_ps3fb_hdr=yes], [],
   1.161 -			[#ifndef _LINUX_TYPES_H
   1.162 -				#include <linux/types.h>
   1.163 -			#endif])
   1.164 +            [#ifndef _LINUX_TYPES_H
   1.165 +                #include <linux/types.h>
   1.166 +            #endif])
   1.167      AC_CHECK_HEADER([libspe2.h], have_libspe2_hdr=yes)
   1.168      AC_CHECK_LIB([spe2], spe_context_create, have_spe2_lib=yes)
   1.169  
   1.170 @@ -2072,13 +2071,13 @@
   1.171                #if defined(HAVE_USB_H)
   1.172                #include <usb.h>
   1.173                #endif
   1.174 -	      #ifdef __DragonFly__
   1.175 +              #ifdef __DragonFly__
   1.176                #include <bus/usb/usb.h>
   1.177                #include <bus/usb/usbhid.h>
   1.178 -	      #else
   1.179 +              #else
   1.180                #include <dev/usb/usb.h>
   1.181                #include <dev/usb/usbhid.h>
   1.182 -	      #endif
   1.183 +              #endif
   1.184                #if defined(HAVE_USBHID_H)
   1.185                #include <usbhid.h>
   1.186                #elif defined(HAVE_LIBUSB_H)