summaryrefslogtreecommitdiffstats
path: root/xparts/src
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-02 04:13:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-02 04:13:05 +0000
commit15d71b82a4d2f9bfea61386b2f5c35ecfa479af2 (patch)
tree1be10801c30473a83d8ee79f4068cc850a4e29a6 /xparts/src
parent8535db1bd8fd6b5da3ff2c785bdd7512f53779e3 (diff)
downloadtdebindings-15d71b82a4d2f9bfea61386b2f5c35ecfa479af2.tar.gz
tdebindings-15d71b82a4d2f9bfea61386b2f5c35ecfa479af2.zip
Fix compilation of Mozilla plugin for Konqueror
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1256729 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'xparts/src')
-rw-r--r--xparts/src/gtk/Makefile.am8
-rw-r--r--xparts/src/gtk/configure.in.in3
2 files changed, 7 insertions, 4 deletions
diff --git a/xparts/src/gtk/Makefile.am b/xparts/src/gtk/Makefile.am
index 2e83df3b..60a7a194 100644
--- a/xparts/src/gtk/Makefile.am
+++ b/xparts/src/gtk/Makefile.am
@@ -1,12 +1,12 @@
-INCLUDES = $(GLIB_INCLUDES) -I$(prefix)/include -I$(top_srcdir) $(all_includes)
+INCLUDES = $(GLIB2_INCLUDES) -I$(prefix)/include -I$(top_srcdir) $(all_includes)
-AM_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
-AM_CXXFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
+AM_CFLAGS = $(GLIB2_CFLAGS) $(GTK2_CFLAGS)
+AM_CXXFLAGS = $(GLIB2_CFLAGS) $(GTK2_CFLAGS)
lib_LTLIBRARIES = libgtkxparts.la
libgtkxparts_la_SOURCES = gtkpart.c gtkbrowserextension.c
-libgtkxparts_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(top_builddir)/dcopc/libdcopc.la
+libgtkxparts_la_LIBADD = $(GTK2_LIBS) $(GLIB2_LIBS) $(top_builddir)/dcopc/libdcopc.la
libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined
gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h
diff --git a/xparts/src/gtk/configure.in.in b/xparts/src/gtk/configure.in.in
index 32dfac1e..28da9aeb 100644
--- a/xparts/src/gtk/configure.in.in
+++ b/xparts/src/gtk/configure.in.in
@@ -1 +1,4 @@
AM_CONDITIONAL(include_GTK_support, [ test "$GTK_CONFIG" != "no" ])
+
+AC_GTK_2
+AC_GLIB_2