configure.in
changeset 296 fab1ddc4d7bf
parent 295 54ad1d2f1325
child 300 8bdc210ed1de
     1.1 --- a/configure.in	Wed Mar 06 05:37:21 2002 +0000
     1.2 +++ b/configure.in	Wed Mar 06 11:05:47 2002 +0000
     1.3 @@ -15,7 +15,7 @@
     1.4  SDL_MAJOR_VERSION=1
     1.5  SDL_MINOR_VERSION=2
     1.6  SDL_MICRO_VERSION=4
     1.7 -SDL_INTERFACE_AGE=0
     1.8 +SDL_INTERFACE_AGE=4
     1.9  SDL_BINARY_AGE=4
    1.10  SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
    1.11  
    1.12 @@ -328,11 +328,15 @@
    1.13          AM_PATH_ESD(0.2.8, use_esd=yes)
    1.14  	if test x$use_esd = xyes; then
    1.15              AC_ARG_ENABLE(esd-shared,
    1.16 -[  --enable-esd-shared     dynamically load ESD support [default=yes]],
    1.17 -                          , enable_esd_shared=yes)
    1.18 +[  --enable-esd-shared     dynamically load ESD audio support [default=no]],
    1.19 +                          , enable_esd_shared=no)
    1.20              esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
    1.21  	    esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
    1.22  	    echo "-- $esd_lib_spec -> $esd_lib"
    1.23 +            if test x$enable_dlopen != xyes && \
    1.24 +               test x$enable_esd_shared = xyes; then
    1.25 +                AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
    1.26 +            fi
    1.27              if test x$enable_dlopen = xyes && \
    1.28                 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
    1.29                  CFLAGS="$CFLAGS -DESD_SUPPORT -DESD_DYNAMIC=\$(esd_lib) $ESD_CFLAGS"
    1.30 @@ -374,11 +378,15 @@
    1.31              AC_MSG_RESULT($audio_arts)
    1.32              if test x$audio_arts = xyes; then
    1.33                  AC_ARG_ENABLE(arts-shared,
    1.34 -[  --enable-arts-shared     dynamically load ESD support [default=yes]],
    1.35 -                              , enable_arts_shared=yes)
    1.36 +[  --enable-arts-shared     dynamically load aRts audio support [default=no]],
    1.37 +                              , enable_arts_shared=no)
    1.38                  arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libarts.so.*/'`
    1.39  	        arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
    1.40  	        echo "-- $arts_lib_spec -> $arts_lib"
    1.41 +                if test x$enable_dlopen != xyes && \
    1.42 +                   test x$enable_arts_shared = xyes; then
    1.43 +                    AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
    1.44 +                fi
    1.45                  if test x$enable_dlopen = xyes && \
    1.46                     test x$enable_arts_shared = xyes && test x$arts_lib != x; then
    1.47                      CFLAGS="$CFLAGS -DARTSC_SUPPORT -DARTSC_DYNAMIC=\$(arts_lib) $ARTSC_CFLAGS"
    1.48 @@ -998,7 +1006,9 @@
    1.49          AC_MSG_RESULT($video_opengl)
    1.50          if test x$video_opengl = xyes; then
    1.51              CFLAGS="$CFLAGS -DHAVE_OPENGL"
    1.52 -            AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
    1.53 +            if test x$use_dlopen != xyes; then
    1.54 +                AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
    1.55 +            fi
    1.56          fi
    1.57      fi
    1.58  }
    1.59 @@ -1383,8 +1393,8 @@
    1.60  CheckDLOPEN()
    1.61  {
    1.62      AC_ARG_ENABLE(dlopen,
    1.63 -[  --enable-dlopen         use dlopen for shared object loading [default=yes]],
    1.64 -                  , enable_dlopen=yes)
    1.65 +[  --enable-dlopen         use dlopen for shared object loading [default=no]],
    1.66 +                  , enable_dlopen=no)
    1.67      if test x$enable_dlopen = xyes; then
    1.68          AC_MSG_CHECKING(for dlopen)
    1.69          use_dlopen=no
    1.70 @@ -1398,7 +1408,7 @@
    1.71  
    1.72          if test x$use_dlopen = xyes; then
    1.73              CFLAGS="$CFLAGS -DUSE_DLOPEN"
    1.74 -            SYSTEM_LIBS="$SYSTEM_LIBS -ldl"
    1.75 +            AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
    1.76          fi
    1.77      fi
    1.78  }