[Gnash-commit] gnash ./ChangeLog macros/fltk.m4 macros/gtkglex...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/22 19:44:16

Modified files:
        .              : ChangeLog 
        macros         : fltk.m4 gtkglext.m4 pango.m4 sdl.m4 

Log message:
        * macros/fltk.m4: Look in X11R6 for headers.
        * macros/gtkglext.m4: Look in X11R6 for headers.
        * macros/pango.m4: Look in X11R6 for headers.
        * macros/sdl.m4: Find SDL on FreeBSD where vesion SDL11 is used
        instead of SDL-1.1.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.222&tr2=1.223&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/fltk.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pango.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/sdl.m4.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.222 gnash/ChangeLog:1.223
--- gnash/ChangeLog:1.222       Sat Apr 22 19:22:00 2006
+++ gnash/ChangeLog     Sat Apr 22 19:44:16 2006
@@ -1,8 +1,16 @@
+2006-04-22  Rob Savoye  <address@hidden>
+
+       * macros/fltk.m4: Look in X11R6 for headers.
+       * macros/gtkglext.m4: Look in X11R6 for headers.
+       * macros/pango.m4: Look in X11R6 for headers.
+       * macros/sdl.m4: Find SDL on FreeBSD where vesion SDL11 is used
+       instead of SDL-1.1.
+
 2006-04-22  Bastiaan Jacques  <address@hidden>
 
        * server/Movie.h: Make the import_info struct a proper class.
        * server/Movie.cpp: Adjust the users of import_info to match
-       changes to Movie.h
+       changes to Movie.h.
        
 2006-04-21  Rob Savoye  <address@hidden>
 
Index: gnash/macros/fltk.m4
diff -u gnash/macros/fltk.m4:1.1 gnash/macros/fltk.m4:1.2
--- gnash/macros/fltk.m4:1.1    Thu Apr 20 17:21:40 2006
+++ gnash/macros/fltk.m4        Sat Apr 22 19:44:16 2006
@@ -43,7 +43,7 @@
     yes) fltk=yes ;;
     no)  fltk=no ;;
     *)   AC_MSG_ERROR([bad value ${enableval} for enable-fltk option]) ;;
-  esac], fltk=no)
+  esac], fltk=yes)
 
   if test x"$fltk" = x"yes"; then
     dnl Look for the header
