[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdenetwork/kopete/protocols
From:       Piotr Szymanski <djurban () linuxpl ! org>
Date:       2004-06-06 22:06:15
Message-ID: 20040606220615.D065A126EB () office ! kde ! org
[Download RAW message or body]

CVS commit by djurban: 

- backport
CCMAIL: 82944-done@bugs.kde.org


  M +5 -4      configure.in.in   1.16.2.3
  M +1 -1      gadu/libgadu/libgadu-config.h.in   1.1.2.2


--- kdenetwork/kopete/protocols/gadu/libgadu/libgadu-config.h.in  #1.1.2.1:1.1.2.2
@@ -26,5 +26,5 @@
 
 /* Include file containing uintXX_t declarations. */
-#include <stdint.h>
+#include <inttypes.h>
 
 #endif /* __GG_LIBGADU_CONFIG_H */

--- kdenetwork/kopete/protocols/configure.in.in  #1.16.2.2:1.16.2.3
@@ -3,5 +3,5 @@
 sed -e "s/#undef __GG_LIBGADU_$1/#define __GG_LIBGADU_$1/" \
 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > \
                ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
-mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
+mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 \
${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h  ])
          
@@ -68,5 +68,5 @@
         use_libgadu_copy=no
         ], [
-        if test "$LIBPTHREAD" != "" ; then
+        if test "$kde_use_threading" = "yes" ; then
         AC_MSG_RESULT([no, falling back on supplied libgadu-copy])
         use_libgadu_copy=yes
@@ -74,5 +74,5 @@
         else
         use_libgadu_copy=no
-        AC_MSG_RESULT([no, cannot fall back on libgadu-copy (no pthread)])
+        AC_MSG_RESULT([no, cannot fall back on libgadu-copy (no threads)])
         COMPILE_GADU=   
         use_libgadu_copy=no
@@ -87,5 +87,6 @@
 
 if test "$use_libgadu_copy" = "yes"; then
-        cp ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.in,}
+        cp ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.in \
+        ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
         if test "$ac_cv_c_bigendian" = "yes"; then
                 AC_LIBGADU_DEFINE([BIGENDIAN])  


[prev in list] [next in list] [prev in thread] [next in thread]