/[classpath]/classpath/configure.ac
ViewVC logotype

Diff of /classpath/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.43.2.14 by gnu_andrew, Tue Aug 16 16:22:35 2005 UTC revision 1.43.2.15 by gnu_andrew, Sat Sep 10 15:31:32 2005 UTC
# Line 6  dnl ------------------------------------ Line 6  dnl ------------------------------------
6  dnl define([AC_CACHE_LOAD], )dnl  dnl define([AC_CACHE_LOAD], )dnl
7  dnl define([AC_CACHE_SAVE], )dnl  dnl define([AC_CACHE_SAVE], )dnl
8    
9  AC_INIT([GNU Classpath],[0.17+cvs],[classpath@gnu.org],[classpath])  AC_INIT([GNU Classpath],[0.19-pre],[classpath@gnu.org],[classpath])
10  AC_CONFIG_SRCDIR(java/lang/System.java)  AC_CONFIG_SRCDIR(java/lang/System.java)
11    
12  AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
# Line 83  dnl ------------------------------------ Line 83  dnl ------------------------------------
83  AC_ARG_ENABLE(default-toolkit,  AC_ARG_ENABLE(default-toolkit,
84    AS_HELP_STRING([--enable-default-toolkit],    AS_HELP_STRING([--enable-default-toolkit],
85                   [fully qualified class name of default AWT toolkit]))                   [fully qualified class name of default AWT toolkit]))
86  default_toolkit=$enable_default_tookit  default_toolkit=$enable_default_toolkit
87  if test "$default_toolkit" = ""; then  if test "$default_toolkit" = ""; then
88     default_toolkit=gnu.java.awt.peer.gtk.GtkToolkit     default_toolkit=gnu.java.awt.peer.gtk.GtkToolkit
89  fi  fi
# Line 138  fi Line 138  fi
138  AM_CONDITIONAL(GTK_CAIRO, test "x${GTK_CAIRO_ENABLED}" = xtrue)  AM_CONDITIONAL(GTK_CAIRO, test "x${GTK_CAIRO_ENABLED}" = xtrue)
139    
140  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
141    dnl Qt native peer (disabled by default)
142    dnl -----------------------------------------------------------
143    AC_ARG_ENABLE([qt-peer],
144                  [AS_HELP_STRING(--enable-qt-peer,compile Qt4 native peers (disabled by --disable-jni) [default=no])],
145                  [case "${enableval}" in
146                    yes) COMPILE_QT_PEER=yes ;;
147                    no) COMPILE_QT_PEER=no ;;
148                    *) COMPILE_QT_PEER=yes ;;
149                  esac],
150                  [COMPILE_QT_PEER=no])
151    AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes)
152    
153    dnl -----------------------------------------------------------
154  dnl Regenerate headers at build time (disabled by default)  dnl Regenerate headers at build time (disabled by default)
155  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
156  AC_ARG_ENABLE([regen-headers],  AC_ARG_ENABLE([regen-headers],
# Line 156  AC_PROG_INSTALL Line 169  AC_PROG_INSTALL
169  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
170  dnl Checks for programs.  dnl Checks for programs.
171  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
172  dnl AC_PROG_CXX  AC_PROG_CXX
173  dnl Initialize libtool  dnl Initialize libtool
174  AC_DISABLE_STATIC  AC_DISABLE_STATIC
175  AC_PROG_LIBTOOL  AC_PROG_LIBTOOL
# Line 282  if test "x${COMPILE_JNI}" = xyes; then Line 295  if test "x${COMPILE_JNI}" = xyes; then
295       AC_SUBST(GTK_LIBS)       AC_SUBST(GTK_LIBS)
296    fi    fi
297    
298      dnl Check for AWT related Qt4
299      if test "x${COMPILE_QT_PEER}" = xyes; then
300        PKG_CHECK_MODULES(QT, QtGui >= 4.0.1)
301        dnl Check needed because in some cases the QtGui includedir
302        dnl doesn't contain the subsystem dir.
303        QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
304        EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
305        AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
306                      AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
307                      AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
308                            QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
309                            AC_MSG_WARN([QWidget not found])))
310        AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
311        AC_CHECK_PROG(MOC, [moc], [moc])
312        AC_SUBST(QT_CFLAGS)
313        AC_SUBST(QT_LIBS)
314      fi
315    
316    if test "x${enable_gtk_cairo}" = xyes; then    if test "x${enable_gtk_cairo}" = xyes; then
317      PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)      PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
318      PKG_CHECK_MODULES(PANGOFT2, pangoft2)      PKG_CHECK_MODULES(PANGOFT2, pangoft2)
# Line 447  gnu/classpath/Configuration.java Line 478  gnu/classpath/Configuration.java
478  include/Makefile  include/Makefile
479  native/Makefile  native/Makefile
480  native/fdlibm/Makefile  native/fdlibm/Makefile
481    native/jawt/Makefile
482  native/jni/Makefile  native/jni/Makefile
483  native/jni/classpath/Makefile  native/jni/classpath/Makefile
484  native/jni/java-io/Makefile  native/jni/java-io/Makefile
# Line 455  native/jni/java-net/Makefile Line 487  native/jni/java-net/Makefile
487  native/jni/java-nio/Makefile  native/jni/java-nio/Makefile
488  native/jni/java-util/Makefile  native/jni/java-util/Makefile
489  native/jni/gtk-peer/Makefile  native/jni/gtk-peer/Makefile
490    native/jni/qt-peer/Makefile
491  native/jni/xmlj/Makefile  native/jni/xmlj/Makefile
492  native/target/Makefile  native/target/Makefile
493  native/target/Linux/Makefile  native/target/Linux/Makefile
# Line 464  scripts/Makefile Line 497  scripts/Makefile
497  scripts/classpath.spec  scripts/classpath.spec
498  lib/Makefile  lib/Makefile
499  lib/gen-classlist.sh  lib/gen-classlist.sh
500  examples/Makefile])  examples/Makefile
501    examples/Makefile.jawt])
502  AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])  AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])
503  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.1.43.2.14  
changed lines
  Added in v.1.43.2.15

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26