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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/10/23 21:53:11

Modified files:
        .              : ChangeLog 
        macros         : sdl.m4 

Log message:
        Fixed bogus -I.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4679&r2=1.4680
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.43&r2=1.44

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4679
retrieving revision 1.4680
diff -u -b -r1.4679 -r1.4680
--- ChangeLog   23 Oct 2007 21:17:23 -0000      1.4679
+++ ChangeLog   23 Oct 2007 21:53:10 -0000      1.4680
@@ -5,6 +5,7 @@
 2007-10-23 Markus Gothe <address@hidden>
 
        * macros/glib.m4; Fixed out put.
+       * macros/sdl.m4: Fixed bogus -I.
 
 2007-10-23 Takashi Iwai <address@hidden>
 

Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- macros/sdl.m4       23 Oct 2007 13:50:27 -0000      1.43
+++ macros/sdl.m4       23 Oct 2007 21:53:10 -0000      1.44
@@ -1,5 +1,5 @@
 dnl  
-dnl    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: sdl.m4,v 1.43 2007/10/23 13:50:27 strk Exp $
+dnl $Id: sdl.m4,v 1.44 2007/10/23 21:53:10 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_SDL], [
   has_sdl=no
@@ -53,9 +53,15 @@
   if test "x$SDL_CONFIG" != "x" ; then
     if test "x$SDL_CFLAGS" = "x" ; then
       SDL_CFLAGS=`$SDL_CONFIG --cflags`
+       if test x${cross_compiling} = xno; then
+               ac_cv_path_sdl_incl=$SDL_CFLAGS
+       fi
     fi
     if test "x$SDL_LIBS" = "x" ; then
       SDL_LIBS=`$SDL_CONFIG --libs | sed -e 's:-L/usr/lib::'`
+       if test x${cross_compiling} = xno; then
+               ac_cv_path_sdl_lib=$SDL_LIBS
+       fi
     fi
   fi
 
@@ -68,7 +74,7 @@
         if test -f $j/SDL.h; then
          gnash_sdl_topdir=`basename $j`
          gnash_sdl_version=`echo ${gnash_sdl_topdir} | sed -e 's:SDL::' -e 
's:-::'`
-         ac_cv_path_sdl_incl="$j"
+         ac_cv_path_sdl_incl="-I$j"
           break
         fi
       done
@@ -83,12 +89,13 @@
     fi
   fi
  
+  dnl This is sorta bogus atm.
   SDL_CFLAGS=""
   if test x"${ac_cv_path_sdl_incl}" = x ; then
     AC_CHECK_HEADERS(SDL.h, [ac_cv_path_sdl_incl=""])
   else
     if test x"${ac_cv_path_sdl_incl}" != x"/usr/include"; then
-      ac_cv_path_sdl_incl="-I${ac_cv_path_sdl_incl}"
+      ac_cv_path_sdl_incl="${ac_cv_path_sdl_incl}"
     else
       ac_cv_path_sdl_incl=""
     fi