openbsd-ports/www/konqueror-embedded/patches/patch-configure_in
espie 601c270142 Update to a ways more recent snapshot, that uses QT3.
Hack at it to compile without kdelibs installed.

Quite a few nits to fix, including some bad issue with https...

discussed with brad@
2006-10-20 16:07:24 +00:00

55 lines
2.4 KiB
Plaintext

$OpenBSD: patch-configure_in,v 1.4 2006/10/20 16:07:24 espie Exp $
--- configure.in.orig Sat Jan 21 12:49:40 2006
+++ configure.in Fri Oct 20 10:58:38 2006
@@ -76,12 +76,12 @@ AC_CHECK_HEADERS(sys/time.h sys/param.h
# XXX compiling the needed tools would be great, but it is quite a difficult
# thing to do when cross compiling.
#
-# DCOPIDL2CPP="compiled"
-# DCOPIDL="compiled"
+DCOPIDL2CPP="compiled"
+DCOPIDL="compiled"
#
-# AC_SUBST(DCOPIDL, '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl/dcopidl')
-# AC_SUBST(DCOPIDL2CPP,
-# '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl2cpp/dcopidl2cpp')
+AC_SUBST(DCOPIDL, '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl/dcopidl')
+AC_SUBST(DCOPIDL2CPP,
+ '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl2cpp/dcopidl2cpp')
dnl Checks for typedefs, structures, and compiler characteristics.
AC_LANG_CPLUSPLUS
@@ -198,11 +198,12 @@ else
AC_DEFINE_UNQUOTED(ENABLE_JAVASCRIPT, 1, [Defined if JavaScript support is enabled])
if test "x$javascript_mode" = "xstatic"; then
- LIB_KJSHTML="\$(top_builddir)/konq-embed/kdesrc/khtml/ecma/libkjs_html_i.la"
- LIB_KJSHTML="$LIB_KJSHTML \$(top_builddir)/konq-embed/kdesrc/kjs/libkjs.la"
- LIB_KJSHTML="$LIB_KJSHTML \$(LIBPCRE)"
+ LIB_KJSHTML_DEPENDS="\$(top_builddir)/konq-embed/kdesrc/khtml/ecma/libkjs_html_i.la"
+ LIB_KJSHTML_DEPENDS="$LIB_KJSHTML_DEPENDS \$(top_builddir)/konq-embed/kdesrc/kjs/libkjs.la"
+ LIB_KJSHTML="$LIB_KJSHTML_DEPENDS \$(LIBPCRE)"
else
LIB_KJSHTML=""
+ LIB_KJSHTML_DEPENDS=""
LIB_KHTML="\$(top_builddir)/konq-embed/kdesrc/khtml/libkhtml.la"
AC_DEFINE_UNQUOTED(DLOPEN_JAVASCRIPT, 1, [Defined if JavaScript should be dynamically opened at run-time])
fi
@@ -211,6 +212,7 @@ fi
AC_SUBST(KJS_SUBDIR)
AC_SUBST(ECMA_SUBDIR)
AC_SUBST(LIB_KJSHTML)
+AC_SUBST(LIB_KJSHTML_DEPENDS)
AC_SUBST(LIB_KHTML)
AC_ARG_ENABLE(kjsmemdebug,[ --enable-kjsmemdebug Enable KJS memory debugging],
@@ -1040,6 +1042,8 @@ AC_CONFIG_FILES([ konq-embed/dropin/kpar
AC_CONFIG_FILES([ konq-embed/dropin/kssl/Makefile ])
AC_CONFIG_FILES([ konq-embed/ipkg/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/Makefile ])
+AC_CONFIG_FILES([ konq-embed/kdesrc/dcop/dcopidl/Makefile ])
+AC_CONFIG_FILES([ konq-embed/kdesrc/dcop/dcopidl2cpp/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/interfaces/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/interfaces/kio/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/kdecore/Makefile ])