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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols [POSSIBLY UNSAFE]
From:       Piotr Szymanski <djurban () linuxpl ! org>
Date:       2004-05-24 16:05:26
Message-ID: 20040524160526.1FD161265C () office ! kde ! org
[Download RAW message or body]

CVS commit by djurban: 

- imporint libgadu 1.5rc2 sources to be used in case no system libgadu is found


  A            gadu/libgadu/COPYING   1.1
  A            gadu/libgadu/Makefile.am   1.1
  A            gadu/libgadu/common.c   1.1 [POSSIBLY UNSAFE: printf] [LGPL (wrong address)]
  A            gadu/libgadu/compat.h   1.1 [LGPL (wrong address)]
  A            gadu/libgadu/dcc.c   1.1 [LGPL (wrong address)]
  A            gadu/libgadu/events.c   1.1 [POSSIBLY UNSAFE: printf] [LGPL (wrong address)]
  A            gadu/libgadu/http.c   1.1 [POSSIBLY UNSAFE: printf] [LGPL (wrong address)]
  A            gadu/libgadu/libgadu-config.h   1.1 [no copyright]
  A            gadu/libgadu/libgadu-config.h.in   1.1
  A            gadu/libgadu/libgadu.c   1.1 [LGPL (wrong address)]
  A            gadu/libgadu/libgadu.h   1.1 [POSSIBLY UNSAFE: printf] [LGPL (wrong address)]
  A            gadu/libgadu/obsolete.c   1.1 [LGPL (wrong address)]
  A            gadu/libgadu/pubdir.c   1.1 [POSSIBLY UNSAFE: printf,scanf] [LGPL (wrong address)]
  A            gadu/libgadu/pubdir50.c   1.1 [LGPL (wrong address)]
  M +56 -3     configure.in.in   1.20
  M +9 -1      gadu/Makefile.am   1.23


--- kdenetwork/kopete/protocols/configure.in.in  #1.19:1.20
@@ -1,2 +1,9 @@
+AC_DEFUN([AC_LIBGADU_DEFINE],
+[
+sed -e "s/#undef __GG_LIBGADU_$1/#define __GG_LIBGADU_$1/" \
+kopete/protocols/gadu/libgadu/libgadu-config.h > kopete/protocols/gadu/libgadu/libgadu-config.h.1
+mv kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
+])
+         
 LIBGG_INCLUDES=""
 LIBGG_LIBS=""
@@ -59,13 +66,59 @@
         COMPILE_GADU=true
         AC_SUBST(COMPILE_GADU)
+        use_libgadu_copy=no
         ], [
-        AC_MSG_RESULT([no])
-        COMPILE_GADU=
-        AC_SUBST(COMPILE_GADU)
+        if test "$LIBPTHREAD" != "" ; then
+        AC_MSG_RESULT([no, falling back on supplied libgadu-copy])
+        use_libgadu_copy=yes
+        COMPILE_GADU=true
+        else
+        use_libgadu_copy=no
+        AC_MSG_RESULT([no, cannot fall back on libgadu-copy (no pthread)])
+        COMPILE_GADU=   
+        use_libgadu_copy=no
+        fi
+        AC_SUBST(COMPILE_GADU)  
         ])
 AM_CONDITIONAL(include_gadu, test -n "$COMPILE_GADU")
+AM_CONDITIONAL(include_libggcopy, test -n "$use_libgadu_copy")
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
 
+
+if test "$use_libgadu_copy" = "yes"; then
+        cp kopete/protocols/gadu/libgadu/libgadu-config.h{.in,}
+        if test "$ac_cv_c_bigendian" = "yes"; then
+                AC_LIBGADU_DEFINE([BIGENDIAN])  
+        fi
+        KDE_CHECK_LONG_LONG()
+        if test "$kde_cv_c_long_long" = "yes"; then
+        AC_LIBGADU_DEFINE([HAVE_LONG_LONG])
+        fi
+        KDE_CHECK_SSL()
+        if test  "$have_ssl" = "yes"; then
+        AC_LIBGADU_DEFINE([HAVE_OPENSSL])
+        fi
+        AC_MSG_CHECKING([for C99-compatible vsnprintf()])
+        AC_TRY_RUN(
+        [
+                #include <stdio.h>
+                int main()
+                {
+                        char tmp;
+                        return (snprintf(&tmp, sizeof(tmp), "test") != 4);
+                }
+        ],[
+                AC_MSG_RESULT([yes])
+                AC_LIBGADU_DEFINE([HAVE_C99_VSNPRINTF])
+        ], [
+                 AC_MSG_RESULT([no])
+        ])
+        AC_CHECK_FUNCS([va_copy],
+                       [AC_LIBGADU_DEFINE([HAVE_VA_COPY])],[])
+        AC_CHECK_FUNCS([_va_copy],
+                       [AC_LIBGADU_DEFINE([HAVE__VA_COPY])],[])
+fi
+
+
 AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
             [Support IDN (needs GNU Libidn)]),

--- kdenetwork/kopete/protocols/gadu/Makefile.am  #1.22:1.23
@@ -1,4 +1,12 @@
 METASOURCES = AUTO
-SUBDIRS = ui icons
+if include_libggcopy
+LIBGADU_COPY=libgadu
+LIBGG_INCLUDES=-I./libgadu
+LIBGG_LIBS=$(top_builddir)/kopete/protocols/gadu/libgadu/libgadu_copy.la \
+           $(LIBPTHREAD)
+endif
+
+
+SUBDIRS = ui icons $(LIBGADU_COPY)
 AM_CPPFLAGS = -I$(srcdir)/ui \
         -I./ui \


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