diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-06-16 22:16:36 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-06-16 22:16:36 +0000 |
| commit | 3e9551811aacd78ea129d036ddb612bc72b705e2 (patch) | |
| tree | 3225e5d210881ac15e9c805f8288aece752d4e10 /configure.ac | |
| parent | 4d765e74147311885fb6c17c0e66a30f10d7e09e (diff) | |
| download | classpath-3e9551811aacd78ea129d036ddb612bc72b705e2.tar.gz | |
2006-06-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD --> generics-branch for
2006/06/11 to 2006/06/16.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 1939dc538..61385dca3 100644 --- a/configure.ac +++ b/configure.ac @@ -438,7 +438,7 @@ if test "x${COMPILE_JNI}" = xyes; then if test "x$HAVE_QT4" = "xyes"; then dnl Check needed because in some cases the QtGui includedir dnl doesn't contain the subsystem dir. - QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui) + QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui` EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt" AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget], AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]), @@ -740,12 +740,12 @@ examples/Makefile.jawt]) if test "x${COMPILE_WRAPPERS}" = xno then -AC_CONFIG_FILES([tools/appletviewer -tools/jarsigner -tools/keytool]) -AC_CONFIG_COMMANDS([appletviewer],[chmod 755 tools/appletviewer]) -AC_CONFIG_COMMANDS([jarsigner],[chmod 755 tools/jarsigner]) -AC_CONFIG_COMMANDS([keytool],[chmod 755 tools/keytool]) +AC_CONFIG_FILES([tools/gappletviewer +tools/gjarsigner +tools/gkeytool]) +AC_CONFIG_COMMANDS([gappletviewer],[chmod 755 tools/gappletviewer]) +AC_CONFIG_COMMANDS([gjarsigner],[chmod 755 tools/gjarsigner]) +AC_CONFIG_COMMANDS([gkeytool],[chmod 755 tools/gkeytool]) fi AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) |