projects / packages / gcc.git / blame
| Commit | Line | Data |
|---|---|---|
| 0c775ef8 | 1 | --- trunk/libjava/classpath/configure.ac 2006-07-02 15:32:04.000000000 +0200 |
| a4e8bbcc | 2 | +++ trunk/libjava/classpath/configure.ac 2006-07-02 19:18:28.913906000 +0200 |
| 7f47fc3c | 3 | @@ -502,7 +502,8 @@ |
| a4e8bbcc PS |
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]) | |
| 7f47fc3c PS |
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]) | |
| a4e8bbcc PS |
11 | fi |
| 12 | if test "x$HAVE_QT4" = "xno"; then | |
| ffeba2e4 PS |
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 | |
| 15 | @@ -1,8 +1,7 @@ | |
| 16 | # Qt AWT backend for Classpath | |
| 17 | # | |
| 18 | ||
| 19 | -## GCJ LOCAL: don't install this library | |
| 20 | -noinst_LTLIBRARIES = libqtpeer.la | |
| 21 | +nativeexeclib_LTLIBRARIES = libqtpeer.la | |
| 22 | ||
| 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 | |
| 0c775ef8 PS |
27 | @@ -64,7 +64,8 @@ |
| 28 | mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs | |
| 29 | CONFIG_HEADER = $(top_builddir)/include/config.h | |
| 30 | CONFIG_CLEAN_FILES = | |
| 31 | -LTLIBRARIES = $(noinst_LTLIBRARIES) | |
| 32 | +nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL) | |
| 33 | +LTLIBRARIES = $(nativeexeclib_LTLIBRARIES) | |
| 34 | libqtpeer_la_LIBADD = | |
| 35 | am_libqtpeer_la_OBJECTS = componentevent.lo keybindings.lo \ | |
| 36 | mainqtthread.lo mainthreadinterface.lo nativewrapper.lo \ | |
| 37 | @@ -357,7 +358,7 @@ | |
| 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@ \ | |
| 46 | @@ -475,7 +476,7 @@ | |
| 47 | rm -f "$${dir}/so_locations"; \ | |
| 48 | done | |
| 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) | |
| 52 | ||
| 53 | mostlyclean-compile: | |
| 54 | -rm -f *.$(OBJEXT) | |
| 55 | @@ -686,7 +687,18 @@ | |
| 56 | ||
| 57 | install-data-am: | |
| 58 | ||
| 59 | -install-exec-am: | |
| 60 | +install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) | |
| 61 | + @$(NORMAL_INSTALL) | |
| 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"; \ | |
| 68 | + else :; fi; \ | |
| 69 | + done | |
| 70 | + | |
| 71 | +install-exec-am: install-nativeexeclibLTLIBRARIES | |
| 72 | ||
| 73 | install-info: install-info-am | |
| 74 | ||
| 75 | @@ -720,6 +732,7 @@ | |
| 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 \ |