[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./Makefile.in ....
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./Makefile.in .... |
|
Date: |
Tue, 27 Dec 2005 00:05:04 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 05/12/27 00:05:04
Modified files:
. : ChangeLog Makefile.am Makefile.in configure
configure.ac
backend : Makefile.in
doc : Makefile.in
doc/C : Makefile.in
libbase : Makefile.am Makefile.in
libgeometry : Makefile.in
macros : libXML.m4
plugin : Makefile.in
plugin/mozilla-sdk: Makefile.in
server : Makefile.in
utilities : Makefile.in
Log message:
* macros/libXML.m4: Make the --with-libxml-include and
--with-libxml-libraries add the library to the path.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.9 gnash/ChangeLog:1.10
--- gnash/ChangeLog:1.9 Sun Dec 25 20:49:31 2005
+++ gnash/ChangeLog Tue Dec 27 00:05:03 2005
@@ -1,3 +1,13 @@
+2005-12-26 Rob Savoye <address@hidden>
+
+ * macros/libXML.m4: Make the --with-libxml-include and
+ --with-libxml-libraries add the library to the path.
+
+ * backend/gnash.cpp: Define gofast and goslow here instead of
+ xmlsocket.cpp.
+ * server/xmlsocket.cpp: Reference gofast and goslow as externs so
+ gnash actually builds with --disable-xml.
+
2005-12-25 Rob Savoye <address@hidden>
* plugin/plugin.cpp: Fix plugin name so it's recognized correctly
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.3 gnash/Makefile.am:1.4
--- gnash/Makefile.am:1.3 Thu Dec 22 05:11:47 2005
+++ gnash/Makefile.am Tue Dec 27 00:05:03 2005
@@ -11,7 +11,7 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = dejagnu
-STD_DIRS = libbase libgeometry server backend utilities # testsuite
+STD_DIRS = libbase libgeometry server backend utilities doc # testsuite
if PLUGIN
SUBDIRS = $(STD_DIRS) plugin
else
@@ -24,6 +24,8 @@
# SUBDIRS += $(STD_DIRS)
# endif
+include_HEADERS = compatibility_include.h
+
install-doc:
@cd doc/C ; $(MAKE) install-doc
Index: gnash/Makefile.in
diff -u gnash/Makefile.in:1.4 gnash/Makefile.in:1.5
--- gnash/Makefile.in:1.4 Thu Dec 22 05:11:47 2005
+++ gnash/Makefile.in Tue Dec 27 00:05:03 2005
@@ -23,6 +23,7 @@
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -46,10 +47,11 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub depcomp install-sh ltmain.sh missing
+DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
+ ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+ install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/docbook.m4 \
@@ -73,13 +75,22 @@
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
ETAGS = etags
CTAGS = ctags
DEJATOOL = $(PACKAGE)
RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
EXPECT = expect
RUNTEST = runtest
-DIST_SUBDIRS = libbase libgeometry server backend utilities plugin
+DIST_SUBDIRS = libbase libgeometry server backend utilities doc plugin
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -176,6 +187,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
@@ -232,9 +245,16 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = dejagnu
-STD_DIRS = libbase libgeometry server backend utilities # testsuite
+STD_DIRS = libbase libgeometry server backend utilities doc # testsuite
@address@hidden = $(STD_DIRS)
@address@hidden = $(STD_DIRS) plugin
+
+# if HTTP
+# SUBDIRS += net $(STD_DIRS)
+# else
+# SUBDIRS += $(STD_DIRS)
+# endif
+include_HEADERS = compatibility_include.h
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -299,6 +319,23 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+
+uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -601,9 +638,12 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile $(HEADERS) config.h
installdirs: installdirs-recursive
installdirs-am:
+ for dir in "$(DESTDIR)$(includedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -648,7 +688,7 @@
info-am:
-install-data-am:
+install-data-am: install-includeHEADERS
install-exec-am:
@@ -676,7 +716,7 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-includeHEADERS uninstall-info-am
uninstall-info: uninstall-info-recursive
@@ -688,21 +728,17 @@
distclean-libtool distclean-recursive distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
+ install-data-am install-exec install-exec-am \
+ install-includeHEADERS install-info install-info-am \
+ install-man install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
mostlyclean mostlyclean-generic mostlyclean-libtool \
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ uninstall uninstall-am uninstall-includeHEADERS \
+ uninstall-info-am
-# if HTTP
-# SUBDIRS += net $(STD_DIRS)
-# else
-# SUBDIRS += $(STD_DIRS)
-# endif
-
install-doc:
@cd doc/C ; $(MAKE) install-doc
Index: gnash/backend/Makefile.in
diff -u gnash/backend/Makefile.in:1.3 gnash/backend/Makefile.in:1.4
--- gnash/backend/Makefile.in:1.3 Mon Dec 26 15:57:26 2005
+++ gnash/backend/Makefile.in Tue Dec 27 00:05:03 2005
@@ -180,6 +180,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: gnash/configure
diff -u gnash/configure:1.5 gnash/configure:1.6
--- gnash/configure:1.5 Sun Dec 25 20:38:42 2005
+++ gnash/configure Tue Dec 27 00:05:03 2005
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO
install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE
am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT LIBXML_CFLAGS LIBXML_LIBS DMALLOC_LIB HTTP_TRUE
HTTP_FALSE docbook_styles mconfig PLUGIN_TRUE PLUGIN_FALSE FIREFOX_CFLAGS
FIREFOX_LIBS FIREFOX_DEFS FIREFOX_PLUGINS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC
EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE
AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS
ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LIBPRE LIBEXT CPP
X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS EGREP
SDL_MIXER_CFLAGS SDL_MIXER_LIBS OPENGL_CFLAGS OPENGL_LIBS GLUT_LIBS GLU_LIBS
HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE ZLIB_CFLAGS ZLIB_LIBS JPEG_CFLAGS JPEG_LIBS
PNG_CFLAGS PNG_LIBS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS
ac_ct_F77 LIBTOOL PTHREAD_LIB LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO
install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE
am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT LIBXML_CFLAGS LIBXML_LIBS XML_TRUE XML_FALSE
DMALLOC_LIB HTTP_TRUE HTTP_FALSE docbook_styles mconfig PLUGIN_TRUE
PLUGIN_FALSE FIREFOX_CFLAGS FIREFOX_LIBS FIREFOX_DEFS FIREFOX_PLUGINS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX
CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LIBPRE
LIBEXT CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SDL_CONFIG SDL_CFLAGS
SDL_LIBS EGREP SDL_MIXER_CFLAGS SDL_MIXER_LIBS OPENGL_CFLAGS OPENGL_LIBS
GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE ZLIB_CFLAGS ZLIB_LIBS
JPEG_CFLAGS JPEG_LIBS PNG_CFLAGS PNG_LIBS LN_S ECHO AR ac_ct_AR RANLIB
ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PTHREAD_LIB LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1054,8 +1054,8 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-libxml=PFX Prefix where libxml is installed (optional)
- --with-libxml-libraries=DIR Directory where libxml++ library is installed
(optional)
- --with-libxml-includes=DIR Directory where libxmlc++ header files are
installed (optional)
+ --with-libxml-libraries=DIR Directory where libxml library is installed
(optional)
+ --with-libxml-includes=DIR Directory where libxml header files are
installed (optional)
--with-docbook specify the path to the Docbook
stylesheets
--with-firefox=PFX Prefix where firefox is installed (optional)
@@ -2168,11 +2168,11 @@
fi;
if test "x$libxml_libraries" != "x" ; then
- LIBXML_LIBS="-L$libxml_libraries"
+ LIBXML_LIBS="-L$libxml_libraries -lxml2"
elif test "x$libxml_prefix" != "x" ; then
- LIBXML_LIBS="-L$libxml_prefix/lib"
+ LIBXML_LIBS="-L$libxml_prefix/lib -lxml2"
elif test "x$prefix" != "xNONE" ; then
- LIBXML_LIBS="-L$libdir"
+ LIBXML_LIBS="-L$libdir -lxml2"
fi
if test "x$libxml_includes" != "x" ; then
@@ -2213,6 +2213,16 @@
fi
+
+if test x$enable_xml = xyes; then
+ XML_TRUE=
+ XML_FALSE='#'
+else
+ XML_TRUE='#'
+ XML_FALSE=
+fi
+
+
# Check whether --enable-i810-lod-bias or --disable-i810-lod-bias was given.
if test "${enable_i810_lod_bias+set}" = set; then
enableval="$enable_i810_lod_bias"
@@ -2257,7 +2267,6 @@
fi
-
dom=yes
# Check whether --enable-dom or --disable-dom was given.
if test "${enable_dom+set}" = set; then
@@ -2340,7 +2349,6 @@
-
# Check whether --with-docbook or --without-docbook was given.
if test "${with_docbook+set}" = set; then
withval="$with_docbook"
@@ -8698,7 +8706,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8701 "configure"' > conftest.$ac_ext
+ echo '#line 8709 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9333,7 +9341,7 @@
# Provide some information about the compiler.
-echo "$as_me:9336:" \
+echo "$as_me:9344:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -10367,11 +10375,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10370: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10378: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10374: \$? = $ac_status" >&5
+ echo "$as_me:10382: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10600,11 +10608,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10603: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10611: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10607: \$? = $ac_status" >&5
+ echo "$as_me:10615: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10660,11 +10668,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10663: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10671: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10667: \$? = $ac_status" >&5
+ echo "$as_me:10675: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11994,7 +12002,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 11997 "configure"' > conftest.$ac_ext
+ echo '#line 12005 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12865,7 +12873,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12868 "configure"
+#line 12876 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12963,7 +12971,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12966 "configure"
+#line 12974 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15142,11 +15150,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15145: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15153: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15149: \$? = $ac_status" >&5
+ echo "$as_me:15157: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15202,11 +15210,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15205: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15213: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15209: \$? = $ac_status" >&5
+ echo "$as_me:15217: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15713,7 +15721,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15716 "configure"' > conftest.$ac_ext
+ echo '#line 15724 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16584,7 +16592,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16587 "configure"
+#line 16595 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16682,7 +16690,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16685 "configure"
+#line 16693 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17509,11 +17517,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17512: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17516: \$? = $ac_status" >&5
+ echo "$as_me:17524: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17569,11 +17577,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17572: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17580: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17576: \$? = $ac_status" >&5
+ echo "$as_me:17584: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18883,7 +18891,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18886 "configure"' > conftest.$ac_ext
+ echo '#line 18894 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19624,11 +19632,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19627: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19635: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19631: \$? = $ac_status" >&5
+ echo "$as_me:19639: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -19857,11 +19865,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19860: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19868: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19864: \$? = $ac_status" >&5
+ echo "$as_me:19872: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -19917,11 +19925,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19920: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19928: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19924: \$? = $ac_status" >&5
+ echo "$as_me:19932: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21251,7 +21259,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 21254 "configure"' > conftest.$ac_ext
+ echo '#line 21262 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22122,7 +22130,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22125 "configure"
+#line 22133 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22220,7 +22228,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22223 "configure"
+#line 22231 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23413,6 +23421,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${XML_TRUE}" && test -z "${XML_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"XML\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XML\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${HTTP_TRUE}" && test -z "${HTTP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HTTP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -24035,6 +24050,8 @@
s,@MAINT@,$MAINT,;t t
s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
+s,@XML_TRUE@,$XML_TRUE,;t t
+s,@XML_FALSE@,$XML_FALSE,;t t
s,@DMALLOC_LIB@,$DMALLOC_LIB,;t t
s,@HTTP_TRUE@,$HTTP_TRUE,;t t
s,@HTTP_FALSE@,$HTTP_FALSE,;t t
@@ -24859,6 +24876,8 @@
echo " Not using XML or XMLSocket"
else
echo " Adding XML and XMLSocket"
+ echo " XML flags are: $LIBXML_CFLAGS"
+ echo " XML libs are: $LIBXML_LIBS"
fi
if test x"$plugin" = x"yes"; then
@@ -24868,7 +24887,7 @@
fi
if test x"$FIREFOX_CFLAGS" != x; then
- echo " Firefox C flags are: $FIREFOX_CFLAGS"
+ echo " Firefox Cflags are: $FIREFOX_CFLAGS"
echo " Firefox libs are: $FIREFOX_LIBS"
else
echo " WARNING: No Firefox development package installed!"
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.6 gnash/configure.ac:1.7
--- gnash/configure.ac:1.6 Mon Dec 26 15:57:26 2005
+++ gnash/configure.ac Tue Dec 27 00:05:03 2005
@@ -225,6 +225,8 @@
echo " Not using XML or XMLSocket"
else
echo " Adding XML and XMLSocket"
+ echo " XML flags are: $LIBXML_CFLAGS"
+ echo " XML libs are: $LIBXML_LIBS"
fi
if test x"$plugin" = x"yes"; then
@@ -234,7 +236,7 @@
fi
if test x"$FIREFOX_CFLAGS" != x; then
- echo " Firefox C flags are: $FIREFOX_CFLAGS"
+ echo " Firefox Cflags are: $FIREFOX_CFLAGS"
echo " Firefox libs are: $FIREFOX_LIBS"
else
echo " WARNING: No Firefox development package installed!"
Index: gnash/doc/C/Makefile.in
diff -u gnash/doc/C/Makefile.in:1.2 gnash/doc/C/Makefile.in:1.3
--- gnash/doc/C/Makefile.in:1.2 Thu Dec 22 04:56:55 2005
+++ gnash/doc/C/Makefile.in Tue Dec 27 00:05:03 2005
@@ -219,6 +219,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: gnash/doc/Makefile.in
diff -u gnash/doc/Makefile.in:1.2 gnash/doc/Makefile.in:1.3
--- gnash/doc/Makefile.in:1.2 Thu Dec 22 04:56:55 2005
+++ gnash/doc/Makefile.in Tue Dec 27 00:05:03 2005
@@ -165,6 +165,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.2 gnash/libbase/Makefile.am:1.3
--- gnash/libbase/Makefile.am:1.2 Wed Dec 21 02:16:44 2005
+++ gnash/libbase/Makefile.am Tue Dec 27 00:05:03 2005
@@ -35,56 +35,56 @@
-I$(top_srcdir)
libbase_la_SOURCES = \
- config.cpp \
- container.cpp \
- demo.cpp \
- dlmalloc.c \
- file_util.cpp \
- image.cpp \
- image_filters.cpp \
- jpeg.cpp \
- membuf.cpp \
- ogl.cpp \
- png_helper.cpp \
- postscript.cpp \
- triangulate_float.cpp \
- triangulate_sint32.cpp \
- tu_file.cpp \
- tu_file_SDL.cpp \
- tu_random.cpp \
- tu_timer.cpp \
- tu_types.cpp \
- utf8.cpp \
- utility.cpp \
+ config.cpp \
+ container.cpp \
+ demo.cpp \
+ dlmalloc.c \
+ file_util.cpp \
+ image.cpp \
+ image_filters.cpp \
+ jpeg.cpp \
+ membuf.cpp \
+ ogl.cpp \
+ png_helper.cpp \
+ postscript.cpp \
+ triangulate_float.cpp \
+ triangulate_sint32.cpp \
+ tu_file.cpp \
+ tu_file_SDL.cpp \
+ tu_random.cpp \
+ tu_timer.cpp \
+ tu_types.cpp \
+ utf8.cpp \
+ utility.cpp \
zlib_adapter.cpp
noinst_HEADERS = \
- config.h \
- container.h \
- cschema.h \
- demo.h \
- dlmalloc.h \
- file_util.h \
- grid_index.h \
- image.h \
- jpeg.h \
- membuf.h \
- ogl.h \
- png_helper.h \
- postscript.h \
- smart_ptr.h \
- triangulate.h \
+ config.h \
+ container.h \
+ cschema.h \
+ demo.h \
+ dlmalloc.h \
+ file_util.h \
+ grid_index.h \
+ image.h \
+ jpeg.h \
+ membuf.h \
+ ogl.h \
+ png_helper.h \
+ postscript.h \
+ smart_ptr.h \
+ triangulate.h \
triangulate_impl.h \
- tu_config.h \
- tu_file.h \
- tu_math.h \
+ tu_config.h \
+ tu_file.h \
+ tu_math.h \
tu_opengl_includes.h \
- tu_random.h \
- tu_swap.h \
- tu_timer.h \
- tu_types.h \
- utf8.h \
- utility.h \
+ tu_random.h \
+ tu_swap.h \
+ tu_timer.h \
+ tu_types.h \
+ utf8.h \
+ utility.h \
zlib_adapter.h
#libbase_la_LDFLAGS = -module -avoid-version -no-undefined
Index: gnash/libbase/Makefile.in
diff -u gnash/libbase/Makefile.in:1.3 gnash/libbase/Makefile.in:1.4
--- gnash/libbase/Makefile.in:1.3 Thu Dec 22 04:56:55 2005
+++ gnash/libbase/Makefile.in Tue Dec 27 00:05:03 2005
@@ -199,6 +199,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
@@ -269,56 +271,56 @@
-I$(top_srcdir)
libbase_la_SOURCES = \
- config.cpp \
- container.cpp \
- demo.cpp \
- dlmalloc.c \
- file_util.cpp \
- image.cpp \
- image_filters.cpp \
- jpeg.cpp \
- membuf.cpp \
- ogl.cpp \
- png_helper.cpp \
- postscript.cpp \
- triangulate_float.cpp \
- triangulate_sint32.cpp \
- tu_file.cpp \
- tu_file_SDL.cpp \
- tu_random.cpp \
- tu_timer.cpp \
- tu_types.cpp \
- utf8.cpp \
- utility.cpp \
+ config.cpp \
+ container.cpp \
+ demo.cpp \
+ dlmalloc.c \
+ file_util.cpp \
+ image.cpp \
+ image_filters.cpp \
+ jpeg.cpp \
+ membuf.cpp \
+ ogl.cpp \
+ png_helper.cpp \
+ postscript.cpp \
+ triangulate_float.cpp \
+ triangulate_sint32.cpp \
+ tu_file.cpp \
+ tu_file_SDL.cpp \
+ tu_random.cpp \
+ tu_timer.cpp \
+ tu_types.cpp \
+ utf8.cpp \
+ utility.cpp \
zlib_adapter.cpp
noinst_HEADERS = \
- config.h \
- container.h \
- cschema.h \
- demo.h \
- dlmalloc.h \
- file_util.h \
- grid_index.h \
- image.h \
- jpeg.h \
- membuf.h \
- ogl.h \
- png_helper.h \
- postscript.h \
- smart_ptr.h \
- triangulate.h \
+ config.h \
+ container.h \
+ cschema.h \
+ demo.h \
+ dlmalloc.h \
+ file_util.h \
+ grid_index.h \
+ image.h \
+ jpeg.h \
+ membuf.h \
+ ogl.h \
+ png_helper.h \
+ postscript.h \
+ smart_ptr.h \
+ triangulate.h \
triangulate_impl.h \
- tu_config.h \
- tu_file.h \
- tu_math.h \
+ tu_config.h \
+ tu_file.h \
+ tu_math.h \
tu_opengl_includes.h \
- tu_random.h \
- tu_swap.h \
- tu_timer.h \
- tu_types.h \
- utf8.h \
- utility.h \
+ tu_random.h \
+ tu_swap.h \
+ tu_timer.h \
+ tu_types.h \
+ utf8.h \
+ utility.h \
zlib_adapter.h
all: all-am
Index: gnash/libgeometry/Makefile.in
diff -u gnash/libgeometry/Makefile.in:1.3 gnash/libgeometry/Makefile.in:1.4
--- gnash/libgeometry/Makefile.in:1.3 Thu Dec 22 04:56:55 2005
+++ gnash/libgeometry/Makefile.in Tue Dec 27 00:05:03 2005
@@ -188,6 +188,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.2 gnash/macros/libXML.m4:1.3
--- gnash/macros/libXML.m4:1.2 Sun Dec 25 20:49:31 2005
+++ gnash/macros/libXML.m4 Tue Dec 27 00:05:03 2005
@@ -21,16 +21,16 @@
dnl Get the cflags and libraries
dnl
AC_ARG_WITH(libxml,[ --with-libxml=PFX Prefix where libxml is installed
(optional)], libxml_prefix="$withval", libxml_prefix="")
-AC_ARG_WITH(libxml-libraries,[ --with-libxml-libraries=DIR Directory where
libxml++ library is installed (optional)], libxml_libraries="$withval",
libxml_libraries="")
-AC_ARG_WITH(libxml-includes,[ --with-libxml-includes=DIR Directory where
libxmlc++ header files are installed (optional)], libxml_includes="$withval",
libxml_includes="")
+AC_ARG_WITH(libxml-libraries,[ --with-libxml-libraries=DIR Directory where
libxml library is installed (optional)], libxml_libraries="$withval",
libxml_libraries="")
+AC_ARG_WITH(libxml-includes,[ --with-libxml-includes=DIR Directory where
libxml header files are installed (optional)], libxml_includes="$withval",
libxml_includes="")
dnl AC_ARG_ENABLE(libxmltest, [ --disable-libxmltest Do not try to
compile and run a test libxml program],, enable_libxmltest=yes)
if test "x$libxml_libraries" != "x" ; then
- LIBXML_LIBS="-L$libxml_libraries"
+ LIBXML_LIBS="-L$libxml_libraries -lxml2"
elif test "x$libxml_prefix" != "x" ; then
- LIBXML_LIBS="-L$libxml_prefix/lib"
+ LIBXML_LIBS="-L$libxml_prefix/lib -lxml2"
elif test "x$prefix" != "xNONE" ; then
- LIBXML_LIBS="-L$libdir"
+ LIBXML_LIBS="-L$libdir -lxml2"
fi
if test "x$libxml_includes" != "x" ; then
Index: gnash/plugin/Makefile.in
diff -u gnash/plugin/Makefile.in:1.2 gnash/plugin/Makefile.in:1.3
--- gnash/plugin/Makefile.in:1.2 Thu Dec 22 04:56:56 2005
+++ gnash/plugin/Makefile.in Tue Dec 27 00:05:03 2005
@@ -198,6 +198,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: gnash/plugin/mozilla-sdk/Makefile.in
diff -u gnash/plugin/mozilla-sdk/Makefile.in:1.3
gnash/plugin/mozilla-sdk/Makefile.in:1.4
--- gnash/plugin/mozilla-sdk/Makefile.in:1.3 Thu Dec 22 04:56:56 2005
+++ gnash/plugin/mozilla-sdk/Makefile.in Tue Dec 27 00:05:03 2005
@@ -191,6 +191,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: gnash/server/Makefile.in
diff -u gnash/server/Makefile.in:1.3 gnash/server/Makefile.in:1.4
--- gnash/server/Makefile.in:1.3 Thu Dec 22 04:56:56 2005
+++ gnash/server/Makefile.in Tue Dec 27 00:05:03 2005
@@ -190,6 +190,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: gnash/utilities/Makefile.in
diff -u gnash/utilities/Makefile.in:1.2 gnash/utilities/Makefile.in:1.3
--- gnash/utilities/Makefile.in:1.2 Thu Dec 22 04:56:56 2005
+++ gnash/utilities/Makefile.in Tue Dec 27 00:05:03 2005
@@ -182,6 +182,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XML_FALSE = @XML_FALSE@
+XML_TRUE = @XML_TRUE@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@