configure.in
changeset 1367 e440d5c488c1
parent 1366 34d9df784d84
child 1370 00fc57bb5dc4
     1.1 --- a/configure.in	Thu Feb 16 23:32:39 2006 +0000
     1.2 +++ b/configure.in	Fri Feb 17 08:43:23 2006 +0000
     1.3 @@ -107,7 +107,7 @@
     1.4      if test x$ac_cv_func_strtod = xyes; then
     1.5          AC_DEFINE(HAVE_STRTOD)
     1.6      fi
     1.7 -    AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strcpy strncpy strcat strncat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol _i64toa _ui64toa strtoll atoi atof strcmp strncmp stricmp strcasecmp sscanf snprintf vsnprint sigaction setjmp nanosleep)
     1.8 +    AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strcpy strncpy strcat strncat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol _i64toa _ui64toa strtoll atoi atof strcmp strncmp stricmp strcasecmp sscanf snprintf vsnprintf sigaction setjmp nanosleep)
     1.9  fi
    1.10  
    1.11  if test x$have_inttypes != xyes; then
    1.12 @@ -762,8 +762,10 @@
    1.13                      x11ext_lib='libXext.so'
    1.14                      ;;
    1.15                  *)
    1.16 -                    x11_lib='libX11.so.6'
    1.17 -                    x11ext_lib='libXext.so.6'
    1.18 +                    x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'`
    1.19 +                    x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.20 +                    x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'`
    1.21 +                    x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.22                      ;;
    1.23              esac
    1.24  
    1.25 @@ -786,7 +788,6 @@
    1.26                  X_LIBS="$X_LIBS -lX11 -lXext"
    1.27              fi
    1.28  
    1.29 -
    1.30              AC_DEFINE(SDL_VIDEO_DRIVER_X11)
    1.31              SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
    1.32              BUILD_CFLAGS="$BUILD_CFLAGS $X_CFLAGS"
    1.33 @@ -2184,7 +2185,8 @@
    1.34              SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
    1.35              have_loadso=yes
    1.36          fi
    1.37 -        # The BeOS platform requires special libraries
    1.38 +        # The BeOS platform requires special setup.
    1.39 +        SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
    1.40          BUILD_LIBS="$BUILD_LIBS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
    1.41          ;;
    1.42      *-*-darwin* )