From f95a098686627f978b8409419518e0dbd10b3622 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 21 May 2004 07:25:39 +0000 Subject: 2004-05-21 Michael Koch * acinclude.m4 (CLASSPATH_WITH_INCLUDEDIR): Removed. * configure.ac (EXTRA_INCLUDES): Removed. (AM_CPPFLAGS): New variable to store needed includes. * native/fdlibm/Makefile.am (INCLUDES): Removed. * native/jni/classpath/Makefile.am (INCLUDES): Removed. * native/jni/gtk-peer/Makefile.am: Use libgtkpeer_la_CPPFLAGS instead of INCLUDES. * native/jni/java-awt/Makefile.am (INCLUDES): Removed. * native/jni/java-io/Makefile.am (INCLUDES): Removed. * native/jni/java-lang/Makefile.am: Use libjavalang_la_CFLAGS and libjavalangreflect_la_CFLAGS instead of INCLUDES. * native/jni/java-net/Makefile.am (INCLUDES): Removed. * native/jni/java-nio/Makefile.am (INCLUDES): Removed. * native/jni/java-util/Makefile.am (INCLUDES): Removed. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c79735ec1..05f3872bd 100644 --- a/configure.ac +++ b/configure.ac @@ -143,12 +143,12 @@ fi CLASSPATH_WITH_JAVAH -CLASSPATH_WITH_INCLUDEDIR - dnl ----------------------------------------------------------- dnl Add the include files for the native abstraction layer. dnl ----------------------------------------------------------- -EXTRA_INCLUDES="${EXTRA_INCLUDES} -I\$(top_srcdir)/native/target/Linux -I\$(top_srcdir)/native/target/generic" +AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/native/jni/classpath" +AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/native/target/Linux -I\$(top_srcdir)/native/target/generic" +AC_SUBST(AM_CPPFLAGS) dnl ----------------------------------------------------------- if test "x${COMPILE_JNI}" = xyes; then -- cgit v1.2.1