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
v3.5.13-sru
tpearson 13 years ago
parent 8535db1bd8
commit 15d71b82a4

@ -1,12 +1,12 @@
AM_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) AM_CFLAGS = $(GLIB2_CFLAGS) $(GTK2_CFLAGS)
AM_CXXFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) AM_CXXFLAGS = $(GLIB2_CFLAGS) $(GTK2_CFLAGS)
INCLUDES = -I$(top_srcdir)/ $(X_INCLUDES) INCLUDES = -I$(top_srcdir)/ $(X_INCLUDES)
lib_LTLIBRARIES = libdcopc.la lib_LTLIBRARIES = libdcopc.la
libdcopc_la_SOURCES = dcopc.c marshal.c dcopobject.c libdcopc_la_SOURCES = dcopc.c marshal.c dcopobject.c
libdcopc_la_LIBADD = -lSM -lICE $(GTK_LIBS) $(GLIB_LIBS) libdcopc_la_LIBADD = -lSM -lICE $(GTK2_LIBS) $(GLIB2_LIBS)
libdcopc_la_LDFLAGS = -version-info 1:0 $(X_LDFLAGS) -lICE -no-undefined libdcopc_la_LDFLAGS = -version-info 1:0 $(X_LDFLAGS) -lICE -no-undefined
include_HEADERS = dcopc.h marshal.h dcopobject.h util.h include_HEADERS = dcopc.h marshal.h dcopobject.h util.h

@ -3,3 +3,6 @@ dnl if test "$GTK_CONFIG" = "no"; then
dnl fi dnl fi
dnl dnl
dnl AC_CHECK_GETHOSTNAME dnl AC_CHECK_GETHOSTNAME
AC_GTK_2
AC_GLIB_2

@ -1,5 +1,8 @@
if include_MOZILLA_support
MOZILLADIR=mozilla
endif
SUBDIRS = src xpart_notepad SUBDIRS = src xpart_notepad $(MOZILLADIR)
EXTRA_DIST = Makefile.cvs glib.m4 gtk.m4 EXTRA_DIST = Makefile.cvs glib.m4 gtk.m4

@ -1,6 +1,6 @@
INCLUDES = -I$(srcdir)/../src/kde -I$(srcdir)/../src/interfaces -I$(srcdir)/../src/gtk -I$(prefix)/include -I$(top_srcdir) $(MOZILLA_INCLUDES) $(all_includes) INCLUDES = -I$(srcdir)/../src/kde -I$(srcdir)/../src/interfaces -I$(srcdir)/../src/gtk -I$(prefix)/include -I$(top_srcdir) $(MOZILLA_INCLUDES) $(all_includes)
AM_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) AM_CFLAGS = $(GTK2_CFLAGS) $(GLIB2_CFLAGS)
lib_LTLIBRARIES = libkmozillapart.la lib_LTLIBRARIES = libkmozillapart.la
@ -14,8 +14,8 @@ service_DATA = kmozilla.desktop
bin_PROGRAMS = kmozilla #kshell bin_PROGRAMS = kmozilla #kshell
kmozilla_SOURCES = kmozilla.c kmozilla_ext.c main.c kmozilla_SOURCES = kmozilla.c kmozilla_ext.c main.c
kmozilla_LDADD = ../src/gtk/libgtkxparts.la $(GTK_LIBS) $(GLIB_LIBS) kmozilla_LDADD = ../src/gtk/libgtkxparts.la $(GTK2_LIBS) $(GLIB2_LIBS)
kmozilla_LDFLAGS = $(GLIB_LDFLAGS) $(GTK_LDFLAGS) -L$(libdir) -L/usr/lib/mozilla -Wl,--rpath=/usr/lib/mozilla -lgtkembedmoz -lxpcom $(all_libraries) kmozilla_LDFLAGS = $(MOZILLA_LDFLAGS) $(GLIB2_LDFLAGS) $(GTK2_LIBS) -L/usr/lib/mozilla -Wl,--rpath=/usr/lib/mozilla -lxul -lxpcom -lmozjs $(all_libraries)
#kshell_SOURCES = kshell.cpp #kshell_SOURCES = kshell.cpp
#kshell_LDADD = $(top_builddir)/xkparts/kde/libkdexparts.la #kshell_LDADD = $(top_builddir)/xkparts/kde/libkdexparts.la

