From 0b3f1a75ba7876cdfd2ccddcf8e9dfd880625822 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Mon, 6 Oct 2003 09:03:02 +0000
Subject: [PATCH] *** empty log message ***

---
 configure.in                 | 16 ++++++++--------
 src/audio/amigaos/.cvsignore |  6 ++++++
 src/cdrom/Makefile.am        |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 src/audio/amigaos/.cvsignore

diff --git a/configure.in b/configure.in
index 32a5cd9c1..3c9df87ad 100644
--- a/configure.in
+++ b/configure.in
@@ -335,11 +335,11 @@ CheckESD()
             esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
             esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
             echo "-- $esd_lib_spec -> $esd_lib"
-            if test x$enable_dlopen != xyes && \
+            if test x$use_dlopen != xyes && \
                test x$enable_esd_shared = xyes; then
                 AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
             fi
-            if test x$enable_dlopen = xyes && \
+            if test x$use_dlopen = xyes && \
                test x$enable_esd_shared = xyes && test x$esd_lib != x; then
                 CFLAGS="$CFLAGS -DESD_SUPPORT -DESD_DYNAMIC=\$(esd_lib) $ESD_CFLAGS"
                 AC_SUBST(esd_lib)
@@ -385,11 +385,11 @@ CheckARTSC()
                 arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libartsc.so.*/'`
                 arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
                 echo "-- $arts_lib_spec -> $arts_lib"
-                if test x$enable_dlopen != xyes && \
+                if test x$use_dlopen != xyes && \
                    test x$enable_arts_shared = xyes; then
                     AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
                 fi
-                if test x$enable_dlopen = xyes && \
+                if test x$use_dlopen = xyes && \
                    test x$enable_arts_shared = xyes && test x$arts_lib != x; then
                     CFLAGS="$CFLAGS -DARTSC_SUPPORT -DARTSC_DYNAMIC=\$(arts_lib) $ARTSC_CFLAGS"
                     AC_SUBST(arts_lib)
@@ -1556,10 +1556,10 @@ CheckQUARTZ()
 dnl Check for the dlfcn.h interface for dynamically loading objects
 CheckDLOPEN()
 {
-    AC_ARG_ENABLE(dlopen,
-[  --enable-dlopen         use dlopen for shared object loading [default=no]],
-                  , enable_dlopen=yes)
-    if test x$enable_dlopen = xyes; then
+    AC_ARG_ENABLE(sdl-dlopen,
+[  --enable-sdl-dlopen     use dlopen for shared object loading [default=yes]],
+                  , enable_sdl_dlopen=yes)
+    if test x$enable_sdl_dlopen = xyes; then
         AC_MSG_CHECKING(for dlopen)
         use_dlopen=no
         AC_TRY_COMPILE([
diff --git a/src/audio/amigaos/.cvsignore b/src/audio/amigaos/.cvsignore
new file mode 100644
index 000000000..899d53557
--- /dev/null
+++ b/src/audio/amigaos/.cvsignore
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la
diff --git a/src/cdrom/Makefile.am b/src/cdrom/Makefile.am
index b0551b606..cbb2df1ce 100644
--- a/src/cdrom/Makefile.am
+++ b/src/cdrom/Makefile.am
@@ -15,7 +15,7 @@ DIST_SUBDIRS =	\
 	linux	\
 	macos	\
 	macosx	\
-	mint \
+	mint	\
 	openbsd	\
 	osf	\
 	qnx	\