[Gnash-commit] gnash configure.ac macros/gnashpkgtool.m4 macro...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/25 21:25:23

Modified files:
        .              : configure.ac 
        macros         : gnashpkgtool.m4 
Removed files:
        macros         : fltk.m4 

Log message:
        Got this one striagth too...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.210&r2=1.211
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/fltk.m4?cvsroot=gnash&r1=1.6&r2=0

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- configure.ac        25 Nov 2006 20:58:54 -0000      1.210
+++ configure.ac        25 Nov 2006 21:25:23 -0000      1.211
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.210 2006/11/25 20:58:54 nihilus Exp $
+dnl $Id: configure.ac,v 1.211 2006/11/25 21:25:23 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -637,11 +637,12 @@
        GNASH_PKG_FIND(gstreamer, [gst.h], [gstreamer library], gst_init, 
[0.10])
 fi
 
-if test x$gui = xfltk; then
-GNASH_PATH_FLTK
-fi
 AM_CONDITIONAL(HAS_FLTK, [ test x$has_fltk = xyes ])
 AM_CONDITIONAL(HAS_XFT, [ test x$has_xft = xyes ])
+if test x$gui = xfltk; then
+       GNASH_PKG_FIND(fltk, [FL_API.h], [gstreamer library], fl_xmap, [], 
[-lfltk_gl])
+fi
+
 
 if test x$renderer = xagg; then
 GNASH_PATH_AGG

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/gnashpkgtool.m4      25 Nov 2006 21:06:13 -0000      1.21
+++ macros/gnashpkgtool.m4      25 Nov 2006 21:25:23 -0000      1.22
@@ -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: gnashpkgtool.m4,v 1.21 2006/11/25 21:06:13 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.22 2006/11/25 21:25:23 nihilus Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()..
@@ -145,15 +145,15 @@
        fi
 
        if test x"${ac_cv_path_$1_lib}" = x; then
