[Gnash-commit] gnash ChangeLog macros/sdl.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/07 11:35:38

Modified files:
        .              : ChangeLog 
        macros         : sdl.m4 

Log message:
        Fixed typos and path-stuff.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1058&r2=1.1059
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1058
retrieving revision 1.1059
diff -u -b -r1.1058 -r1.1059
--- ChangeLog   7 Oct 2006 10:37:56 -0000       1.1058
+++ ChangeLog   7 Oct 2006 11:35:37 -0000       1.1059
@@ -1,6 +1,7 @@
 2006-10-07 Markus Gothe <address@hidden>
 
        * configure.ac: Fixed typo. '!=' -> '='.
+       * macros/sdl.m4: Fixed finding libpath.
 
 2006-10-07 Tomas Groth Christensen <tomas@>
 

Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/sdl.m4       9 Aug 2006 01:59:07 -0000       1.20
+++ macros/sdl.m4       7 Oct 2006 11:35:37 -0000       1.21
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: sdl.m4,v 1.21 2006/10/07 11:35:37 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_SDL],
 [dnl 
   has_sdl=no
@@ -114,7 +116,7 @@
 
   dnl Look for the library
   AC_ARG_WITH(sdl_lib, [  --with-sdl-lib    directory where sdl library is], 
with_sdl_lib=${withval})
-  AC_MSG_CHECKING([for sdl library])
+dnl  AC_MSG_CHECKING([for sdl library])
   AC_CACHE_VAL(ac_cv_path_sdl_lib,[
   if test x"${with_sdl_lib}" != x ; then
     if test -f ${with_sdl_libs}/libSDL.a -o -f ${with_sdl_lib}/libSDL.so; then
@@ -229,7 +231,7 @@
 
   dnl Look for the library
   AC_ARG_WITH(sdl_mixer_lib, [  --with-sdl-mixer-lib    directory where 
sdl_mixer library is], with_sdl_mixer_lib=${withval})
-  AC_MSG_CHECKING([for sdl_mixer library])
+dnl  AC_MSG_CHECKING([for sdl_mixer library])
   AC_CACHE_VAL(ac_cv_path_sdl_mixer_lib,[
   if test x"${with_sdl_mixer_lib}" != x ; then
     if test -f ${with_sdl_mixer_lib}/libSDL_mixer.a -o -f 
${with_sdl_mixer_lib}/libSDL_mixer.so -o -f $i/libSDL_mixer-1.2.a -o -f 
$i/libSDL_mixer-1.2.so; then
@@ -249,7 +251,7 @@
   SDL_MIXER_LIBS=""
 
   if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
-    AC_CHECK_LIB(SDL_mixer, Mix_Linked_Version, [], AC_MSG_RESULT([no]))
+    AC_CHECK_LIB(SDL_mixer, Mix_Linked_Version, [])
     if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
       AC_CHECK_LIB(SDL_mixer-1.2, Mix_Linked_Version, 
[ac_cv_path_sdl_mixer_lib="-lSDL_mixer-1.2"])
     fi
@@ -262,11 +264,11 @@
       if test -f $i/libSDL_mixer.a -o -f $i/libSDl_mixer.so; then
         if test x"$i" != x"/usr/lib"; then
           ac_cv_path_sdl_mixer_lib="-L$i -lSDL_mixer"
-dnl          AC_MSG_RESULT(${ac_cv_path_sdl_mixer_lib})
+                 AC_MSG_RESULT(${ac_cv_path_sdl_mixer_lib})
           break
         else
           ac_cv_path_sdl_mixer_lib="-lSDL_mixer"
-dnl          AC_MSG_RESULT([yes])
+                 AC_MSG_RESULT([yes])
           break
         fi
       fi