[Gnash-commit] gnash ChangeLog configure.ac

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/23 22:30:12

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        Fixed finding correct X11-ABI and X11-lib-path on IRIX.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1370&r2=1.1371
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.181&r2=1.182

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1370
retrieving revision 1.1371
diff -u -b -r1.1370 -r1.1371
--- ChangeLog   23 Oct 2006 19:22:16 -0000      1.1370
+++ ChangeLog   23 Oct 2006 22:30:12 -0000      1.1371
@@ -1,3 +1,7 @@
+2006-10-24 Markus Gothe <address@hidden>
+
+       * configure.ac: Fixed finding correct X11-ABI and X11-lib-path on IRIX.
+
 2006-10-23 Sandro Santilli <address@hidden>
 
        * server/swf/ASHandlers.cpp (ActionTypeOf): add support
@@ -21,8 +25,9 @@
        * libbase/smart_ptr.h (weak_ptr): made equality operator an inspector,
          added inequality operator.
 
-2006-10-23 Markus Gothe <address@hidden>
+2006-10-2 Markus Gothe <address@hidden>
 
+       * configure.ac: Fixed finding correct X11-ABI and X11-lib-path on IRIX.
        * macro/jpeg.m4: Fixed a bug.
        * macro/kde.m4: Fixed typos.
        * macro/opengl.m4: Fixed typo (I wonder how we got away with this one?).

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- configure.ac        23 Oct 2006 13:01:51 -0000      1.181
+++ configure.ac        23 Oct 2006 22:30:12 -0000      1.182
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.181 2006/10/23 13:01:51 nihilus Exp $
+dnl $Id: configure.ac,v 1.182 2006/10/23 22:30:12 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -363,7 +363,28 @@
 AM_CONDITIONAL(KLASH, test x$klash = xyes)
 
 GNASH_PATH_FIREFOX
+
+dnl IRIX-hack.
+case $host in
+       *-*-irix*)
+       dnl ABI-check
+       save_LIBS=$LIBS
+       dir="/usr/lib /usr/include32 /usr/include/lib64"
+       for i in $dir; do
+               LIBS=-L$i
+               AC_SEARCH_LIBS(XDisableAccessControl, X11, [
+               xpathed=$i
+               break
+               ])
+               unset ac_cv_search_XDisableAccessControl
+       done
+       ac_x_libraries=$xpathed
+       x_libraries=$xpathed
+       LIBS=$save_LIBS
+       ;;
+esac
 AC_PATH_XTRA
+
 AC_CHECK_HEADERS(dejagnu.h)
 AC_CHECK_HEADERS(malloc.h)
 AC_CHECK_HEADERS(getopt.h)