@@ -67,7 +67,7 @@
       AC_CHECK_HEADERS(fltk/FL_API.h, [ac_cv_path_fltk_incl=""],[
       if test x"${ac_cv_path_fltk_incl}" = x; then
         AC_MSG_CHECKING([for libfltk header])
-        incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+        incllist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
        ac_cv_path_fltk_incl=""
         for i in $incllist; do
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.4 gnash/macros/gtkglext.m4:1.5
--- gnash/macros/gtkglext.m4:1.4        Tue Apr 11 17:11:09 2006
+++ gnash/macros/gtkglext.m4    Sat Apr 22 19:44:16 2006
@@ -116,7 +116,7 @@
       AC_CACHE_VAL(ac_cv_path_glext_lib,[
       if test x"${with_glext_lib}" != x ; then
         if test -f ${with_glext_lib}/libgtkglext-x11-${version}.a -o -f 
${with_glext_lib}/libgtkglext-x11-${version}.so; then
-         ac_cv_path_glext_lib=`(cd ${with_glext_incl}; pwd)`
+         ac_cv_path_glext_lib=`(cd ${with_glext_lib}; pwd)`
         else
          AC_MSG_ERROR([${with_glext_lib} directory doesn't contain 
libgtkglext.])
         fi
Index: gnash/macros/pango.m4
diff -u gnash/macros/pango.m4:1.6 gnash/macros/pango.m4:1.7
--- gnash/macros/pango.m4:1.6   Tue Apr 11 17:11:09 2006
+++ gnash/macros/pango.m4       Sat Apr 22 19:44:16 2006
@@ -56,7 +56,7 @@
     dnl doesn't seem to get a directory that is unversioned.
     if test x"${ac_cv_path_pango_incl}" = x; then
       AC_MSG_CHECKING([for the Pango Version])
-        pathlist="/sw/include /usr/local/include /home/latest/include 
/opt/include /usr/include /usr/pkg/include .. ../.."
+        pathlist="/sw/include /usr/local/include /usr/X11R6/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
 
         topdir=""
         version=""
Index: gnash/macros/sdl.m4
diff -u gnash/macros/sdl.m4:1.15 gnash/macros/sdl.m4:1.16
--- gnash/macros/sdl.m4:1.15    Fri Apr 21 17:35:48 2006
+++ gnash/macros/sdl.m4 Sat Apr 22 19:44:16 2006
@@ -50,6 +50,35 @@
     fi
   fi
   ])
+
+  dnl Attempt to find the top level directory, which unfortunately has a
+  dnl version number attached. At least on Debain based systems, this
+  dnl doesn't seem to get a directory that is unversioned.
+  if test x"${ac_cv_path_sdl_incl}" = x; then
+    AC_MSG_CHECKING([for the SDL Version])
+    pathlist="/sw/include /usr/local/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
+
+    topdir=""
+    version=""
+    for i in $pathlist; do
+      for j in `ls -dr $i/SDL-[[0-9]].[[0-9]] 2>/dev/null`; do
+       if test -f $j/SDL.h; then
+         topdir=`basename $j`
+         version=`echo ${topdir} | sed -e 's:SDL-::'`
+          break
+        fi
+      done
+      dnl This is a special caze for FreeBSD, that uses SDL11 instead of 
SDL-1.1.
+      for j in `ls -dr $i/SDL[[0-9]][[0-9]] 2>/dev/null`; do
+       if test -f $j/SDL.h; then
+         topdir=`basename $j`
+         version=`echo ${topdir} | sed -e 's:SDL::'`
+          break
+        fi
+      done
+    done
+  fi
+
   if test x"${ac_cv_path_sdl_incl}" = x ; then
     AC_MSG_CHECKING([for SDL header])
     incllist="${prefix} /usr /usr/pkg /sw /usr/local /home/latest /opt /usr .. 
../.."
@@ -59,9 +88,14 @@
         ac_cv_path_sdl_incl=$i/SDL/include
         break
       fi
-      if test -f $i/include/SDL/SDL.h; then
-        ac_cv_path_sdl_incl=$i/include/SDL
+      if test -f $i/include/SDL-${version}/SDL.h; then
+        ac_cv_path_sdl_incl=$i/include/SDL-${version}
         break
+      else
+        if test -f $i/include/SDL${version}/SDL.h; then
+          ac_cv_path_sdl_incl=$i/include/SDL${version}
+          break
+       fi
       fi
     done
 
@@ -85,9 +119,13 @@
   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
-      ac_cv_path_sdl_lib=-L`(cd ${with_sdl_lib}; pwd)` -lSDL
+      ac_cv_path_sdl_lib="-L`(cd ${with_sdl_lib}; pwd)` -lSDL"
     else
-      AC_MSG_ERROR([${with_sdl_lib} directory doesn't contain libsdl.a])
+      if test -f ${with_sdl_libs}/libSDL-1.1.a -o -f 
${with_sdl_lib}/libSDL-1.1.so; then
+        ac_cv_path_sdl_lib="-L`(cd ${with_sdl_lib}; pwd)` -lSDL"
+      else
+        AC_MSG_ERROR([${with_sdl_lib} directory doesn't contain libSDL-1.1.a])
+      fi
     fi
   fi
   ])
@@ -98,7 +136,7 @@
       AC_MSG_CHECKING([for SDL library])
       liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /usr/pkg/lib 
/sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
       for i in $liblist; do
-        if test -f $i/libSDL.a -o -f $i/libSDl.so; then
+        if test -f $i/libSDL.a -o -f $i/libSDL.so; then
           if test x"$i" != x"/usr/lib"; then
             ac_cv_path_sdl_lib="-L$i -lSDL"
             AC_MSG_RESULT(${ac_cv_path_sdl_lib})
@@ -109,6 +147,19 @@
            has_sdl=yes
             break
           fi
+       else
+          if test -f $i/libSDL-1.1.a -o -f $i/libSDL-1.1.so; then
+            if test x"$i" != x"/usr/lib"; then
+              ac_cv_path_sdl_lib="-L$i -lSDL-1.1"
+              AC_MSG_RESULT(${ac_cv_path_sdl_lib})
+              break
+            else
+              ac_cv_path_sdl_lib="-lSDL-1.1"
+              AC_MSG_RESULT([yes])
+             has_sdl=yes
+              break
+            fi
+         fi
         fi
       done
     ])