[Gnash-commit] gnash ChangeLog configure configure.ac

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     05/12/25 20:38:42

Modified files:
        .              : ChangeLog configure configure.ac 

Log message:
        * configure.ac: Fix the --disable-xml option so it actually works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.7 gnash/ChangeLog:1.8
--- gnash/ChangeLog:1.7 Thu Dec 22 05:11:47 2005
+++ gnash/ChangeLog     Sun Dec 25 20:38:42 2005
@@ -1,3 +1,8 @@
+2005-12-25  Rob Savoye  <address@hidden>
+
+       * configure.ac: Fix the --disable-xml option so it actually
+       works.
+
 2005-12-21  Rob Savoye  <address@hidden>
 
        * macros/firefox.m4: Move enable test to here. If firefox-config
Index: gnash/configure
diff -u gnash/configure:1.4 gnash/configure:1.5
--- gnash/configure:1.4 Thu Dec 22 05:11:47 2005
+++ gnash/configure     Sun Dec 25 20:38:42 2005
@@ -1053,7 +1053,7 @@
 Optional Packages:
   --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=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-docbook          specify the path to the Docbook
@@ -2141,12 +2141,7 @@
   disablexml=no
 fi;
 
-if test x$disable_xml != xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML
-_ACEOF
-
+if test x$enable_xml != xno; then
 
 # Check whether --with-libxml or --without-libxml was given.
 if test "${with_libxml+set}" = set; then
@@ -8703,7 +8698,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8706 "configure"' > conftest.$ac_ext
+  echo '#line 8701 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9338,7 +9333,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:9341:" \
+echo "$as_me:9336:" \
      "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
@@ -10372,11 +10367,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10375: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10370: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10379: \$? = $ac_status" >&5
+   echo "$as_me:10374: \$? = $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
@@ -10605,11 +10600,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10603: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10612: \$? = $ac_status" >&5
+   echo "$as_me:10607: \$? = $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
@@ -10665,11 +10660,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10668: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10663: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10672: \$? = $ac_status" >&5
+   echo "$as_me:10667: \$? = $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
@@ -11999,7 +11994,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12002 "configure"' > conftest.$ac_ext
+    echo '#line 11997 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12870,7 +12865,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12873 "configure"
+#line 12868 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12968,7 +12963,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12971 "configure"
+#line 12966 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15147,11 +15142,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15150: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15145: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15154: \$? = $ac_status" >&5
+   echo "$as_me:15149: \$? = $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
@@ -15207,11 +15202,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15210: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15205: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15214: \$? = $ac_status" >&5
+   echo "$as_me:15209: \$? = $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
@@ -15718,7 +15713,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15721 "configure"' > conftest.$ac_ext
+    echo '#line 15716 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -16589,7 +16584,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16592 "configure"
+#line 16587 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16687,7 +16682,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16690 "configure"
+#line 16685 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17514,11 +17509,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17517: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17512: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17521: \$? = $ac_status" >&5
+   echo "$as_me:17516: \$? = $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
@@ -17574,11 +17569,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17577: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17572: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17581: \$? = $ac_status" >&5
+   echo "$as_me:17576: \$? = $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
@@ -18888,7 +18883,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 18891 "configure"' > conftest.$ac_ext
+    echo '#line 18886 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -19629,11 +19624,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19632: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19627: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19636: \$? = $ac_status" >&5
+   echo "$as_me:19631: \$? = $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
@@ -19862,11 +19857,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19865: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19860: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19869: \$? = $ac_status" >&5
+   echo "$as_me:19864: \$? = $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
@@ -19922,11 +19917,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19925: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19920: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19929: \$? = $ac_status" >&5
+   echo "$as_me:19924: \$? = $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
@@ -21256,7 +21251,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 21259 "configure"' > conftest.$ac_ext
+    echo '#line 21254 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -22127,7 +22122,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 22130 "configure"
+#line 22125 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -22225,7 +22220,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 22228 "configure"
+#line 22223 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -24860,7 +24855,7 @@
   echo "        Not using DMalloc"
 fi
 
-if test x"$disablexml" = x"yes"; then
+if test x$enable_xml = xno; then
   echo "        Not using XML or XMLSocket"
 else
   echo "        Adding XML and XMLSocket"
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.4 gnash/configure.ac:1.5
--- gnash/configure.ac:1.4      Thu Dec 22 04:56:55 2005
+++ gnash/configure.ac  Sun Dec 25 20:38:42 2005
@@ -48,8 +48,7 @@
   *)   AC_MSG_ERROR([bad value ${enableval} for disable-xml option]) ;;
 esac],disablexml=no)
 
-if test x$disable_xml != xno; then
-    AC_DEFINE([HAVE_LIBXML], [], [Use XML])
+if test x$enable_xml != xno; then
     AM_PATH_LIBXML2
 fi
 
@@ -223,7 +222,7 @@
   echo "        Not using DMalloc"
 fi
 
-if test x"$disablexml" = x"yes"; then
+if test x$enable_xml = xno; then
   echo "        Not using XML or XMLSocket"
 else
   echo "        Adding XML and XMLSocket"