From f4d29d66deb64ca94918d5bf9261849d4f6cd547 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 2 Aug 2006 23:32:35 +0000 Subject: PR 28535 * configure.ac (gconf-peer): Check for gdk-2.0. * native/jni/gconf-peer/Makefile.am (AM_LDFLAGS): Use GDK_LIBS. (AM_CFLAGS): Use GDK_CFLAGS. --- ChangeLog | 8 ++++++ configure.ac | 56 +++++++-------------------------------- native/jni/gconf-peer/Makefile.am | 4 +-- 3 files changed, 20 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8afb66aed..edc825b93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-08-02 Mark Wielaard + + PR 28535 + * configure.ac (gconf-peer): Check for gdk-2.0. + * native/jni/gconf-peer/Makefile.am + (AM_LDFLAGS): Use GDK_LIBS. + (AM_CFLAGS): Use GDK_CFLAGS. + 2006-07-31 Raif S. Naffah * java/security/Provider.java: Updated copyright year. diff --git a/configure.ac b/configure.ac index 22ea81127..1ea1197b7 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([GNU Classpath],[0.93-pre],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.92-pre],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) AC_CANONICAL_TARGET @@ -120,9 +120,9 @@ AC_ARG_ENABLE([Werror], [case "${enableval}" in yes) ENABLE_WERROR=yes ;; no) ENABLE_WERROR=no ;; - *) ENABLE_WERROR=default ;; + *) ENABLE_WERROR=no ;; esac], - [ENABLE_WERROR=default]) + [ENABLE_WERROR=no]) dnl ----------------------------------------------------------- dnl Default AWT toolkit @@ -305,17 +305,6 @@ dnl AC_PROG_AWK AC_PROG_CC AC_PROG_CPP -# Handle -Werror default case. -if test "$ENABLE_WERROR" = default; then - case "$host_os" in - *linux*) - if test "$GCC" = yes; then - ENABLE_WERROR=yes - fi - ;; - esac -fi - if test "x${COMPILE_COLLECTIONS}" = xyes; then AC_PATH_PROG(PERL, [perl]) AC_SUBST(PERL) @@ -478,6 +467,10 @@ if test "x${COMPILE_JNI}" = xyes; then PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2) AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) + dnl we also need gdk for locking + PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.8) + AC_SUBST(GDK_CFLAGS) + AC_SUBST(GDK_LIBS) dnl check if the config value was given form the command line, dnl if not, overwrite the default if we have the gconf backend dnl compiled in @@ -741,42 +734,17 @@ case "$with_escher" in use_escher=false ;; "yes") - AC_MSG_ERROR([Please supply an absolute path to Escher library]) + AC_MSG_ERROR([Please suply an absolute path to Escher library]) ;; *) use_escher=true PATH_TO_ESCHER=$with_escher ;; -esac +esac; AM_CONDITIONAL(USE_ESCHER, test x$use_escher = xtrue) AC_SUBST(PATH_TO_ESCHER) -dnl ----------------------------------------------------------- -dnl Build javah using ASM library -dnl ----------------------------------------------------------- -AC_ARG_WITH([asm], - AS_HELP_STRING([--with-asm=ABS.PATH], - [specify path to ASM jar for javah])) -case "$with_asm" in -"") - use_asm=false - ;; -"no") - use_asm=false - ;; -"yes") - AC_MSG_ERROR([Please supply an absolute path to ASM jar]) - ;; -*) - use_asm=true - PATH_TO_ASM=$with_asm - ;; -esac - -AM_CONDITIONAL(USE_ASM, test x$use_asm = xtrue) -AC_SUBST(PATH_TO_ASM) - dnl ----------------------------------------------------------- dnl Check if local socket support should be included. dnl ----------------------------------------------------------- @@ -864,11 +832,6 @@ AC_CONFIG_COMMANDS([gkeytool],[chmod 755 tools/gkeytool]) AC_CONFIG_COMMANDS([gjar],[chmod 755 tools/gjar]) AC_CONFIG_COMMANDS([gnative2ascii],[chmod 755 tools/gnative2ascii]) AC_CONFIG_COMMANDS([gserialver],[chmod 755 tools/gserialver]) - - if test "$use_asm" = true; then - AC_CONFIG_FILES([tools/gjavah]) - AC_CONFIG_COMMANDS([gjavah], [chmod 755 tools/gjavah]) - fi fi AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) @@ -880,3 +843,4 @@ cat ${srcdir}/lib/standard.omit.in > lib/standard.omit if test x$use_escher != xtrue; then echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit fi + diff --git a/native/jni/gconf-peer/Makefile.am b/native/jni/gconf-peer/Makefile.am index 8192ddc04..d88218326 100644 --- a/native/jni/gconf-peer/Makefile.am +++ b/native/jni/gconf-peer/Makefile.am @@ -5,8 +5,8 @@ libgconfpeer_la_SOURCES = GConfNativePeer.c libgconfpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \ $(top_builddir)/native/jni/classpath/jcl.lo -AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GTK_LIBS@ +AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GDK_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ -AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GTK_CFLAGS@ +AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@ -- cgit v1.2.1