pidgin/purple-plugin-pack

The ning prpl now compiles on !Windows. No idea whether it works or not.

2011-07-05, John Bailey
8cd593224404
Parents b84e8476808a
Children 2fa204cc1774
The ning prpl now compiles on !Windows. No idea whether it works or not.
5 files changed, 24 insertions(+), 3 deletions(-)
  • +17 -0
    configure.ac
  • +4 -0
    ning/Makefile.am
  • +1 -1
    ning/ning.c
  • +1 -1
    ning/ning_chat.h
  • +1 -1
    ning/ning_connection.h
    • --- a/configure.ac Mon Jul 04 23:37:08 2011 -0400
    +++ b/configure.ac Tue Jul 05 09:27:44 2011 -0400
    @@ -271,6 +271,23 @@
    fi
    dnl #######################################################################
    +dnl # Check for libjson-glib
    +dnl #######################################################################
    +HAVE_JSON_GLIB="no"
    +JSON_GLIB_CFLAGS=""
    +JSON_GLIB_LIBS=""
    +
    +PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0], HAVE_JSON_GLIB="yes", HAVE_JSON_GLIB="no")
    +AC_SUBST(JSON_GLIB_CFLAGS)
    +AC_SUBST(JSON_GLIB_LIBS)
    +
    +AM_CONDITIONAL(HAVE_JSON_GLIB, test x"$HAVE_JSON_GLIB" = x"yes")
    +
    +if test x"$HAVE_JSON_GLIB" = x"yes"; then
    + DEPENDENCIES="$DEPENDENCIES,json-glib"
    +fi
    +
    +dnl #######################################################################
    dnl # Check for switchspell
    dnl #######################################################################
    gtkspell=yes
    --- a/ning/Makefile.am Mon Jul 04 23:37:08 2011 -0400
    +++ b/ning/Makefile.am Tue Jul 05 09:27:44 2011 -0400
    @@ -13,6 +13,7 @@
    ning_la_LDFLAGS = -module -avoid-version
    if HAVE_PURPLE
    +if HAVE_JSON_GLIB
    ning_LTLIBRARIES = ning.la
    @@ -26,6 +27,7 @@
    ning_la_LIBADD = \
    $(GLIB_LIBS) \
    + $(JSON_GLIB_LIBS) \
    $(PURPLE_LIBS)
    # uncomment the lines below if we get pixmaps
    @@ -42,11 +44,13 @@
    #endif
    endif
    +endif
    AM_CPPFLAGS = \
    -DLIBDIR=\"$(PURPLE_LIBDIR)\" \
    -DDATADIR=\"$(PURPLE_DATADIR)\" \
    $(DEBUG_CFLAGS) \
    + $(JSON_GLIB_CFLAGS) \
    $(PURPLE_CFLAGS)
    bullshit:
    --- a/ning/ning.c Mon Jul 04 23:37:08 2011 -0400
    +++ b/ning/ning.c Tue Jul 05 09:27:44 2011 -0400
    @@ -18,7 +18,7 @@
    * along with this program. If not, see <http://www.gnu.org/licenses/>.
    */
    -#include "libning.h"
    +#include "ning.h"
    #include "ning_connection.h"
    #include "ning_chat.h"
    --- a/ning/ning_chat.h Mon Jul 04 23:37:08 2011 -0400
    +++ b/ning/ning_chat.h Tue Jul 05 09:27:44 2011 -0400
    @@ -11,7 +11,7 @@
    #ifndef NING_CHAT_H
    #define NING_CHAT_H
    -#include "libning.h"
    +#include "ning.h"
    #include "ning_connection.h"
    typedef struct _NingChat {
    --- a/ning/ning_connection.h Mon Jul 04 23:37:08 2011 -0400
    +++ b/ning/ning_connection.h Tue Jul 05 09:27:44 2011 -0400
    @@ -21,7 +21,7 @@
    #ifndef NING_CONNECTION_H
    #define NING_CONNECTION_H
    -#include "libning.h"
    +#include "ning.h"
    typedef void (*NingProxyCallbackFunc)
    (NingAccount *na, gchar *data, gsize data_len, gpointer user_data);