--- a/.gitignore Tue Apr 24 14:02:14 2012 -0700
+++ b/.gitignore Thu Nov 15 00:55:07 2012 -0800
@@ -27,3 +27,4 @@
*.spec
*.tar.gz
*.tar.bz2
+*~
--- a/autogen.sh Tue Apr 24 14:02:14 2012 -0700
+++ b/autogen.sh Thu Nov 15 00:55:07 2012 -0800
@@ -4,5 +4,31 @@
: ${AUTORECONF=autoreconf}
: ${GTKDOCIZE=gtkdocize}
+if [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ]; then
+ echo "./autogen.sh [-g]"
+ echo
+ echo " -n disable gtk-doc"
+ echo
+ echo "Also uses environment variables AUTORECONF and GTKDOCIZE"
+ exit 1
+elif [ "x$1" = "x-n" ]; then
+ # ensure, that gtk-doc.make exists and is readable
+ # otherwise automake will fail - it is included from
+ # doc/reference/Makefile.am
+ if [ -f "./autogen.sh" ]; then
+ if [ -h "./gtk-doc.make" ]; then
+ rm -f "./gtk-doc.make"
+ fi
+ if [ -n "./gtk-doc.make" ]; then
+ : > "./gtk-doc.make"
+ fi
+ GTKDOCIZE=":"
+ else
+ # Avoid creation of files in random directories
+ echo "Error: You have to run this script from the root of loudmouth sources."
+ exit 1
+ fi
+fi
+
$GTKDOCIZE || exit 1
$AUTORECONF --install || exit 1
--- a/build/gtkdoc.m4 Tue Apr 24 14:02:14 2012 -0700
+++ b/build/gtkdoc.m4 Thu Nov 15 00:55:07 2012 -0800
@@ -1,10 +1,20 @@
-# Included so you can build without gtk-doc if it's not installed.
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
dnl Usage:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
AC_DEFUN([GTK_DOC_CHECK],
[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+
+ dnl check for tools we added during development
+ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+
dnl for overriding the documentation installation directory
AC_ARG_WITH([html-dir],
AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
@@ -23,14 +33,35 @@
[PKG_CHECK_EXISTS([gtk-doc],,
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+ dnl don't check for glib if we build glib
+ if test "x$PACKAGE_NAME" != "xglib"; then
+ dnl don't fail if someone does not have glib
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,)
+ fi
fi
AC_MSG_CHECKING([whether to build gtk-doc documentation])
AC_MSG_RESULT($enable_gtk_doc)
- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
+ dnl enable/disable output formats
+ AC_ARG_ENABLE([gtk-doc-html],
+ AS_HELP_STRING([--enable-gtk-doc-html],
+ [build documentation in html format [[default=yes]]]),,
+ [enable_gtk_doc_html=yes])
+ AC_ARG_ENABLE([gtk-doc-pdf],
+ AS_HELP_STRING([--enable-gtk-doc-pdf],
+ [build documentation in pdf format [[default=no]]]),,
+ [enable_gtk_doc_pdf=no])
+
+ if test -z "$GTKDOC_MKPDF"; then
+ enable_gtk_doc_pdf=no
+ fi
+
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
])
--- a/docs/reference/.gitignore Tue Apr 24 14:02:14 2012 -0700
+++ b/docs/reference/.gitignore Thu Nov 15 00:55:07 2012 -0800
@@ -10,6 +10,7 @@
loudmouth.interfaces
loudmouth.prerequisites
loudmouth.signals
+setup-build.stamp
scan-build.stamp
sgml-build.stamp
sgml.stamp
--- a/docs/reference/Makefile.am Tue Apr 24 14:02:14 2012 -0700
+++ b/docs/reference/Makefile.am Thu Nov 15 00:55:07 2012 -0800
@@ -69,7 +69,7 @@
# signals and properties.
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES= \
+AM_CPPFLAGS= \
$(LOUDMOUTH_CFLAGS) \
-DLM_COMPILATION \
-I$(top_srcdir) \
--- a/docs/reference/loudmouth-sections.txt Tue Apr 24 14:02:14 2012 -0700
+++ b/docs/reference/loudmouth-sections.txt Thu Nov 15 00:55:07 2012 -0800
@@ -34,6 +34,7 @@
lm_connection_send
lm_connection_send_with_reply
lm_connection_send_with_reply_and_block
+lm_connection_unregister_reply_handler
lm_connection_register_message_handler
lm_connection_unregister_message_handler
lm_connection_set_disconnect_function
--- a/examples/Makefile.am Tue Apr 24 14:02:14 2012 -0700
+++ b/examples/Makefile.am Thu Nov 15 00:55:07 2012 -0800
@@ -1,6 +1,6 @@
include $(top_srcdir)/build/Makefile.am.lm
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
$(LOUDMOUTH_CFLAGS)
--- a/loudmouth/lm-resolver.c Tue Apr 24 14:02:14 2012 -0700
+++ b/loudmouth/lm-resolver.c Thu Nov 15 00:55:07 2012 -0800
@@ -477,14 +477,13 @@
/* Parse the answers */
while (ancount-- > 0 && (len = dn_expand (srv, end, pos, name, 255)) >= 0) {
/* Ignore the initial string */
- uint16_t pref, weight, port;
+ uint16_t pref, port;
g_assert (len >= 0);
pos += len;
/* Ignore type, ttl, class and dlen */
pos += 10;
GETSHORT (pref, pos);
- GETSHORT (weight, pos);
GETSHORT (port, pos);
len = dn_expand (srv, end, pos, name, 255);
--- a/loudmouth/lm-ssl-gnutls.c Tue Apr 24 14:02:14 2012 -0700
+++ b/loudmouth/lm-ssl-gnutls.c Thu Nov 15 00:55:07 2012 -0800
@@ -37,9 +37,9 @@
struct _LmSSL {
LmSSLBase base;
- gnutls_session gnutls_session;
- gnutls_certificate_credentials gnutls_xcred;
- gboolean started;
+ gnutls_session_t gnutls_session;
+ gnutls_certificate_credentials_t gnutls_xcred;
+ gboolean started;
};
static gboolean ssl_verify_certificate (LmSSL *ssl,
@@ -106,10 +106,10 @@
}
if (gnutls_certificate_type_get (ssl->gnutls_session) == GNUTLS_CRT_X509) {
- const gnutls_datum* cert_list;
+ const gnutls_datum_t* cert_list;
guint cert_list_size;
size_t digest_size;
- gnutls_x509_crt cert;
+ gnutls_x509_crt_t cert;
cert_list = gnutls_certificate_get_peers (ssl->gnutls_session, &cert_list_size);
if (cert_list == NULL) {
--- a/loudmouth/lm-ssl-openssl.c Tue Apr 24 14:02:14 2012 -0700
+++ b/loudmouth/lm-ssl-openssl.c Thu Nov 15 00:55:07 2012 -0800
@@ -41,7 +41,7 @@
struct _LmSSL {
LmSSLBase base;
- SSL_METHOD *ssl_method;
+ const SSL_METHOD *ssl_method;
SSL_CTX *ssl_ctx;
SSL *ssl;
/*BIO *bio;*/