Commit 850993a9 authored by Sam Lantinga's avatar Sam Lantinga

*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40732
parent df7110ed
...@@ -335,11 +335,11 @@ CheckESD() ...@@ -335,11 +335,11 @@ CheckESD()
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'` esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
echo "-- $esd_lib_spec -> $esd_lib" 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 test x$enable_esd_shared = xyes; then
AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option]) AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
fi 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 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
CFLAGS="$CFLAGS -DESD_SUPPORT -DESD_DYNAMIC=\$(esd_lib) $ESD_CFLAGS" CFLAGS="$CFLAGS -DESD_SUPPORT -DESD_DYNAMIC=\$(esd_lib) $ESD_CFLAGS"
AC_SUBST(esd_lib) AC_SUBST(esd_lib)
...@@ -385,11 +385,11 @@ CheckARTSC() ...@@ -385,11 +385,11 @@ CheckARTSC()
arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libartsc.so.*/'` arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libartsc.so.*/'`
arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'` arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
echo "-- $arts_lib_spec -> $arts_lib" 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 test x$enable_arts_shared = xyes; then
AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option]) AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
fi 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 test x$enable_arts_shared = xyes && test x$arts_lib != x; then
CFLAGS="$CFLAGS -DARTSC_SUPPORT -DARTSC_DYNAMIC=\$(arts_lib) $ARTSC_CFLAGS" CFLAGS="$CFLAGS -DARTSC_SUPPORT -DARTSC_DYNAMIC=\$(arts_lib) $ARTSC_CFLAGS"
AC_SUBST(arts_lib) AC_SUBST(arts_lib)
...@@ -1556,10 +1556,10 @@ CheckQUARTZ() ...@@ -1556,10 +1556,10 @@ CheckQUARTZ()
dnl Check for the dlfcn.h interface for dynamically loading objects dnl Check for the dlfcn.h interface for dynamically loading objects
CheckDLOPEN() CheckDLOPEN()
{ {
AC_ARG_ENABLE(dlopen, AC_ARG_ENABLE(sdl-dlopen,
[ --enable-dlopen use dlopen for shared object loading [default=no]], [ --enable-sdl-dlopen use dlopen for shared object loading [default=yes]],
, enable_dlopen=yes) , enable_sdl_dlopen=yes)
if test x$enable_dlopen = xyes; then if test x$enable_sdl_dlopen = xyes; then
AC_MSG_CHECKING(for dlopen) AC_MSG_CHECKING(for dlopen)
use_dlopen=no use_dlopen=no
AC_TRY_COMPILE([ AC_TRY_COMPILE([
......
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
...@@ -15,7 +15,7 @@ DIST_SUBDIRS = \ ...@@ -15,7 +15,7 @@ DIST_SUBDIRS = \
linux \ linux \
macos \ macos \
macosx \ macosx \
mint \ mint \
openbsd \ openbsd \
osf \ osf \
qnx \ qnx \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment