/[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.8 by gnu_andrew, Wed Mar 23 21:00:02 2005 UTC revision 1.43.2.9 by gnu_andrew, Thu Apr 28 23:00:09 2005 UTC
# Line 43  AC_ARG_ENABLE([jni], Line 43  AC_ARG_ENABLE([jni],
43  AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test "x${COMPILE_JNI}" = xyes)  AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test "x${COMPILE_JNI}" = xyes)
44    
45  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
46    dnl Enable core JNI libraries (enabled by default)
47    dnl -----------------------------------------------------------
48    AC_ARG_ENABLE([core-jni],
49                  [AS_HELP_STRING(--enable-core-jni,
50                                  compile JNI sources for core [default=yes])],
51                  [case "${enableval}" in
52                    yes) COMPILE_CORE_JNI=yes; COMPILE_JAVA=yes ;;
53                    no) COMPILE_CORE_JNI=no ;;
54                    *) COMPILE_CORE_JNI=yes; COMPILE_JAVA=yes ;;
55                  esac],
56                  [COMPILE_CORE_JNI=yes])
57    AM_CONDITIONAL(CREATE_CORE_JNI_LIBRARIES, test "x${COMPILE_CORE_JNI}" = xyes)
58    
59    dnl -----------------------------------------------------------
60  dnl Whether to compile with -Werror or not (enabled by default)  dnl Whether to compile with -Werror or not (enabled by default)
61  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
62  AC_ARG_ENABLE([Werror],  AC_ARG_ENABLE([Werror],
# Line 55  AC_ARG_ENABLE([Werror], Line 69  AC_ARG_ENABLE([Werror],
69                [ENABLE_WERROR=no])                [ENABLE_WERROR=no])
70    
71  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
72    dnl Default AWT toolkit
73    dnl -----------------------------------------------------------
74    AC_ARG_ENABLE(default-toolkit,
75      AS_HELP_STRING([--enable-default-toolkit],
76                     [fully qualified class name of default AWT toolkit]))
77    default_toolkit=$enable_default_tookit
78    if test "$default_toolkit" = ""; then
79       default_toolkit=gnu.java.awt.peer.gtk.GtkToolkit
80    fi
81    AC_SUBST(default_toolkit)
82    
83    dnl -----------------------------------------------------------
84  dnl Native libxml/xslt library (disabled by default)  dnl Native libxml/xslt library (disabled by default)
85  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
86  AC_ARG_ENABLE([xmlj],  AC_ARG_ENABLE([xmlj],
# Line 134  if test "x${COMPILE_JNI}" = xyes; then Line 160  if test "x${COMPILE_JNI}" = xyes; then
160    
161    dnl Checking sizeof void * is needed for fdlibm to work properly on ppc64,    dnl Checking sizeof void * is needed for fdlibm to work properly on ppc64,
162    dnl at least.    dnl at least.
163    AC_CHECK_SIZEOF(void *)    AC_COMPILE_CHECK_SIZEOF(void *)
164    
165    dnl Checking for endianess.    dnl Checking for endianess.
166    AC_C_BIGENDIAN    AC_C_BIGENDIAN_CROSS
167        
168    dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.    dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
169    dnl On that system, sys/ioctl.h will not include sys/filio.h unless    dnl On that system, sys/ioctl.h will not include sys/filio.h unless
170    dnl BSD_COMP is defined; just including sys/filio.h is simpler.    dnl BSD_COMP is defined; just including sys/filio.h is simpler.
   AC_CHECK_HEADERS([unistd.h sys/types.h sys/config.h sys/ioctl.h asm/ioctls.h])  
   AC_CHECK_HEADERS([inttypes.h stdint.h utime.h sys/utime.h sys/filio.h])  
   AC_CHECK_HEADERS([sys/time.h])  
   AC_CHECK_HEADERS([sys/select.h])  
171    dnl Check for crt_externs.h on Darwin.    dnl Check for crt_externs.h on Darwin.
172    AC_CHECK_HEADERS([crt_externs.h])    AC_CHECK_HEADERS([unistd.h sys/types.h sys/config.h sys/ioctl.h \
173                        asm/ioctls.h \
174                        inttypes.h stdint.h utime.h sys/utime.h sys/filio.h \
175                        sys/time.h \
176                        sys/select.h \
177                        crt_externs.h])
178    
179    AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))    AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
180    AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))    AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
181    AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))    AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
182    AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))    AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
183    
184    AC_CHECK_FUNCS([ftruncate fsync select])    AC_CHECK_FUNCS([ftruncate fsync select \
185    AC_CHECK_FUNCS([gethostname socket strerror fork pipe execve open close])                    gethostname socket strerror fork pipe execve open close \
186    AC_CHECK_FUNCS([lseek fstat read write htonl memset htons connect])                    lseek fstat read write htonl memset htons connect \
187    AC_CHECK_FUNCS([getsockname sizeof getpeername bind listen accept])                    getsockname getpeername bind listen accept \
188    AC_CHECK_FUNCS([recvfrom send sendto setsockopt getsockopt time mktime])                    recvfrom send sendto setsockopt getsockopt time mktime \
189    AC_CHECK_FUNCS([localtime_r])                    localtime_r \
190    AC_CHECK_FUNCS([strerror_r])                    strerror_r])
191    
192    AC_HEADER_TIME    AC_HEADER_TIME
193    AC_STRUCT_TM    AC_STRUCT_TM
# Line 190  if test "x${COMPILE_JNI}" = xyes; then Line 217  if test "x${COMPILE_JNI}" = xyes; then
217    
218    AC_C_CONST    AC_C_CONST
219    
220    dnl FIXME - does not allow cross compiling    dnl See if we HAVE_ICONV, how ICONV_CONST is set and LTLIBICONV
221    AC_C_BIGENDIAN    AM_ICONV
222    
223    dnl When using gcc we want warnings, lots of warnings :-)    dnl When using gcc we want warnings, lots of warnings :-)
224    if test "x${GCC}" = xyes; then    if test "x${GCC}" = xyes; then
# Line 218  if test "x${COMPILE_JNI}" = xyes; then Line 245  if test "x${COMPILE_JNI}" = xyes; then
245    fi    fi
246    
247    dnl Check for libxml and libxslt libraries (when xmlj is enabled).    dnl Check for libxml and libxslt libraries (when xmlj is enabled).
248    if test "x${COMPILE_XMLJ}" = xyes    if test "x${COMPILE_XMLJ}" = xyes; then
   then  
