/[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.16 by gnu_andrew, Tue Sep 20 18:46:22 2005 UTC revision 1.43.2.17 by gnu_andrew, Wed Nov 2 00:43:15 2005 UTC
# Line 103  AC_ARG_ENABLE([xmlj], Line 103  AC_ARG_ENABLE([xmlj],
103  AM_CONDITIONAL(CREATE_XMLJ_LIBRARY, test "x${COMPILE_XMLJ}" = xyes)  AM_CONDITIONAL(CREATE_XMLJ_LIBRARY, test "x${COMPILE_XMLJ}" = xyes)
104    
105  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
106    dnl ALSA code (enabled by default)
107    dnl -----------------------------------------------------------
108    AC_ARG_ENABLE([alsa],
109                  [AS_HELP_STRING(--disable-alsa,compile ALSA providers (enable by --enable-alsa) [default=yes])],
110                  [case "${enableval}" in
111                    yes) COMPILE_ALSA=yes ;;
112                    no) COMPILE_ALSA=no ;;
113                    *) COMPILE_ALSA=yes ;;
114                  esac],
115                  [AC_CHECK_HEADERS([alsa/asoundlib.h],COMPILE_ALSA=yes,COMPILE_ALSA=no)])
116    AM_CONDITIONAL(CREATE_ALSA_LIBRARIES, test "x${COMPILE_ALSA}" = xyes)
117    
118    dnl -----------------------------------------------------------
119    dnl DSSI code (enabled by default)
120    dnl -----------------------------------------------------------
121    AC_ARG_ENABLE([alsa],
122                  [AS_HELP_STRING(--disable-dssi,compile DSSI providers (enable by --enable-dssi) [default=yes])],
123                  [case "${enableval}" in
124                    yes) COMPILE_DSSI=yes ;;
125                    no) COMPILE_DSSI=no ;;
126                    *) COMPILE_DSSI=yes ;;
127                  esac],
128                  [AC_CHECK_HEADERS([dssi.h],COMPILE_DSSI=yes,COMPILE_DSSI=no)])
129    AM_CONDITIONAL(CREATE_DSSI_LIBRARIES, test "x${COMPILE_DSSI}" = xyes)
130    
131    dnl -----------------------------------------------------------
132  dnl GTK native peer (enabled by default)  dnl GTK native peer (enabled by default)
133  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
134  AC_ARG_ENABLE([gtk-peer],  AC_ARG_ENABLE([gtk-peer],
# Line 150  AC_ARG_ENABLE([qt-peer], Line 176  AC_ARG_ENABLE([qt-peer],
176                [COMPILE_QT_PEER=no])                [COMPILE_QT_PEER=no])
177  AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes)  AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes)
178    
179    
180    dnl -----------------------------------------------------------
181    dnl Sets the native libraries installation dir
182    dnl -----------------------------------------------------------
183    AC_ARG_WITH([native-libdir],
184                [AS_HELP_STRING(--with-native-libdir,sets the installation directore for native libraries [default='${libdir}/${PACKAGE}'])],
185                [
186                 nativelibdir=${withval}
187                ],
188                [
189                 nativelibdir='${libdir}/${PACKAGE}'
190                ])
191    
192    AC_SUBST(nativelibdir)
193    
194    dnl -----------------------------------------------------------
195    dnl Sets the Java library installation dir.
196    dnl -----------------------------------------------------------
197    AC_ARG_WITH([glibj-dir],
198                [AS_HELP_STRING(--with-glibj-dir,sets the installation directory for glibj.zip [default='${libdir}/${PACKAGE}'])],
199                [
200                 glibjdir=${withval}
201                ],
202                [
203                 glibjdir='${datadir}/${PACKAGE}'
204                ])
205    
206    AC_SUBST(glibjdir)
207    
208  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
209  dnl Regenerate headers at build time (disabled by default)  dnl Regenerate headers at build time (disabled by default)
210  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
# Line 242  if test "x${COMPILE_JNI}" = xyes; then Line 297  if test "x${COMPILE_JNI}" = xyes; then
297            [AC_MSG_RESULT(no)])])])            [AC_MSG_RESULT(no)])])])
298    
299    AC_C_CONST    AC_C_CONST
300      AC_C_ATTRIBUTE
301    
302    dnl See if we HAVE_ICONV, how ICONV_CONST is set and LTLIBICONV    dnl See if we HAVE_ICONV, how ICONV_CONST is set and LTLIBICONV
303    AM_ICONV    AM_ICONV
# Line 297  if test "x${COMPILE_JNI}" = xyes; then Line 353  if test "x${COMPILE_JNI}" = xyes; then
353    
354    dnl Check for AWT related Qt4    dnl Check for AWT related Qt4
355    if test "x${COMPILE_QT_PEER}" = xyes; then    if test "x${COMPILE_QT_PEER}" = xyes; then
356      PKG_CHECK_MODULES(QT, QtGui >= 4.0.1)      PKG_CHECK_MODULES(QT, QtGui >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no")
357      dnl Check needed because in some cases the QtGui includedir      if test "x$HAVE_QT4" = "xyes"; then
358      dnl doesn't contain the subsystem dir.        dnl Check needed because in some cases the QtGui includedir
359      QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)        dnl doesn't contain the subsystem dir.
360      EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"        QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
361      AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],        EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
362                    AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),        AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
363                    AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],        AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
364                          QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",        AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
365                          AC_MSG_WARN([QWidget not found])))          QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
366      AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])          AC_MSG_WARN([QWidget not found])))
367      AC_CHECK_PROG(MOC, [moc], [moc])          AC_CHECK_PROG(MOC, [moc], [moc])
368      AC_SUBST(QT_CFLAGS)      fi
369      AC_SUBST(QT_LIBS)    if test "x$HAVE_QT4" = "xno"; then
370        AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])
371        case "$host_os" in
372          darwin*)
373            AC_ARG_WITH([qt4dir],
374              [AS_HELP_STRING([--with-qt4dir=DIR],
375              [Qt4 installation directory used for OS-X.
376              For other systems use pkg-config.])],
377              [QT4DIR=$withval]
378              )
379            if test x"$QT4DIR" = x ; then
380              AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given])
381            fi
382            AC_MSG_RESULT([QT4DIR... $QT4DIR])
383            AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
384            if test x"$MOC" = x; then
385              AC_MSG_ERROR([*** This is not the right Qt installation])
386            fi
387            QT_CFLAGS="-F$QT4DIR/lib -I$QT4DIR/lib/QtCore.framework/Headers"
388            QT_CFLAGS="$QT_CFLAGS -I$QT4DIR/lib/QtGui.framework/Headers"
389            QT_LIBS="-Xlinker -F$QT4DIR/lib -Xlinker -framework -Xlinker QtCore"
390            QT_LIBS="$QT_LIBS -Xlinker -framework -Xlinker QtGui"
391            ;;
392          *)
393            AC_MSG_ERROR([*** Please check PKG_CONFIG_PATH or the version
394            of your installed Qt4 installation.])
395            ;;
396        esac
397    fi    fi
398      AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
399      AC_SUBST(QT_CFLAGS)
400      AC_SUBST(QT_LIBS)
401    fi
402    
403    if test "x${enable_gtk_cairo}" = xyes; then    if test "x${enable_gtk_cairo}" = xyes; then
404      PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)      PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
     PKG_CHECK_MODULES(PANGOFT2, pangoft2)  
