[Gnash-commit] gnash ./ChangeLog ./configure.ac libamf/Makefil...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/13 17:48:28

Modified files:
        .              : ChangeLog configure.ac 
        libamf         : Makefile.am amf.cpp amftest.cpp 

Log message:
        * libamf/amf.cpp: Default to not using log_msg().
        * libamf/amftest.cpp: Don't build unless you have dejagnu.h.
        * configure.ac: Check for the dejagnu.h header for unit testing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/amf.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/amftest.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.131 gnash/ChangeLog:1.132
--- gnash/ChangeLog:1.131       Mon Feb 13 12:09:16 2006
+++ gnash/ChangeLog     Mon Feb 13 17:48:28 2006
@@ -1,3 +1,9 @@
+2006-02-13  Rob Savoye  <address@hidden>
+
+       * libamf/amf.cpp: Default to not using log_msg().
+       * libamf/amftest.cpp: Don't build unless you have dejagnu.h.
+       * configure.ac: Check for the dejagnu.h header for unit testing.
+
 2006-02-13 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/xtrace.as: trace window enlarged.
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.35 gnash/configure.ac:1.36
--- gnash/configure.ac:1.35     Mon Feb 13 01:15:59 2006
+++ gnash/configure.ac  Mon Feb 13 17:48:28 2006
@@ -142,6 +142,7 @@
 
 AC_PATH_FIREFOX
 AC_PATH_XTRA
+AC_CHECK_HEADERS(dejagnu.h)
 AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
 AC_CHECK_LIB(Xi, XInput_find_display)
 AC_CHECK_LIB(X11, XDisableAccessControl)
Index: gnash/libamf/Makefile.am
diff -u gnash/libamf/Makefile.am:1.1 gnash/libamf/Makefile.am:1.2
--- gnash/libamf/Makefile.am:1.1        Mon Feb 13 01:15:59 2006
+++ gnash/libamf/Makefile.am    Mon Feb 13 17:48:28 2006
@@ -22,10 +22,6 @@
 AM_CXXFLAGS =  $(CFLAGS) $(SDL_CFLAGS) $(INCLUDES)
 AM_CPPFLAGS = -Wall
 AM_LDFLAGS = \
-       ../backend/libgnashbackend.la \
-       ../server/libgnashserver.la \
-       ../server/libgnashasobjs.la \
-       ../libgeometry/libgnashgeo.la \
        ../libbase/libgnashbase.la \
         $(OPENGL_LIBS)      \
         $(SDL_LIBS)         \
Index: gnash/libamf/amf.cpp
diff -u gnash/libamf/amf.cpp:1.1 gnash/libamf/amf.cpp:1.2
--- gnash/libamf/amf.cpp:1.1    Mon Feb 13 01:15:59 2006
+++ gnash/libamf/amf.cpp        Mon Feb 13 17:48:28 2006
@@ -23,19 +23,19 @@
 #include <cstdio>
 #include <cstring>
 
+#if 0
 #include "log.h"
-#include "wchar.h"
-#include "wctype.h"
+#else
+// Define this to just use printf
+#define log_msg  printf
+#endif
+// #include "wchar.h"
+// #include "wctype.h"
 #include "stdlib.h"
 
 #include "amf.h"
 #include "amfutf8.h"
 
-using namespace gnash;
-
-// Define this to just use printf
-// #define log_msg  printf
-
 namespace amf 
 {
 
Index: gnash/libamf/amftest.cpp
diff -u gnash/libamf/amftest.cpp:1.1 gnash/libamf/amftest.cpp:1.2
--- gnash/libamf/amftest.cpp:1.1        Mon Feb 13 01:15:59 2006
+++ gnash/libamf/amftest.cpp    Mon Feb 13 17:48:28 2006
@@ -22,6 +22,8 @@
 
 #include <netinet/in.h>
 #include <string>
+
+#ifdef HAVE_DEJAGNU_H
 #include "dejagnu.h"
 
 
@@ -251,3 +253,5 @@
     cerr << "-v\tVerbose" << endl;
     exit (-1);
 }
+
+#endif