249      PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.6.8)      PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.6.8)
250      PKG_CHECK_MODULES(XSLT, libxslt >= 1.1.11)      PKG_CHECK_MODULES(XSLT, libxslt >= 1.1.11)
251      AC_SUBST(XML_LIBS)      AC_SUBST(XML_LIBS)
# Line 243  if test "x${COMPILE_JNI}" = xyes; then Line 269  if test "x${COMPILE_JNI}" = xyes; then
269       AC_SUBST(GTK_LIBS)       AC_SUBST(GTK_LIBS)
270    fi    fi
271    
272    if test "x${enable_gtk_cairo}" = xyes    if test "x${enable_gtk_cairo}" = xyes; then
   then  
273      PKG_CHECK_MODULES(CAIRO, cairo)      PKG_CHECK_MODULES(CAIRO, cairo)
274      PKG_CHECK_MODULES(PANGOFT2, pangoft2)      PKG_CHECK_MODULES(PANGOFT2, pangoft2)
275    fi    fi
# Line 274  if test "x${COMPILE_JNI}" = xyes; then Line 299  if test "x${COMPILE_JNI}" = xyes; then
299      AC_MSG_WARN("no, using x86-linux-gnu")      AC_MSG_WARN("no, using x86-linux-gnu")
300    fi    fi
301    ac_sources="include/jni_md-${target_cpu}-${target_os}.h"    ac_sources="include/jni_md-${target_cpu}-${target_os}.h"
302  ac_dests="include/jni_md.h"    ac_dests="include/jni_md.h"
303  while test -n "$ac_sources"; do    while test -n "$ac_sources"; do
304    set $ac_dests; ac_dest=$1; shift; ac_dests=$*      set $ac_dests; ac_dest=$1; shift; ac_dests=$*
305    set $ac_sources; ac_source=$1; shift; ac_sources=$*      set $ac_sources; ac_source=$1; shift; ac_sources=$*
306    ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"      ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
307  done    done
308  AC_CONFIG_LINKS([$ac_config_links_1])    AC_CONFIG_LINKS([$ac_config_links_1])
309  fi  fi
310    
311  CLASSPATH_FIND_JAVAC  CLASSPATH_FIND_JAVAC

Legend:
Removed from v.1.43.2.8  
changed lines
  Added in v.1.43.2.9

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