405    fi    fi
406    
407      PKG_CHECK_MODULES(PANGOFT2, pangoft2)
408      PKG_CHECK_MODULES(FREETYPE2, freetype2)
409    
410    AC_SUBST(CAIRO_LIBS)    AC_SUBST(CAIRO_LIBS)
411    AC_SUBST(CAIRO_CFLAGS)    AC_SUBST(CAIRO_CFLAGS)
412    AC_SUBST(PANGOFT2_LIBS)    AC_SUBST(PANGOFT2_LIBS)
413    AC_SUBST(PANGOFT2_CFLAGS)    AC_SUBST(PANGOFT2_CFLAGS)
414      AC_SUBST(FREETYPE2_LIBS)
415      AC_SUBST(FREETYPE2_CFLAGS)
416  fi  fi
417    
418  CLASSPATH_WITH_JAVAH  CLASSPATH_WITH_JAVAH
# Line 489  native/jni/java-util/Makefile Line 581  native/jni/java-util/Makefile
581  native/jni/gtk-peer/Makefile  native/jni/gtk-peer/Makefile
582  native/jni/qt-peer/Makefile  native/jni/qt-peer/Makefile
583  native/jni/xmlj/Makefile  native/jni/xmlj/Makefile
584    native/jni/midi-alsa/Makefile
585    native/jni/midi-dssi/Makefile
586  native/target/Makefile  native/target/Makefile
587  native/target/Linux/Makefile  native/target/Linux/Makefile
588  native/target/generic/Makefile  native/target/generic/Makefile
# Line 497  scripts/Makefile Line 591  scripts/Makefile
591  scripts/classpath.spec  scripts/classpath.spec
592  lib/Makefile  lib/Makefile
593  lib/gen-classlist.sh  lib/gen-classlist.sh
594    lib/copy-vmresources.sh
595  examples/Makefile  examples/Makefile
596  examples/Makefile.jawt])  examples/Makefile.jawt])
597  AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])  AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])
598    AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh])
599  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.1.43.2.16  
changed lines
  Added in v.1.43.2.17

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