------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=111627
michael.larouche kdemail net changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|UNCONFIRMED |RESOLVED
Resolution| |FIXED
------- Additional Comments From michael.larouche kdemail net 2006-03-10 19:52
-------
SVN commit 517359 by mlarouche:
BUG: 111627
Use pkg-config to look for libidn.
M +8 -28 configure.in.in
M +3 -3 jabber/libiris/iris/xmpp-core/Makefile.am
--- branches/kopete/0.12/kopete/protocols/configure.in.in #517358:517359
@ -133,40 +133,20 @
[AC_LIBGADU_DEFINE([HAVE__VA_COPY])],[])
fi
-
-AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=DIR],
- [Support IDN (needs GNU Libidn)]),
- libidn=$withval, libidn=yes)
-
-if test "$libidn" != "no"; then
- if test "$libidn" != "yes"; then
- IDN_LDFLAGS="${LDFLAGS} -L$libidn/lib"
- IDN_CPPFLAGS="${CPPFLAGS} -I$libidn/include"
- fi
-fi
-
-KDE_CHECK_HEADER(idna.h,, libidn=no)
-
-if test "$libidn" != "no" ; then
- KDE_CHECK_LIB(idn, stringprep_check_version,
- [libidn=yes; IDN_LIBS="-lidn"], libidn=no)
-fi
-
-if test "$libidn" != "no" ; then
- AC_DEFINE(LIBIDN, 1, [Define to 1 if you want IDN support.])
-else
+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])
+else
+ AC_DEFINE(LIBIDN, 1, [Define to 1 if you want IDN support.])
fi
+AC_SUBST(IDN_CFLAGS)
+AC_SUBST(IDN_LIBS)
AC_MSG_CHECKING([if Libidn can be used])
-AC_MSG_RESULT($libidn)
+AC_MSG_RESULT($have_libidn)
-AM_CONDITIONAL(include_jabber, test "$libidn" = "yes")
+AM_CONDITIONAL(include_jabber, test "$have_libidn" = "yes")
-AC_SUBST(IDN_LDFLAGS)
-AC_SUBST(IDN_CPPFLAGS)
-AC_SUBST(IDN_LIBS)
-
# Sametime support
# lower and upper-bound versions of Meanwhile library
---
branches/kopete/0.12/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am
#517358:517359
@ -3,11 +3,11 @
METASOURCES = ignore_this_warning.moc
noinst_LTLIBRARIES = libiris_xmpp_core.la
-AM_CPPFLAGS = $(IDN_CPPFLAGS)
+AM_CPPFLAGS = $(IDN_CFLAGS)
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../xmpp-core
-I$(srcdir)/../xmpp-im -I$(srcdir)/../../cutestuff/util
-I$(srcdir)/../../cutestuff/network -I$(srcdir)/../../qca/src $(all_includes)
-libiris_xmpp_core_la_CPPFLAGS = $(IDN_CPPFLAGS)
-libiris_xmpp_core_la_LDFLAGS = $(IDN_LDFLAGS) $(IDN_LIBS)
+libiris_xmpp_core_la_CPPFLAGS = $(IDN_CFLAGS)
+libiris_xmpp_core_la_LDFLAGS = $(IDN_LIBS)
libiris_xmpp_core_la_SOURCES = \
connector.cpp \
jid.cpp \
_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel
