Changeset 3276

Timestamp:

Feb 4, 2013, 11:08:03 AM (12 years ago)

Author:

gah

Message:

fix java search, fix error message for logger

Location:

trunk

Files:

• configure (modified) (1 diff)
• src/core/config.h.in (modified) (3 diffs)

trunk/configure

@@ -8615 +8615 @@
    ${JAVA_HOME} \
    /apps/java/jdk1.6* \
-   /usr/lib/jvm/java-6-openjdk \
-   /usr/lib/jvm/icedtea-6 \
-   /usr/lib/jvm/*sun-1.6* \
    /opt/sun-jdk-1.6* \
-   /usr/lib/jvm/icedtea-7 \
    /opt/icedtea6-* \
    /opt/sun-jdk-1.5* \
-   /usr/lib/jvm/*sun-1.5*
+   /usr/lib/jvm/*sun* \
+   /usr/lib/jvm/*icedtea* \
+   /usr/lib/jvm/*openjdk*
   do
     if test -r "${d}/include/jni.h" ; then

trunk/src/core/config.h.in

@@ -1 +1 @@
 /* src/core/config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
 
 /* Build rappture with ffmpeg widgets */
@@ -217 +220 @@
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
@@ -235 +241 @@
 #undef STDC_HEADERS
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif