summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/configure.in.in
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 05:27:10 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 05:27:10 +0000
commit4721accb32717dd310ae2abbeca266360c7720d3 (patch)
tree293c18dfc60d31af4c888f6b45609323d071cc75 /kopete/protocols/configure.in.in
parent1e22120bb373a2cc274a8494b614577168241102 (diff)
downloadtdenetwork-4721accb32717dd310ae2abbeca266360c7720d3.tar.gz
tdenetwork-4721accb32717dd310ae2abbeca266360c7720d3.zip
Fix kdenetwork Qt3 FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237929 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/configure.in.in')
-rw-r--r--kopete/protocols/configure.in.in110
1 files changed, 3 insertions, 107 deletions
diff --git a/kopete/protocols/configure.in.in b/kopete/protocols/configure.in.in
index 05da3ea5..0008f19e 100644
--- a/kopete/protocols/configure.in.in
+++ b/kopete/protocols/configure.in.in
@@ -24,78 +24,9 @@ if test "$ac_libgadu_libs" != "" ; then
LIBGG_LIBS="-L$ac_libgadu_libs"
fi
-if test "x$with_external_libgadu" != xno; then
- ac_save_LIBS="$LIBS"
- ac_save_CFLAGS="$CFLAGS"
- LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
- CFLAGS="$CFLAGS $LIBGG_INCLUDES"
- AC_MSG_CHECKING([libgadu version 1.5(rcX) with pthread support])
- AC_TRY_RUN(
- [
-
- #include <libgadu.h>
- #include <stdio.h>
- #include <string.h>
-
- int main()
- {
-#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
- int maj, min, date, items;
- const char *libgadu_version = gg_libgadu_version();
-
- items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
-
- if ( items != 3 ) { /* version in YYYYDDMM format only */
- sscanf( libgadu_version, "%u", &date );
-
- if ( date < 20040520 )
- return 1;
- else
- return 0;
- }
-
- if ( maj != 1 ) {
- return 1;
- }
- if ( ( min == 4 || min == 5 ) && date < 20040520 ) {
- return 1;
- }
-
- if ( min == 5 || min == 6 ){
- return 0;
- }
-
-#endif
- return 1;
- }
- ], [
- LIBGG_LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
- AC_MSG_RESULT([yes])
- COMPILE_GADU=true
- use_libgadu_copy=
- ], [
- AC_MSG_RESULT([no])
- ])
- LIBS="$ac_save_LIBS"
- CFLAGS="$ac_save_CFLAGS"
-
- if test "x$with_external_libgadu" != xcheck && test -z "$COMPILE_GADU"; then
- AC_MSG_ERROR([--with-external-libgadu was given, but test for libgadu failed])
- fi
-fi
-
-if test -z "$COMPILE_GADU"; then
- AC_MSG_CHECKING([if supplied libgadu-copy can be used])
- if test "$kde_use_threading" = "yes"; then
- AC_MSG_RESULT([yes])
- use_libgadu_copy=yes
- COMPILE_GADU=true
- else
- AC_MSG_RESULT([no (no pthread), support for Gadu-Gadu will be disabled])
- use_libgadu_copy=
- COMPILE_GADU=
- fi
-fi
+dnl This may need a test still for compatibility
+COMPILE_GADU=true
+use_libgadu_copy=
AC_SUBST(LIBGG_INCLUDES)
AC_SUBST(LIBGG_LIBS)
@@ -103,41 +34,6 @@ AC_SUBST(COMPILE_GADU)
AM_CONDITIONAL(include_gadu, test -n "$COMPILE_GADU")
AM_CONDITIONAL(include_libggcopy, test -n "$use_libgadu_copy")
-if test "$use_libgadu_copy" = "yes"; then
- AM_CONFIG_HEADER(kopete/protocols/gadu/libgadu/libgadu-config.h)
-
- if test "$ac_cv_c_bigendian" = "yes"; then
- AC_DEFINE_UNQUOTED([__GG_LIBGADU_BIGENDIAN], 1, [Define if big endian])
- fi
- KDE_CHECK_LONG_LONG()
- if test "$kde_cv_c_long_long" = "yes"; then
- AC_DEFINE_UNQUOTED([__GG_LIBGADU_HAVE_LONG_LONG], 1, [long long support])
- fi
- KDE_CHECK_SSL()
- if test "$have_ssl" = "yes"; then
- AC_DEFINE_UNQUOTED([__GG_LIBGADU_HAVE_OPENSSL], 1, [Define if SSL support is available])
- 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_DEFINE_UNQUOTED([__GG_LIBGADU_HAVE_C99_VSNPRINTF], 1, [C99 vsnprintf() available])
- ], [
- AC_MSG_RESULT([no])
- ])
- AC_CHECK_FUNCS([va_copy],
- [AC_DEFINE_UNQUOTED([__GG_LIBGADU_HAVE_VA_COPY], 1, [va_copy])],[])
- AC_CHECK_FUNCS([_va_copy],
- [AC_DEFINE_UNQUOTED([__GG_LIBGADU_HAVE__VA_COPY], 1, [__va_copy])],[])
-fi
-
KDE_PKG_CHECK_MODULES(IDN, libidn, have_libidn=yes, have_libidn=no)
if test x$have_libidn = xno; then
AC_MSG_WARN([Libidn not found, Kopete Jabber plugin will not be compiled])