[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./Makefile.in ./configure bac...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./Makefile.in ./configure bac... |
|
Date: |
Tue, 27 Dec 2005 00:46:00 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 05/12/27 00:45:59
Modified files:
. : ChangeLog Makefile.in configure
backend : Makefile.in
doc : Makefile.in
doc/C : Makefile.in
libbase : 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: Test if pk-config exists. Use it if it does, but if
it
doesn't, do a brute force check of standard install locations for the
XML2
headers and library.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.in.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.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.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/Makefile.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.10 gnash/ChangeLog:1.11
--- gnash/ChangeLog:1.10 Tue Dec 27 00:05:03 2005
+++ gnash/ChangeLog Tue Dec 27 00:45:59 2005
@@ -1,7 +1,10 @@
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.
+ --with-libxml-libraries add the library to the path. Test if
+ pk-config exists. Use it if it does, but if it doesn't, do a brute
+ force check of standard install locations for the XML2 headers and
+ library.
* backend/gnash.cpp: Define gofast and goslow here instead of
xmlsocket.cpp.
Index: gnash/Makefile.in
diff -u gnash/Makefile.in:1.5 gnash/Makefile.in:1.6
--- gnash/Makefile.in:1.5 Tue Dec 27 00:05:03 2005
+++ gnash/Makefile.in Tue Dec 27 00:45:59 2005
@@ -172,6 +172,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/backend/Makefile.in
diff -u gnash/backend/Makefile.in:1.4 gnash/backend/Makefile.in:1.5
--- gnash/backend/Makefile.in:1.4 Tue Dec 27 00:05:03 2005
+++ gnash/backend/Makefile.in Tue Dec 27 00:45:59 2005
@@ -165,6 +165,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/configure
diff -u gnash/configure:1.6 gnash/configure:1.7
--- gnash/configure:1.6 Tue Dec 27 00:05:03 2005
+++ gnash/configure Tue Dec 27 00:45:59 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 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_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 PKG_CONFIG 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.
@@ -2183,16 +2183,72 @@
LIBXML_CFLAGS="-I$prefix/include"
fi
- echo "$as_me:$LINENO: checking for libxml" >&5
-echo $ECHO_N "checking for libxml... $ECHO_C" >&6
no_libxml=""
-
- if test "x$LIBXML_CFLAGS" = "x" ; then
- LIBXML_CFLAGS=`pkg-config --cflags libxml-2.0`
+ # Extract the first word of "pkg-config", so it can be a program name with
args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
+done
+done
- if test "x$LIBXML_LIBS" = "x" ; then
- LIBXML_LIBS=`pkg-config --libs libxml-2.0`
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ echo "$as_me:$LINENO: checking for libxml" >&5
+echo $ECHO_N "checking for libxml... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != "x" ; then
+ if test "x$LIBXML_CFLAGS" = "x" ; then
+ LIBXML_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0`
+ fi
+
+ if test "x$LIBXML_LIBS" = "x" ; then
+ LIBXML_LIBS=`$PKG_CONFIG --libs libxml-2.0`
+ fi
+ else
+ dirlist="/usr /usr/local /opt /home/latest"
+ for i in $dirlist; do
+ for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
+ if test -f $j/libxml/parser.h; then
+ LIBXML_CFLAGS=-I`(cd $j; pwd)`
+ break
+ fi
+ done
+ for j in `ls -dr $i/lib 2>/dev/null ` ; do
+ if test -f $j/libxml2.so; then
+ LIBXML_LIBS="-L`(cd $j; pwd)` -lxml2"
+ break
+ fi
+ done
+ done
fi
if test "x$LIBXML_CFLAGS" != "x" -a "x$LIBXML_LIBS" != "x"; then
@@ -8706,7 +8762,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8709 "configure"' > conftest.$ac_ext
+ echo '#line 8765 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9341,7 +9397,7 @@
# Provide some information about the compiler.
-echo "$as_me:9344:" \
+echo "$as_me:9400:" \
"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
@@ -10375,11 +10431,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10378: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10434: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10382: \$? = $ac_status" >&5
+ echo "$as_me:10438: \$? = $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
@@ -10608,11 +10664,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10611: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10667: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10615: \$? = $ac_status" >&5
+ echo "$as_me:10671: \$? = $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
@@ -10668,11 +10724,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10671: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10727: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10675: \$? = $ac_status" >&5
+ echo "$as_me:10731: \$? = $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
@@ -12002,7 +12058,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12005 "configure"' > conftest.$ac_ext
+ echo '#line 12061 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12873,7 +12929,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12876 "configure"
+#line 12932 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12971,7 +13027,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12974 "configure"
+#line 13030 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15150,11 +15206,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15153: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15209: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15157: \$? = $ac_status" >&5
+ echo "$as_me:15213: \$? = $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
@@ -15210,11 +15266,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15213: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15269: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15217: \$? = $ac_status" >&5
+ echo "$as_me:15273: \$? = $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
@@ -15721,7 +15777,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15724 "configure"' > conftest.$ac_ext
+ echo '#line 15780 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16592,7 +16648,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16595 "configure"
+#line 16651 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16690,7 +16746,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16693 "configure"
+#line 16749 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17517,11 +17573,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17576: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17524: \$? = $ac_status" >&5
+ echo "$as_me:17580: \$? = $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
@@ -17577,11 +17633,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17580: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17584: \$? = $ac_status" >&5
+ echo "$as_me:17640: \$? = $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
@@ -18891,7 +18947,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18894 "configure"' > conftest.$ac_ext
+ echo '#line 18950 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19632,11 +19688,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19635: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19639: \$? = $ac_status" >&5
+ echo "$as_me:19695: \$? = $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
@@ -19865,11 +19921,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19868: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19924: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19872: \$? = $ac_status" >&5
+ echo "$as_me:19928: \$? = $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
@@ -19925,11 +19981,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19928: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19984: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19932: \$? = $ac_status" >&5
+ echo "$as_me:19988: \$? = $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
@@ -21259,7 +21315,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 21262 "configure"' > conftest.$ac_ext
+ echo '#line 21318 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22130,7 +22186,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22133 "configure"
+#line 22189 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22228,7 +22284,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22231 "configure"
+#line 22287 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24048,6 +24104,7 @@
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s,@MAINT@,$MAINT,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
s,@XML_TRUE@,$XML_TRUE,;t t
Index: gnash/doc/C/Makefile.in
diff -u gnash/doc/C/Makefile.in:1.3 gnash/doc/C/Makefile.in:1.4
--- gnash/doc/C/Makefile.in:1.3 Tue Dec 27 00:05:03 2005
+++ gnash/doc/C/Makefile.in Tue Dec 27 00:45:59 2005
@@ -204,6 +204,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/doc/Makefile.in
diff -u gnash/doc/Makefile.in:1.3 gnash/doc/Makefile.in:1.4
--- gnash/doc/Makefile.in:1.3 Tue Dec 27 00:05:03 2005
+++ gnash/doc/Makefile.in Tue Dec 27 00:45:59 2005
@@ -150,6 +150,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/libbase/Makefile.in
diff -u gnash/libbase/Makefile.in:1.4 gnash/libbase/Makefile.in:1.5
--- gnash/libbase/Makefile.in:1.4 Tue Dec 27 00:05:03 2005
+++ gnash/libbase/Makefile.in Tue Dec 27 00:45:59 2005
@@ -184,6 +184,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/libgeometry/Makefile.in
diff -u gnash/libgeometry/Makefile.in:1.4 gnash/libgeometry/Makefile.in:1.5
--- gnash/libgeometry/Makefile.in:1.4 Tue Dec 27 00:05:03 2005
+++ gnash/libgeometry/Makefile.in Tue Dec 27 00:45:59 2005
@@ -173,6 +173,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.3 gnash/macros/libXML.m4:1.4
--- gnash/macros/libXML.m4:1.3 Tue Dec 27 00:05:03 2005
+++ gnash/macros/libXML.m4 Tue Dec 27 00:45:59 2005
@@ -41,15 +41,33 @@
LIBXML_CFLAGS="-I$prefix/include"
fi
- AC_MSG_CHECKING(for libxml)
no_libxml=""
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, , ,[$PATH])
+ AC_MSG_CHECKING(for libxml2)
+ if test "x$PKG_CONFIG" != "x" ; then
+ if test "x$LIBXML_CFLAGS" = "x" ; then
+ LIBXML_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0`
+ fi
- if test "x$LIBXML_CFLAGS" = "x" ; then
- LIBXML_CFLAGS=`pkg-config --cflags libxml-2.0`
- fi
-
- if test "x$LIBXML_LIBS" = "x" ; then
- LIBXML_LIBS=`pkg-config --libs libxml-2.0`
+ if test "x$LIBXML_LIBS" = "x" ; then
+ LIBXML_LIBS=`$PKG_CONFIG --libs libxml-2.0`
+ fi
+ else
+ dirlist="/usr /usr/local /opt /home/latest"
+ for i in $dirlist; do
+ for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
+ if test -f $j/libxml/parser.h; then
+ LIBXML_CFLAGS=-I`(cd $j; pwd)`
+ break
+ fi
+ done
+ for j in `ls -dr $i/lib 2>/dev/null ` ; do
+ if test -f $j/libxml2.so; then
+ LIBXML_LIBS="-L`(cd $j; pwd)` -lxml2"
+ break
+ fi
+ done
+ done
fi
if test "x$LIBXML_CFLAGS" != "x" -a "x$LIBXML_LIBS" != "x"; then
Index: gnash/plugin/Makefile.in
diff -u gnash/plugin/Makefile.in:1.3 gnash/plugin/Makefile.in:1.4
--- gnash/plugin/Makefile.in:1.3 Tue Dec 27 00:05:03 2005
+++ gnash/plugin/Makefile.in Tue Dec 27 00:45:59 2005
@@ -183,6 +183,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/plugin/mozilla-sdk/Makefile.in
diff -u gnash/plugin/mozilla-sdk/Makefile.in:1.4
gnash/plugin/mozilla-sdk/Makefile.in:1.5
--- gnash/plugin/mozilla-sdk/Makefile.in:1.4 Tue Dec 27 00:05:03 2005
+++ gnash/plugin/mozilla-sdk/Makefile.in Tue Dec 27 00:45:59 2005
@@ -176,6 +176,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/server/Makefile.in
diff -u gnash/server/Makefile.in:1.4 gnash/server/Makefile.in:1.5
--- gnash/server/Makefile.in:1.4 Tue Dec 27 00:05:03 2005
+++ gnash/server/Makefile.in Tue Dec 27 00:45:59 2005
@@ -175,6 +175,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
Index: gnash/utilities/Makefile.in
diff -u gnash/utilities/Makefile.in:1.3 gnash/utilities/Makefile.in:1.4
--- gnash/utilities/Makefile.in:1.3 Tue Dec 27 00:05:03 2005
+++ gnash/utilities/Makefile.in Tue Dec 27 00:45:59 2005
@@ -167,6 +167,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PLUGIN_FALSE = @PLUGIN_FALSE@
PLUGIN_TRUE = @PLUGIN_TRUE@
PNG_CFLAGS = @PNG_CFLAGS@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./Makefile.in ./configure bac...,
Rob Savoye <=