| configure.ac (1e1ac450) | configure.ac (b12514e1) |
|---|---|
| 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 2919 unchanged lines hidden (view full) --- 2928 fi 2929 if test "$_os" = "WINNT"; then 2930 if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then 2931 JAVAINTERPRETER="${JAVAINTERPRETER}.exe" 2932 fi 2933 JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` 2934 JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` 2935 elif test "$_os" = "Darwin"; then | 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 2919 unchanged lines hidden (view full) --- 2928 fi 2929 if test "$_os" = "WINNT"; then 2930 if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then 2931 JAVAINTERPRETER="${JAVAINTERPRETER}.exe" 2932 fi 2933 JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` 2934 JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` 2935 elif test "$_os" = "Darwin"; then |
| 2936 dnl HACK: There currently is only a 32 bit version of OOo for Mac OS X, 2937 dnl and Tiger java complains about -d32 while Snow Leopard java needs it 2938 dnl to run in 32 bit mode and be able to load OOo jnilibs: 2939 AC_MSG_CHECKING([whether to pass -d32 to Java interpreter]) 2940 if "$JAVAINTERPRETER" -d32 >&5 2>&5; then 2941 AC_MSG_RESULT([yes]) 2942 JAVAIFLAGS=-d32 2943 else 2944 AC_MSG_RESULT([no]) 2945 fi | 2936 JAVAIFLAGS="" |
| 2946 fi 2947fi 2948 2949dnl =================================================================== 2950dnl Checks for JDK. 2951dnl =================================================================== 2952if test "$SOLAR_JAVA" != ""; then 2953 _gij_longver=0 --- 4343 unchanged lines hidden --- | 2937 fi 2938fi 2939 2940dnl =================================================================== 2941dnl Checks for JDK. 2942dnl =================================================================== 2943if test "$SOLAR_JAVA" != ""; then 2944 _gij_longver=0 --- 4343 unchanged lines hidden --- |