[Gnash-commit] gnash ChangeLog configure.ac macros/mtasc.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/09/14 07:33:51

Modified files:
        .              : ChangeLog configure.ac 
        macros         : mtasc.m4 

Log message:
        Added fallback path to /usr/share/ocaml/mtasc/std.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4317&r2=1.4318
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.418&r2=1.419
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mtasc.m4?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4317
retrieving revision 1.4318
diff -u -b -r1.4317 -r1.4318
--- ChangeLog   14 Sep 2007 07:25:33 -0000      1.4317
+++ ChangeLog   14 Sep 2007 07:33:50 -0000      1.4318
@@ -6,6 +6,7 @@
 2007-09-14 Markus Gothe <address@hidden>
 
        * configure.ac: Look for broken -fvisibility-inlines-hidden.
+       * macros/mtasc.m4: Added fallback path to /usr/share/ocaml/mtasc/std.
 
 2007-09-14 Markus Gothe <address@hidden>
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -b -r1.418 -r1.419
--- configure.ac        14 Sep 2007 07:25:33 -0000      1.418
+++ configure.ac        14 Sep 2007 07:33:51 -0000      1.419
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.418 2007/09/14 07:25:33 nihilus Exp $
+dnl $Id: configure.ac,v 1.419 2007/09/14 07:33:51 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1360,7 +1360,7 @@
 dnl /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
 AC_DEFUN([CHECK_VISIBILITY_GCC_BUG],
   [
-    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], 
gcc_visibility_bug, [
+    AC_CACHE_CHECK([if -fvisibility-inlines-hidden works], gcc_visibility_bug, 
[
         AC_LANG_PUSH(C++)
         save_CXXFLAGS=$CXXFLAGS
         save_LDFLAGS=$LDFLAGS

Index: macros/mtasc.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mtasc.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/mtasc.m4     1 Jul 2007 10:54:13 -0000       1.3
+++ macros/mtasc.m4     14 Sep 2007 07:33:51 -0000      1.4
@@ -54,7 +54,13 @@
 
   if test x"$MTASC" != "x" -a x"$MTASC_CLASSPATH" = "x"; then
     # cross your fingers !
-    MTASC_CLASSPATH=`dirname ${MTASC}`/std
+    if test -d x"`dirname ${MTASC}`/std"; then
+    dir="`dirname ${MTASC}`/std"
+    else
+    dnl FIXME
+    dir="/usr/share/ocaml/mtasc/std"
+    fi
+    MTASC_CLASSPATH=$dir/std
   fi