Navigation

← Previous Changeset
Next Changeset →

Changeset 2836

Timestamp:

11/22/09 14:44:45 (10 months ago)

Author:

kuhlmann

Message:

* use our libiksemel copy if no suitable version is found * remove BETA markers for XMPP * enable XMPP by default (not: auto; as too many distributions had it disabled)

Files:

climm/build-aux/compile (added)
climm/build-aux/prepare (modified) (1 diff)
climm/configure.ac (modified) (8 diffs)
climm/iksemel-1.4/include/common.h (added)
climm/iksemel-1.4/include/finetune.h (added)
climm/src/Makefile.am (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

climm/build-aux/prepare

r2687	r2836
1	1	#!/bin/sh -e
2	2
3		aclocal-1.10 -I m4 && \
	3	aclocal-1.11 -I m4 && \
4	4	(autoheader \|\| autoheader-2.50) && \
5		automake-1.10 -ac && \
	5	automake-1.11 -ac && \
6	6	(autoconf \|\| autoconf-2.50) && \
7	7	echo "Maintainer scripts ran fine." \|\| \

climm/configure.ac

r2826	r2836
45	45	AC_ARG_ENABLE([remote], AC_HELP_STRING([--disable-remote], [disable scripting FIFO]),
46	46	ac_arg_use_remote=$enableval, ac_arg_use_remote=auto)
47		AC_ARG_ENABLE([xmpp], AC_HELP_STRING([--~~enable-xmpp], [enable XMPP (Jabber) chat network using libiksemel (BETA)~~]),
48		ac_arg_use_xmpp=$enableval, ac_arg_use_xmpp=~~auto~~)
	47	AC_ARG_ENABLE([xmpp], AC_HELP_STRING([--disable-xmpp], [disable XMPP (Jabber) chat network using libiksemel]),
	48	ac_arg_use_xmpp=$enableval, ac_arg_use_xmpp=yes)
49	49	dnl AC_ARG_ENABLE([msn], AC_HELP_STRING([--enable-msn], [enable MSN chat network (NOT YET IMPLEMENTED)]),
50	50	dnl ac_arg_use_msn=$enableval, ac_arg_use_msn=auto)
…	…
71	71	# Checks for header files.
72	72	AC_HEADER_STDC
73		AC_CHECK_HEADERS([locale.h langinfo.h sys/select.h arpa/inet.h ctype.h errno.h fcntl.h limits.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h sys/wait.h termios.h unistd.h sys/utsname.h sys/un.h wchar.h wctype.h pwd.h utmp.h utmpx.h values.h resolv.h arpa/nameser.h])
	73	AC_CHECK_HEADERS([locale.h langinfo.h sys/select.h arpa/inet.h ctype.h errno.h fcntl.h limits.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h sys/wait.h termios.h unistd.h strings.h sys/utsname.h sys/un.h wchar.h wctype.h pwd.h utmp.h utmpx.h values.h resolv.h arpa/nameser.h])
74	74
75	75	if test "x$ac_arg_use_autopackage" = xyes; then
…	…
108	108	AC_CHECK_FUNC(gnutls_dh_params_generate2, [AC_DEFINE(HAVE_DH_GENPARAM2, 1, [Whether new DH prime generator is available])],)
109	109	LIBS="$temp_LIBS"
	110	AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
110	111	fi
111	112	fi
…	…
380	381
381	382	if test "x$ac_arg_use_ssl" != "xgnutls" && test "x$ac_arg_use_ssl" != "xgnutls+openssl"; then
382		AC_MSG_CHECKING([XMPP])
383		AC_MSG_RESULT([no, GnuTLS missing])
384		ac_use_xmpp=no
	383	if test "x$ac_arg_use_xmpp" = xyes; then
	384	AC_MSG_CHECKING([XMPP])
	385	AC_MSG_FAILURE([no, GnuTLS missing])
	386	else
	387	AC_MSG_CHECKING([XMPP])
	388	AC_MSG_RESULT([no, GnuTLS missing])
	389	ac_use_xmpp=no
	390	fi
385	391	fi
386	392
…	…
388	394	PKG_CHECK_MODULES(IKS, iksemel, ac_iksemel_version=`pkg-config --modversion iksemel \| tr . " "`
389	395	ac_iksemel_version=`printf 0x%02x%02x $ac_iksemel_version`, ac_use_xmpp=no)
390		fi
391
392		if test "x$ac_arg_use_xmpp" = xyes; then
	396
393	397	if test "x$ac_use_xmpp" = xno; then
394		AC_MSG_FAILURE([cannot find XMPP library libiksemel])
395		fi
396		if test "1${ac_iksemel_version#??}" -lt 10102; then
397		AC_MSG_FAILURE([cannot find XMPP library libiksemel version 1.3 or newer, found: $ac_iksemel_version])
398		fi
399		fi
400		if test "1${ac_iksemel_version#??}" -lt 10102; then
401		AC_MSG_WARN([cannot find XMPP library libiksemel version 1.3 or newer, found: $ac_iksemel_version])
402		ac_use_xmpp=no
	398	AC_MSG_RESULT([no, using replacement])
	399	fi
	400
	401	if test "x$ac_use_xmpp" = xno \|\| test "1${ac_iksemel_version#??}" -lt 10102 \|\| test "x$ac_arg_use_autopackage" = xyes; then
	402	# use our version of iksemel
	403	AC_SUBST(IKS_INC, ['-I$(top_srcdir)/iksemel-1.4/include'])
	404	AC_SUBST(IKS_LIBS, libiksemel.a)
	405	ac_iksemel_version=0x0104
	406	ac_use_xmpp=yes
	407	fi
403	408	fi
404	409
…	…
442	447	# Checks for typedefs, structures, and compiler characteristics.
443	448	AC_C_CONST
	449	AC_C_INLINE
444	450	AC_TYPE_SIZE_T
445	451	AC_HEADER_TIME
…	…
627	633
628	634	if test "x$ac_use_autopackage" = xyes; then
629		relay_libs="tcl8.4 tcl8.3 gnutls gcrypt gpg-error ~~gloox~~ otr iksemel"
	635	relay_libs="tcl8.4 tcl8.3 gnutls gcrypt gpg-error otr iksemel"
630	636	LIBS='`'"$RELAYTOOL --relay '$relay_libs' $LIBS"'`'
631	637	LIBGCRYPT_LIBS='`'"$RELAYTOOL --relay '$relay_libs' $LIBGCRYPT_LIBS"'`'
…	…
637	643	fi
638	644
639		AC_MSG_CHECKING([whether to enable XMPP chat network ~~(BETA)~~])
	645	AC_MSG_CHECKING([whether to enable XMPP chat network])
640	646	AC_MSG_RESULT([$ac_arg_use_xmpp])
641	647	dnl AC_MSG_CHECKING([whether to enable MSN chat network (EXPERIMENTAL BROKEN INCOMPLETE)])

climm/src/Makefile.am

r2784	r2836
11	11	bin_PROGRAMS = climm # icqsyn icqprx
12	12	EXTRA_PROGRAMS = icqprx icqsyn
	13	EXTRA_LIBRARIES = libiksemel.a
13	14
14		AM_CFLAGS = -DPKGDATADIR='"$(pkgdatadir)"' -I$(top_srcdir)/include
15		AM_CXXFLAGS = -DPKGDATADIR='"$(pkgdatadir)"' -I$(top_srcdir)/include
	15	AM_CFLAGS = -DPKGDATADIR='"$(pkgdatadir)"' -I$(top_srcdir)/include @IKS_INC@
	16	AM_CXXFLAGS = -DPKGDATADIR='"$(pkgdatadir)"' -I$(top_srcdir)/include @IKS_INC@
16	17
17	18	climm_SOURCES = autopackage_prefix.c conv.c file_util.c im_response.c climm.c \
…	…
31	32
32	33	climm_LDADD = @LIBOBJS@ @LIBICONV@ @LIBOTR_LIBS@ @LIBGNUTLS_LIBS@ @LIBGCRYPT_LIBS@ @LIBTCL_LIBS@ @BINRELOC_LIBS@ @IKS_LIBS@
	34
	35	libiksemel_a_SOURCES = ../iksemel-1.4/src/base64.c ../iksemel-1.4/src/dom.c \
	36	../iksemel-1.4/src/filter.c ../iksemel-1.4/src/iks.c \
	37	../iksemel-1.4/src/ikstack.c \
	38	../iksemel-1.4/src/jabber.c ../iksemel-1.4/src/md5.c \
	39	../iksemel-1.4/src/sax.c ../iksemel-1.4/src/sha.c \
	40	../iksemel-1.4/src/stream.c ../iksemel-1.4/src/utility.c
33	41
34	42	$(climm_SOURCES): @LIBOBJS@