1 --- trunk/libjava/classpath/configure.ac 2006-07-02 15:32:04.000000000 +0200
2 +++ trunk/libjava/classpath/configure.ac 2006-07-02 19:18:28.913906000 +0200
4 AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
5 QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
6 AC_MSG_WARN([QWidget not found])))
7 - AC_CHECK_PROG(MOC, [moc], [moc])
8 + QT4DIR=`$PKG_CONFIG --variable=prefix QtGui`
9 + AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
10 AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4])
12 if test "x$HAVE_QT4" = "xno"; then
13 --- trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2007-06-04 01:18:43.000000000 +0200
14 +++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2008-03-06 16:32:36.000000000 +0100
16 # Qt AWT backend for Classpath
19 -## GCJ LOCAL: don't install this library
20 -noinst_LTLIBRARIES = libqtpeer.la
21 +nativeexeclib_LTLIBRARIES = libqtpeer.la
23 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
24 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
25 --- trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2007-08-04 12:53:49.000000000 +0200
26 +++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2008-03-06 15:24:38.000000000 +0100
28 mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
29 CONFIG_HEADER = $(top_builddir)/include/config.h
31 -LTLIBRARIES = $(noinst_LTLIBRARIES)
32 +nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
33 +LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
35 am_libqtpeer_la_OBJECTS = componentevent.lo keybindings.lo \
36 mainqtthread.lo mainthreadinterface.lo nativewrapper.lo \
38 target_vendor = @target_vendor@
39 toolexeclibdir = @toolexeclibdir@
40 vm_classes = @vm_classes@
41 -noinst_LTLIBRARIES = libqtpeer.la
42 +nativeexeclib_LTLIBRARIES = libqtpeer.la
43 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
44 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
45 AM_CXXFLAGS = @QT_CFLAGS@ \
47 rm -f "$${dir}/so_locations"; \
49 libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES)
50 - $(CXXLINK) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
51 + $(LINK) -rpath $(nativeexeclibdir) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
60 +install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
62 + test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
63 + @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
64 + if test -f $$p; then \
65 + f=$(am__strip_dir) \
66 + echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
67 + $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
71 +install-exec-am: install-nativeexeclibLTLIBRARIES
73 install-info: install-info-am
76 distclean-tags distdir dvi dvi-am html html-am info info-am \
77 install install-am install-data install-data-am install-exec \
78 install-exec-am install-info install-info-am install-man \
79 + install-nativeexeclibLTLIBRARIES \
80 install-strip installcheck installcheck-am installdirs \
81 maintainer-clean maintainer-clean-generic mostlyclean \
82 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \