*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Mon, 06 Oct 2003 09:03:02 +0000
changeset 731faaa676b20ef
parent 730 0f4f974d0201
child 732 d18e2b224d0e
*** empty log message ***
configure.in
src/audio/amigaos/.cvsignore
src/cdrom/Makefile.am
     1.1 --- a/configure.in	Mon Oct 06 08:34:08 2003 +0000
     1.2 +++ b/configure.in	Mon Oct 06 09:03:02 2003 +0000
     1.3 @@ -335,11 +335,11 @@
     1.4              esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
     1.5              esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
     1.6              echo "-- $esd_lib_spec -> $esd_lib"
     1.7 -            if test x$enable_dlopen != xyes && \
     1.8 +            if test x$use_dlopen != xyes && \
     1.9                 test x$enable_esd_shared = xyes; then
    1.10                  AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
    1.11              fi
    1.12 -            if test x$enable_dlopen = xyes && \
    1.13 +            if test x$use_dlopen = xyes && \
    1.14                 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
    1.15                  CFLAGS="$CFLAGS -DESD_SUPPORT -DESD_DYNAMIC=\$(esd_lib) $ESD_CFLAGS"
    1.16                  AC_SUBST(esd_lib)
    1.17 @@ -385,11 +385,11 @@
    1.18                  arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libartsc.so.*/'`
    1.19                  arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
    1.20                  echo "-- $arts_lib_spec -> $arts_lib"
    1.21 -                if test x$enable_dlopen != xyes && \
    1.22 +                if test x$use_dlopen != xyes && \
    1.23                     test x$enable_arts_shared = xyes; then
    1.24                      AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
    1.25                  fi
    1.26 -                if test x$enable_dlopen = xyes && \
    1.27 +                if test x$use_dlopen = xyes && \
    1.28                     test x$enable_arts_shared = xyes && test x$arts_lib != x; then
    1.29                      CFLAGS="$CFLAGS -DARTSC_SUPPORT -DARTSC_DYNAMIC=\$(arts_lib) $ARTSC_CFLAGS"
    1.30                      AC_SUBST(arts_lib)
    1.31 @@ -1556,10 +1556,10 @@
    1.32  dnl Check for the dlfcn.h interface for dynamically loading objects
    1.33  CheckDLOPEN()
    1.34  {
    1.35 -    AC_ARG_ENABLE(dlopen,
    1.36 -[  --enable-dlopen         use dlopen for shared object loading [default=no]],
    1.37 -                  , enable_dlopen=yes)
    1.38 -    if test x$enable_dlopen = xyes; then
    1.39 +    AC_ARG_ENABLE(sdl-dlopen,
    1.40 +[  --enable-sdl-dlopen     use dlopen for shared object loading [default=yes]],
    1.41 +                  , enable_sdl_dlopen=yes)
    1.42 +    if test x$enable_sdl_dlopen = xyes; then
    1.43          AC_MSG_CHECKING(for dlopen)
    1.44          use_dlopen=no
    1.45          AC_TRY_COMPILE([
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/audio/amigaos/.cvsignore	Mon Oct 06 09:03:02 2003 +0000
     2.3 @@ -0,0 +1,6 @@
     2.4 +Makefile.in
     2.5 +Makefile
     2.6 +.libs
     2.7 +*.o
     2.8 +*.lo
     2.9 +*.la
     3.1 --- a/src/cdrom/Makefile.am	Mon Oct 06 08:34:08 2003 +0000
     3.2 +++ b/src/cdrom/Makefile.am	Mon Oct 06 09:03:02 2003 +0000
     3.3 @@ -15,7 +15,7 @@
     3.4  	linux	\
     3.5  	macos	\
     3.6  	macosx	\
     3.7 -	mint \
     3.8 +	mint	\
     3.9  	openbsd	\
    3.10  	osf	\
    3.11  	qnx	\