*** empty log message ***

libsdl-org · Jan 26, 2003 · c1b5537 · c1b5537
1 parent 2f9e363
commit c1b5537
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -62,12 +62,12 @@ EXTRA_DIST =			\
 libSDL_mixer_la_LDFLAGS = 		\
 	-release $(LT_RELEASE)	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB)
+libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@
 
 bin_PROGRAMS = playwave playmus
 
-playwave_LDADD = libSDL_mixer.la
-playmus_LDADD = libSDL_mixer.la
+playwave_LDADD = libSDL_mixer.la @SDL_LIBS@
+playmus_LDADD = libSDL_mixer.la @SDL_LIBS@
 
 # Rule to build tar-gzipped distribution package
 $(PACKAGE)-$(VERSION).tar.gz: distcheck

diff --git a/configure.in b/configure.in
@@ -82,7 +82,6 @@ AM_PATH_SDL($SDL_VERSION,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
 )
 CFLAGS="$CFLAGS $SDL_CFLAGS"
-LIBS="$LIBS $SDL_LIBS"
 
 dnl Flag for using SDL_RWops
 dnl Matt Campbell (matt@campbellhome.dhs.org)
@@ -129,11 +128,11 @@ if test x$enable_music_midi = xyes; then
         case "$target" in
             *-*-cygwin* | *-*-mingw32*)
                 use_music_native_midi=yes
-                LIBS="$LIBS -lwinmm"
+                SYSTEM_LIBS="$SYSTEM_LIBS -lwinmm"
                 ;;
             *-*-darwin*)
                 use_music_native_midi=yes
-                LIBS="$LIBS -framework QuickTime"
+                SYSTEM_LIBS="$SYSTEM_LIBS -framework QuickTime"
                 ;;
         esac
         if test x$use_music_native_midi = xyes; then
@@ -172,7 +171,7 @@ if test x$enable_music_ogg = xyes; then
     AC_MSG_RESULT($have_vorbis)
     if test x$have_vorbis = xyes; then
         CFLAGS="$CFLAGS -DOGG_MUSIC"
-        LIBS="$LIBS -lvorbisfile -lvorbis -logg"
+        SYSTEM_LIBS="$SYSTEM_LIBS -lvorbisfile -lvorbis -logg"
     fi
 fi
 AC_ARG_ENABLE(music-mp3,
@@ -183,7 +182,7 @@ if test x$enable_music_mp3 = xyes; then
     AM_PATH_SMPEG($SMPEG_VERSION, have_smpeg=yes, have_smpeg=no)
     if test x$have_smpeg = xyes; then
         CFLAGS="$CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
-        LIBS="$LIBS $SMPEG_LIBS"
+        SYSTEM_LIBS="$SYSTEM_LIBS $SMPEG_LIBS"
     fi
 fi
 
@@ -194,6 +193,9 @@ AM_CONDITIONAL(USE_TIMIDITY, test x$enable_music_timidity_midi = xyes)
 AM_CONDITIONAL(USE_NATIVE_MIDI, test x$use_music_native_midi = xyes || test x$use_music_native_midi_gpl = xyes)
 AM_CONDITIONAL(USE_NATIVE_MIDI_GPL, test x$use_music_native_midi_gpl = xyes)
 
+dnl Expand the libraries needed for static and dynamic linking
+AC_SUBST(SYSTEM_LIBS)
+
 # Finally create all the generated files
 AC_OUTPUT([
 Makefile

diff --git a/ltconfig b/ltconfig
@@ -2005,7 +2005,8 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  #deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  deplibs_check_method='pass_all'
   file_magic_cmd='/usr/bin/file -L'
   case "$host_os" in
   rhapsody* | darwin1.[012])

diff --git a/ltmain.sh b/ltmain.sh
@@ -953,6 +953,7 @@ compiler."
 	  ;;
 	framework)
 	  linkopts="$linkopts -framework $arg"
+	  compile_command="$compile_command -framework $arg"
 	  prev=
 	  continue
 	  ;;