1.1 --- a/configure.in	Tue Feb 17 05:25:25 2009 +0000
     1.2 +++ b/configure.in	Tue Mar 17 03:58:53 2009 +0000
     1.3 @@ -40,7 +40,7 @@
     1.4  AC_SUBST(LT_AGE)
     1.5  
     1.6  dnl Detect the canonical build and host environments
     1.7 -AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
     1.8 +AC_CONFIG_AUX_DIR([build-scripts])
     1.9  AC_CANONICAL_HOST
    1.10  AC_C_BIGENDIAN
    1.11  if test x$ac_cv_c_bigendian = xyes; then
    1.12 @@ -2493,7 +2493,7 @@
    1.13          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
    1.14          SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.15          ;;
    1.16 -    *-*-beos*)
    1.17 +    *-*-beos* | *-*-haiku*)
    1.18          ARCH=beos
    1.19          ac_default_prefix=/boot/develop/tools/gnupro
    1.20          CheckDummyVideo
    1.21 @@ -2536,8 +2536,16 @@
    1.22          fi
    1.23          # Set up files for the shared object loading library
    1.24          if test x$enable_loadso = xyes; then
    1.25 -            AC_DEFINE(SDL_LOADSO_BEOS)
    1.26 -            SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
    1.27 +            case "$host" in
    1.28 +                *-*-beos*)
    1.29 +                    AC_DEFINE(SDL_LOADSO_BEOS)
    1.30 +                    SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
    1.31 +                ;;
    1.32 +                *-*-haiku*)
    1.33 +                    AC_DEFINE(SDL_LOADSO_DLOPEN)
    1.34 +                    SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
    1.35 +                ;;
    1.36 +            esac    
    1.37              have_loadso=yes
    1.38          fi
    1.39          # The BeOS platform requires special setup.