Changeset 592

Show
Ignore:
Timestamp:
02/23/05 18:18:47 (4 years ago)
Author:
jajcus
Message:

- now libgadu is included in the jggtrans source tree, so we don't depend on strange and not-working-well-with-jggtrans libgadu builds in distributions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile.am

    r581 r592  
    11 
    2 SUBDIRS = libxode src po 
     2SUBDIRS = libxode libgadu src po 
    33 
    44.PHONY: cosmetics ChangeLog 

  • trunk/autogen.sh

    r563 r592  
    11#!/bin/sh 
    22 
     3set -x 
     4 
    35( cd libxode ; ./autogen.sh ) || exit 1 
     6( cd libgadu ; ./autogen.sh ) || exit 1 
    47 
    58libtoolize --force || exit $? 

  • trunk/configure.ac

    r586 r592  
    11# Process this file with autoconf to produce a configure script. 
    2 AC_INIT([jabber-gg-transport], [2.1.0+svn], [jajcus@bnet.pl]) 
     2AC_INIT([jabber-gg-transport], [2.1.99+svn], [jajcus@bnet.pl]) 
    33 
    44AC_CONFIG_SRCDIR([src/ggtrans.h]) 
    …… 
    1818AM_PATH_GLIB_2_0([2.0.0],[],AC_MSG_ERROR("You need glib >= 2.0.0 to compile this.")) 
    1919PKG_CHECK_MODULES([JK_LIBIDN], [libidn >= 0.3.0]) 
    20  
    21 AC_ARG_WITH([libgadu-snapshot],AC_HELP_STRING([--with-libgadu-snapshot],[Try to compile and link with some libgadu snapshot])) 
    22 if test "x$with_libgadu_snapshot" = "xyes" ; then 
    23 PKG_CHECK_MODULES([JK_LIBGADU], [libgadu >= 20031008]) 
    24 else 
    25 PKG_CHECK_MODULES([JK_LIBGADU], [libgadu >= 1.4 libgadu < 20000000]) 
    26 fi 
    27  
    28 AC_SUBST(JK_LIBGADU_LIBS) 
    29 AC_SUBST(JK_LIBGADU_CFLAGS) 
    3020 
    3121AC_SUBST(JK_LIBIDN_LIBS) 
    …… 
    6959AC_CHECK_FUNCS([memset strchr],[],AC_MSG_ERROR("Some functions needed are missing")) 
    7060 
    71 AC_CONFIG_SUBDIRS([libxode]) 
     61AC_CONFIG_SUBDIRS([libxode libgadu]) 
    7262 
    7363MKINSTALLDIRS="${MKINSTALLDIRS} -m 755"