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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/04 08:18:37

Modified files:
        .              : ChangeLog 
        macros         : gnashpkgtool.m4 

Log message:
        Look in the $prefix path for includes and
                libraries. This lets specifying --prefix become the default 
path 
        to
                search in for cross compiling.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1508&r2=1.1509
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -b -r1.1508 -r1.1509
--- ChangeLog   4 Nov 2006 07:59:19 -0000       1.1508
+++ ChangeLog   4 Nov 2006 08:18:37 -0000       1.1509
@@ -1,6 +1,9 @@
 2006-11-04 Markus Gothe <address@hidden>
 
        * backend/render_handler_ogl.cpp: Added matrix for YUV->RGB-conversion.
+       * macros/gnashpkgtool.m4: Look in the $prefix path for includes and
+       libraries. This lets specifying --prefix become the default path to
+       search in for cross compiling.
 
 2006-11-03 Sandro Santilli <address@hidden>
 

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/gnashpkgtool.m4      29 Oct 2006 18:34:10 -0000      1.14
+++ macros/gnashpkgtool.m4      4 Nov 2006 08:18:37 -0000       1.15
@@ -14,12 +14,16 @@
 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 
-
-dnl $Id: gnashpkgtool.m4,v 1.14 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.15 2006/11/04 08:18:37 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()..
+dnl 
+dnl TODO:
+dnl   - always run AC_CHECK_HEADERS and AC_CHECK_LIB so that config.h end
+dnl     up with correct information about what's available and what not
+dnl     and every provided info is verified before acceptance
+dnl
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()...
 
 AC_DEFUN([GNASH_PKG_INCLUDES], dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg 
images])
@@ -57,7 +61,7 @@
        if test x"${ac_cv_path_$1_incl}" = x; then
                AC_CHECK_HEADERS($2, [ac_cv_path_$1_incl=""],[
                if test x"${ac_cv_path_$1_incl}" = x; then
-               incllist="${prefix}/include /sw/include /usr/nekoware/include 
/usr/freeware/include /pkg/include /opt/local/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+               incllist="${prefix}/${target_alias}/include ${prefix}/include 
/sw/include /usr/nekoware/include /usr/freeware/include /pkg/include 
/opt/local/include /usr/local/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
                for i in $incllist; do
                        if test -f $i/$1; then
                                if test x"$i" != x"/usr/include"; then
@@ -131,7 +135,7 @@
 
        if test x"${ac_cv_path_$1_lib}" = x; then
                AC_CHECK_LIB($1, $2, [ac_cv_path_$1_lib="-l$1"],[
-               libslist="${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 
.. ../.."
+               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$1.a" -o -f "$i/lib$1.so"; then
                                if test x"$i" != x"/usr/lib"; then