-               AC_CHECK_LIB($name, $2, [ac_cv_path_$1_lib="-l$name"],[
+               AC_CHECK_LIB($name, $2, [ac_cv_path_$1_lib="-l$name $5"],[
                libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/nekoware/lib 
/usr/freeware/lib /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib 
/pkg/lib /opt/local/lib /usr/pkg/lib .. ../.."
                for i in $libslist; do
                        if test -f "$i/lib$name.a" -o -f "$i/lib$name.so"; then
                                if test x"$i" != x"/usr/lib"; then
-                                       ac_cv_path_$1_lib="-L$i -l$name"
+                                       ac_cv_path_$1_lib="-L$i -l$name $5"
                                        break
                                else
-                                       ac_cv_path_$1_lib=""
+                                       ac_cv_path_$1_lib="-l$name $5"
                                        break
                                fi
                        fi
@@ -176,8 +176,8 @@
 popdef([DOWN])
 ])
 
-AC_DEFUN([GNASH_PKG_FIND], dnl GNASH_PKG_FIND(cairo, [cairo.h], [cairo render 
library], cairo_status)
+AC_DEFUN([GNASH_PKG_FIND], dnl GNASH_PKG_FIND(fltk, [FL_API.h], [gstreamer 
library], fl_xmap, [], [-lfltk_gl])
 [
 GNASH_PKG_INCLUDES($1, $2, $3, $5)
-GNASH_PKG_LIBS($1, $4, $3, $5)
+GNASH_PKG_LIBS($1, $4, $3, $5, $6)
 ])

Index: macros/fltk.m4
===================================================================
RCS file: macros/fltk.m4
diff -N macros/fltk.m4
--- macros/fltk.m4      25 Nov 2006 21:16:41 -0000      1.6
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,123 +0,0 @@
-dnl  
-dnl    Copyright (C) 2005, 2006 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
-dnl  the Free Software Foundation; either version 2 of the License, or
-dnl  (at your option) any later version.
-dnl  
-dnl  This program is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl  GNU General Public License for more details.
-dnl  You should have received a copy of the GNU General Public License
-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  
-dnl 
-
-AC_DEFUN([GNASH_PATH_FLTK],
-[
-  AC_ARG_ENABLE(fltk, AC_HELP_STRING([--enable-fltk], [Enable support for 
FLTK]),
-  [case "${enableval}" in
-    yes) fltk=yes ;;
-    no)  fltk=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for enable-fltk option]) ;;
-  esac], fltk=yes)
-
-  if test x"$fltk" = x"yes"; then
-    dnl Look for the header
-  AC_ARG_WITH(fltk_incl, AC_HELP_STRING([--with-fltk-incl], [directory where 
libfltk header is]), with_fltk_incl=${withval})
-    AC_CACHE_VAL(ac_cv_path_fltk_incl, [
-    AC_MSG_CHECKING([for fltk.h header in specified directory])
-    if test x"${with_fltk_incl}" != x ; then
-      if test -f ${with_fltk_incl}/fltk/FL_API.h; then
-       ac_cv_path_fltk_incl=`(cd ${with_fltk_incl}; pwd)`
-       AC_MSG_RESULT([yes])
-      else
-       AC_MSG_ERROR([${with_fltk_incl} directory doesn't contain 
fltk/FL_API.h])
-      fi
-    else
-       AC_MSG_RESULT([no])
-    fi
-    ])
-
-    dnl If the path hasn't been specified, go look for it.
-    if test x"${ac_cv_path_fltk_incl}" = x; then
-      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 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
-
-       ac_cv_path_fltk_incl=""
-        for i in $incllist; do
-         if test -f $i/fltk/FL_API.h; then
-           if test x"$i" != x"/usr/include"; then
-             ac_cv_path_fltk_incl="$i"
-             break
-           fi
-         fi
-        done
-      fi])
-    else
-      if test x"${ac_cv_path_fltk_incl}" != x"/usr/include"; then
-       ac_cv_path_fltk_incl="${ac_cv_path_fltk_incl}"
-      fi
-    fi
-
-    if test x"${ac_cv_path_fltk_incl}" != x ; then
-      FLTK_CFLAGS="-I${ac_cv_path_fltk_incl}"
-    else
-      FLTK_CFLAGS=""
-    fi
-
-      dnl Look for the library
-      AC_ARG_WITH(fltk_lib, AC_HELP_STRING([--with-fltk-lib], [directory where 
fltk library is]), with_fltk_lib=${withval})
-      AC_CACHE_VAL(ac_cv_path_fltk_lib,[
-      if test x"${with_fltk_lib}" != x ; then
-        AC_MSG_CHECKING([for libfltk library in specified directory])
-        if test -f ${with_fltk_lib}/libfltk.a -o -f 
${with_fltk_lib}/libfltk_gl.a; then
-         tmp=`(cd ${with_fltk_lib}; pwd)`
-         ac_cv_path_fltk_lib="-L${tmp} -lfltk"
-         AC_MSG_RESULT([yes])
-        else
-         AC_MSG_ERROR([${with_fltk_lib} directory doesn't contain libfltk.])
-         AC_MSG_RESULT([no])
-        fi
-      fi
-      ])
-
-      dnl If the header doesn't exist, there is no point looking for the 
library.
-      if test x"${ac_cv_path_fltk_lib}" = x; then
-        AC_CHECK_LIB(fltk, fl_xmap, [ac_cv_path_fltk_lib="-lfltk -lfltk_gl"],[
-          AC_MSG_CHECKING([for libfltk library])
-          libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
-          ac_cv_path_fltk_lib=""
-          for i in $libslist; do
-           if test -f $i/libfltk.a -o -f $i/libfltk_gl.a; then
-             if test x"$i" != x"/usr/lib"; then
-               ac_cv_path_fltk_lib="-L$i -lfltk -lfltk_gl"
-                AC_MSG_RESULT(${ac_cv_path_fltk_lib})
-               break
-              else
-               ac_cv_path_fltk_lib="-lfltk -lfltk_gl"
-                AC_MSG_RESULT(yes)
-               break
-             fi
-           fi
-          done])
-      fi
-    fi
-
-  if test x"${ac_cv_path_fltk_lib}" != x ; then
-      FLTK_LIBS="${ac_cv_path_fltk_lib}"
-      has_fltk=yes
-  else
-      has_fltk=no
-      FLTK_LIBS=""
-  fi
-
-  AC_SUBST(FLTK_CFLAGS)
-  AC_SUBST(FLTK_LIBS)
-])