@ -3,9 +3,12 @@ AC_DEFUN([AC_PATH_MOZILLA],
AC_MSG_CHECKING([for Mozilla development headers]) AC_MSG_CHECKING([for Mozilla development headers])
mozilla_incldirs="/usr/include /usr/include/mozilla /usr/local/include /usr/X11R6/include/mozilla /opt/include /opt/mozilla/include" mozilla_incldirs="/usr/include /usr/include/mozilla /usr/local/include /usr/X11R6/include/mozilla /opt/include /opt/mozilla/include /usr/include/xulrunner*"
AC_FIND_FILE(gtkmozembed.h, $mozilla_incldirs, mozilla_incdir) AC_FIND_FILE(gtkmozembed.h, $mozilla_incldirs, mozilla_incdir)
mozilla_libdirs="/usr/lib /usr/lib/xulrunner*"
AC_FIND_FILE(libxul.so, $mozilla_libdirs, mozilla_libdir)
if test "$mozilla_incdir" = NO; then if test "$mozilla_incdir" = NO; then
AC_FIND_FILE(gtkembedmoz/gtkmozembed.h, $mozilla_incldirs, mozilla_incdir) AC_FIND_FILE(gtkembedmoz/gtkmozembed.h, $mozilla_incldirs, mozilla_incdir)
@ -19,7 +22,9 @@ if test "$mozilla_incdir" = NO; then
else else
have_mozilla=yes; have_mozilla=yes;
MOZILLA_INCLUDES="-I$mozilla_incdir" MOZILLA_INCLUDES="-I$mozilla_incdir"
MOZILLA_LDFLAGS="-L$mozilla_libdir"
AC_SUBST(MOZILLA_INCLUDES) AC_SUBST(MOZILLA_INCLUDES)
AC_SUBST(MOZILLA_LDFLAGS)
AC_MSG_RESULT([found in $mozilla_incdir]); AC_MSG_RESULT([found in $mozilla_incdir]);
fi fi
@ -27,5 +32,6 @@ AM_CONDITIONAL(include_MOZILLA_support, [test "$mozilla_incdir" != NO])
]) ])
AC_PATH_MOZILLA AC_PATH_MOZILLA
AC_GLIB_2
AC_GTK_2

@ -1,3 +1,5 @@
#include <glib-object.h>
#include "kmozilla.h" #include "kmozilla.h"
#include "kmozilla_ext.h" #include "kmozilla_ext.h"
#include <gtkmozembed.h> #include <gtkmozembed.h>

@ -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_CFLAGS = $(GLIB2_CFLAGS) $(GTK2_CFLAGS)
AM_CXXFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) AM_CXXFLAGS = $(GLIB2_CFLAGS) $(GTK2_CFLAGS)
lib_LTLIBRARIES = libgtkxparts.la lib_LTLIBRARIES = libgtkxparts.la
libgtkxparts_la_SOURCES = gtkpart.c gtkbrowserextension.c 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 libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined
gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h

@ -1 +1,4 @@
AM_CONDITIONAL(include_GTK_support, [ test "$GTK_CONFIG" != "no" ]) AM_CONDITIONAL(include_GTK_support, [ test "$GTK_CONFIG" != "no" ])
AC_GTK_2
AC_GLIB_2

@ -4,7 +4,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>
#include <stdio.h> #include <stdio.h>
#include <iostream.h> #include <iostream>
#include <xpart.h> #include <xpart.h>
#include <kdebug.h> #include <kdebug.h>

Loading…
Cancel
Save