From 464709cd216c6477f1254e2f5b541ebbaa7a2047 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 04 Dec 2008 01:42:47 +0000 Subject: Merge commit 'v0.4.8' into upstream --- diff --git a/configure.ac b/configure.ac index 63da75f..8af40b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ m4_define([hulahop_build_id],[2008072400]) # FIXME: when should we update this? -m4_define([hulahop_version],[0.4.7]) +m4_define([hulahop_version],[0.4.8]) AC_INIT([hulahop],[hulahop_version],[],[hulahop]) @@ -19,6 +19,8 @@ AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) AC_PROG_LIBTOOL +AC_PROG_CXX + PKG_CHECK_MODULES(DEPS, gtk+-2.0) AM_PATH_PYTHON diff --git a/python/Makefile.am b/python/Makefile.am index 146f4cf..4d32718 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = \ pkgpyexec_LTLIBRARIES = _hulahop.la -_hulahop_la_LDFLAGS = -module -avoid-version -R$(LIBXUL_DIR) -dlopen self +_hulahop_la_LDFLAGS = -module -avoid-version -R$(LIBXUL_DIR) _hulahop_la_LIBADD = \ $(LIBXUL_LIBS) \ $(DEPS_LIBS) \ -- cgit v0.9.1