[Gnash-commit] gnash ./ChangeLog macros/docbook.m4 macros/kde....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/03/04 16:32:24

Modified files:
        .              : ChangeLog 
        macros         : docbook.m4 kde.m4 libXML.m4 pthreads.m4 

Log message:
        * macros/docbook.m4: Patch from Pavekl Roskin <address@hidden>, to
        fix configure test error.
        * macros/libXML.m4: Patch from Pavekl Roskin <address@hidden>, to
        correctly use xml2-config, instead of pkg-config.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.171&tr2=1.172&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/kde.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pthreads.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.171 gnash/ChangeLog:1.172
--- gnash/ChangeLog:1.171       Sat Mar  4 15:56:51 2006
+++ gnash/ChangeLog     Sat Mar  4 16:32:24 2006
@@ -1,5 +1,10 @@
 2006-03-04  Rob Savoye  <address@hidden>
 
+       * macros/docbook.m4: Patch from Pavekl Roskin <address@hidden>, to
+       fix configure test error.
+       * macros/libXML.m4: Patch from Pavekl Roskin <address@hidden>, to
+       correctly use xml2-config, instead of pkg-config.
+
        * plugin/player.cpp: Define NO_NSPR_10_SUPPORT so we don't have
        header file typedef conflicts. We don't care about the older NSPR
        10 anyway...
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.11 gnash/macros/docbook.m4:1.12
--- gnash/macros/docbook.m4:1.11        Tue Feb 28 15:25:41 2006
+++ gnash/macros/docbook.m4     Sat Mar  4 16:32:24 2006
@@ -123,7 +123,7 @@
     AC_SUBST(DB2X_VERSION)
   fi
 
-  AM_CONDITIONAL(NEW_DOCBOOK2X, [test $db2x_version = "0.8.5"])
+  AM_CONDITIONAL(NEW_DOCBOOK2X, [test "$db2x_version" = "0.8.5"])
   AC_SUBST(docbook_styles)
 ])
 
Index: gnash/macros/kde.m4
diff -u gnash/macros/kde.m4:1.1 gnash/macros/kde.m4:1.2
--- gnash/macros/kde.m4:1.1     Sat Mar  4 04:52:24 2006
+++ gnash/macros/kde.m4 Sat Mar  4 16:32:24 2006
@@ -1612,15 +1612,7 @@
 
 AC_MSG_RESULT([$kde_cv_uic_plugins])
 if test "$kde_cv_uic_plugins" != yes; then
-       AC_MSG_ERROR([
-you need to install kdelibs first.
-
-If you did install kdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs. 
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
-_same Qt version_, compiled with the _same compiler_ and the same Qt
-configuration settings.
-])
+       AC_MSG_NOTICE([you need to install kdelibs first.])
 fi
 fi
 ])
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.12 gnash/macros/libXML.m4:1.13
--- gnash/macros/libXML.m4:1.12 Fri Feb 24 00:06:21 2006
+++ gnash/macros/libXML.m4      Sat Mar  4 16:32:24 2006
@@ -38,17 +38,17 @@
   fi
 
   dnl
-  dnl Give pkg-config a chance
+  dnl Give xml2-config a chance
   dnl
   #no_libxml=""
-  AC_PATH_PROG(PKG_CONFIG, xml2-config, , ,[$PATH])
-  if test "x$PKG_CONFIG" != "x" ; then
+  AC_PATH_PROG(XML2_CONFIG, xml2-config, , ,[$PATH])
+  if test "x$XML2_CONFIG" != "x" ; then
     if test "x$LIBXML_CFLAGS" = "x" ; then
-      LIBXML_CFLAGS=`$PKG_CONFIG --cflags`
+      LIBXML_CFLAGS=`$XML2_CONFIG --cflags`
     fi
 
     if test "x$LIBXML_LIBS" = "x" ; then
-      LIBXML_LIBS=`$PKG_CONFIG --libs`
+      LIBXML_LIBS=`$XML2_CONFIG --libs`
     fi
   else
     AC_MSG_RESULT(no)
Index: gnash/macros/pthreads.m4
diff -u gnash/macros/pthreads.m4:1.5 gnash/macros/pthreads.m4:1.6
--- gnash/macros/pthreads.m4:1.5        Sun Feb 26 15:49:30 2006
+++ gnash/macros/pthreads.m4    Sat Mar  4 16:32:24 2006
@@ -39,22 +39,16 @@
 
     dnl If the path hasn't been specified, go look for it.
     if test x"${ac_cv_path_pthread_incl}" = x; then
-      AC_CHECK_HEADERS(pthread.h, [ac_cv_path_pthread_incl=""], [
+      AC_CHECK_HEADERS(pthread.h, [AC_DEFINE([HAVE_PTHREAD_H], [], [Has POSIX 
Thread header])], [
       if test x"${ac_cv_path_pthread_incl}" = x; then
         AC_MSG_CHECKING([for libpthread header])
         incllist="${prefix}/include /sw/include  /usr/pkg/pthreads/include 
/usr/local/include /home/latest/include /opt/include /usr/include .. ../.."
         for i in $incllist; do
          if test -f $i/pthreads/pthread.h -o -f $i/pthread.h; then
-           if test x"$i" != x"/usr/include"; then
-             ac_cv_path_pthread_incl="$i"
-             break
-            else
-             ac_cv_path_pthread_incl=""
-             break
-           fi
+            ac_cv_path_pthread_incl="$i"
          fi
         done
-      fi], [INCLUDES = -I/usr/pkg/pthreads/include])
+      fi], [INCLUDES = -I/usr/pkg/pthreads/include -I/usr/include])
     else
       AC_MSG_RESULT(${ac_cv_path_pthread_incl})
       if test x"${ac_cv_path_pthread_incl}" != x"/usr/include"; then
@@ -65,14 +59,17 @@
     fi
 
     if test x"${ac_cv_path_pthread_incl}" != x ; then
-      PTHREAD_CFLAGS="-I${ac_cv_path_pthread_incl}"
       AC_MSG_RESULT(yes)
-    else
-      PTHREAD_CFLAGS=""
+      AC_DEFINE([HAVE_PTHREAD_H], [], [Has POSIX Thread header])
+      if test x"$i" != x"/usr/include"; then
+        PTHREAD_CFLAGS="-I${ac_cv_path_pthread_incl}"
+      else
+        PTHREAD_CFLAGS=""
+      fi
     fi
 
       dnl Look for the library
-      AC_ARG_WITH(pthread_lib, [  --with-pthread-lib     directory where 
pthreads library is], with_pthread_lib=${withval})
+    AC_ARG_WITH(pthread_lib, [  --with-pthread-lib     directory where 
pthreads library is], with_pthread_lib=${withval})
       AC_CACHE_VAL(ac_cv_path_pthread_lib,[
       if test x"${with_pthread_lib}" != x ; then
         if test -f ${with_pthread_lib}/libpthread.a -o -f 
${with_pthread_lib}/libpthread.so; then