[patch] files/3.0.17/resin-gentoo_fix.patch

resin-gentoo_fix.patch (text/plain), 9.93 KB, created by Anatoly Shipitsin on 2006-01-17 00:24:55 UTC

diff -ruN resin-3.0.15.orig/configure resin-3.0.15/configure
--- resin-3.0.15.orig/configure	2005-11-27 11:52:52.335237000 +0500
+++ resin-3.0.15/configure	2005-11-27 16:48:01.000000000 +0500
@@ -469,7 +469,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE FULL_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S ECHO RANLIB ac_ct_RANLIB LIBTOOL LTFLAGS LIBTOOL_SCRIPT SH_LIBTOOL LTCFLAGS plugins LD APACHE_INC apache_libexec apache_conf apache_dir apache_cflags JAVA_HOME resin_home LINUX_SRC HARDCORE_CFLAGS CPU OS SO CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB PROXY_LIBS SSL_LIBS JNI JNI_INCLUDE INCLUDES CFLAGS_OPENSSL CFLAGS_JNI SSL_OBJ PERL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE FULL_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S ECHO RANLIB ac_ct_RANLIB LIBTOOL LTFLAGS LIBTOOL_SCRIPT SH_LIBTOOL LTCFLAGS plugins LD APACHE_INC apache_libexec apache_conf apache_dir apache_cflags resin_home LINUX_SRC HARDCORE_CFLAGS CPU OS SO CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB PROXY_LIBS SSL_LIBS INCLUDES CFLAGS_OPENSSL SSL_OBJ PERL LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1018,7 +1018,6 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-64bit    Enable 64 bit
   --enable-linux-smp    Compile with smp
-  --enable-jni    Turn on jni
   --enable-ssl    Turn on ssl
   --enable-debug    Turn on debugging
 
@@ -1043,16 +1042,12 @@
 
   --with-apache-cflags=flags  flags for compiling mod_caucho
 
-  --with-java-home=DIR  java home
-
   --with-linux-src=DIR  Linux src dir
 
   --with-hardcore=DIR  Linux src dir
 
   --with-hardcore-cflags=flags  Linux src dir
 
-  --with-jni-include="-Idir -Idir"  jni include string
-
   --with-openssl=DIR  Openssl directory
 
   --with-openssl-include=DIR  Openssl include directory
@@ -8512,6 +8507,10 @@
  apache_exe="${apache_bin}/httpd"
 elif test -x "${apache_bin}/httpd2"; then
  apache_exe="${apache_bin}/httpd2"
+elif test -x "${apache_bin}/apache"; then
+ apache_exe="${apache_bin}/apache"
+elif test -x "${apache_bin}/apache2"; then
+ apache_exe="${apache_bin}/apache2"
 else
   { { echo "$as_me:$LINENO: error: Can't find Apache binary in directory ${apache_bin}" >&5
 echo "$as_me: error: Can't find Apache binary in directory ${apache_bin}" >&2;}
@@ -8594,6 +8593,7 @@
    apr_bin=`${apxs} -q APR_BINDIR 2> /dev/null`
    if test -x "${apr_bin}/apr-config"; then
      apr_inc=`"${apr_bin}/apr-config" --includes`
+     apr_incdir=`"${apr_bin}/apr-config" --includedir`
      APACHE_INC="${APACHE_INC} ${apr_inc}"
    fi
 fi
@@ -8602,7 +8602,6 @@
 
 
 
-
 #
 # fill in compilation stuff
 #
@@ -8624,57 +8623,7 @@
     echo "Using shared library flags from ${apxs}"
   fi
 fi
-#
-# --with-java-home
-#
-
-# Check whether --with-java-home or --without-java-home was given.
-if test "${with_java_home+set}" = set; then
-  withval="$with_java_home"
-
-JAVA_HOME=${withval}
-
-fi;
-
-if test -z "$JAVA_HOME"; then
-  java=`which java 2>/dev/null`
-  if test $? = "0"; then
-    while test -h "$java"
-    do
-      head=`dirname $java`
-      tail=`/bin/ls -l $java | awk '{ print $NF; }'`
-      if test -f "$tail"; then
-        java=$tail
-      else
-        java=$head/$tail
-      fi
-    done
-
-    javabin=`dirname $java`
-    JAVA_HOME=`cd $javabin/..; pwd`
-
-    # we're in $JAVA_HOME/jre
-    if test -f "$JAVA_HOME/lib/rt.jar"; then
-      JAVA_HOME=`cd $JAVA_HOME/..; pwd`
-    elif test -d "/usr/java"; then
-      JAVA_HOME=/usr/java
-    elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
-      JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
-    fi
-  elif test -d "/usr/java"; then
-    JAVA_HOME=/usr/java
-  elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
-    JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
-  fi
-fi
-
-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
 
-if test ! -d "$JAVA_HOME"; then
-  { { echo "$as_me:$LINENO: error: Can't find valid JAVA_HOME ${JAVA_HOME}" >&5
-echo "$as_me: error: Can't find valid JAVA_HOME ${JAVA_HOME}" >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 
 #
@@ -8687,31 +8636,6 @@
 #
 # 64bit heuristics
 #
-echo -n "checking if Java is 64-bit... "
-
-tmpname="/tmp/java$$.out"
-
-$JAVA_HOME/bin/java -version 2> $tmpname
-grep "64-Bit" $tmpname 1> /dev/null
-
-if test "$?" = "0"; then
-   b64=true
-fi
-
-$JAVA_HOME/bin/java -d64 -version 2> $tmpname
-grep "64-Bit" $tmpname 1> /dev/null
-
-if test "$?" = "0"; then
-   b64=true
-fi
-
-if test -n "$b64"; then
-   echo "yes"
-else
-   echo "no"
-fi
-
-rm -f $tmpname
 
 case "$target_cpu" in
   x86_64)
@@ -8916,7 +8840,7 @@
 
 if test -z "$apache"; then
   a=b
-elif test -r "${apache_include}/apr_thread_mutex.h"; then
+elif test -r "${apr_incdir}/apr_thread_mutex.h"; then
   echo "Using Apache 2.0 configuration ${apache_conf}"
 
   plugins="$plugins apache2"
@@ -8976,7 +8900,6 @@
   i?86)
 	CPU=i386
 	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
-	CFLAGS_JNI="-D_FILE_OFFSET_BITS=64"
 	;;
 
   sparc*)
@@ -8991,7 +8914,6 @@
   x86_64)
 	CPU=$target_cpu
 	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
-	CFLAGS_JNI="-D_FILE_OFFSET_BITS=64"
 	;;
 
   *)
@@ -9001,19 +8923,16 @@
 
 case "$target_os" in
   linux*)
-	jni_os=linux
         PROXY_LIBS='-lpthread'
 	;;
 
   *solaris*)
-	jni_os=solaris
 	CFLAGS="$CFLAGS -D__SOLARIS__"
 	PROXY_LIBS='-lnsl -lsocket -lthread'
 	;;
 
   *freebsd*)
 	PROXY_LIBS='-lc_r'
-        jni_os=freebsd
 	;;
 
   *darwin*)
@@ -9023,91 +8942,11 @@
 	;;
 
   *hpux*)
-	if test -r "$JAVA_HOME/include/hpux/jni_md.h"; then
-	  jni_os=hpux
-        else
-	  jni_os=hp-ux
-        fi
 	;;
 esac
 
 
 
-
-
-
-
-
-
-
-
-
-#
-# --with-jni-include
-#
-
-# Check whether --with-jni-include or --without-jni-include was given.
-if test "${with_jni_include+set}" = set; then
-  withval="$with_jni_include"
-
-JNI_INCLUDE=${withval}
-JNI="yes"
-
-fi;
-
-#
-# --enable-jni
-#
-# Check whether --enable-jni or --disable-jni was given.
-if test "${enable_jni+set}" = set; then
-  enableval="$enable_jni"
-  case "${enableval}" in
- yes) JNI=true ;;
- no)  JNI="" ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-jni" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-jni" >&2;}
-   { (exit 1); exit 1; }; } ;;
- esac
-else
-  JNI=""
-fi;
-
-if test -n "$JNI_INCLUDE"; then
-  JNI=yes
-elif test -r "$JAVA_HOME/include/jni_md.h"; then
-  JNI_INCLUDE="-I$JAVA_HOME/include"
-  JNI=yes
-  echo "checking for JNI in $JAVA_HOME/include ... found"
-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
-  JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
-  JNI=yes
-  echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
-  # Darwin
-  echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
-  JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
-  JNI=yes
-else
-  JNI=""
-  { echo "$as_me:$LINENO: WARNING: Can't find JNI directory ${JAVA_HOME}/include/$jni_os" >&5
-echo "$as_me: WARNING: Can't find JNI directory ${JAVA_HOME}/include/$jni_os" >&2;}
-fi
-
-if test -r "$JAVA_HOME/include/jvmti.h"; then
-  echo "Using JVMTI for class reloading"
-
-  CFLAGS="$CFLAGS -DHAS_JVMTI"
-fi
-
-if test -n "$JNI"; then
-  plugins="$plugins $resin_plugin resin_os"
-else
-  echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
-fi
-
-
-
-
 #
 # --enable-ssl
 #
@@ -10119,7 +9958,6 @@
 s,@apache_conf@,$apache_conf,;t t
 s,@apache_dir@,$apache_dir,;t t
 s,@apache_cflags@,$apache_cflags,;t t
-s,@JAVA_HOME@,$JAVA_HOME,;t t
 s,@resin_home@,$resin_home,;t t
 s,@LINUX_SRC@,$LINUX_SRC,;t t
 s,@HARDCORE_CFLAGS@,$HARDCORE_CFLAGS,;t t
@@ -10132,11 +9970,8 @@
 s,@LIBS_SHLIB@,$LIBS_SHLIB,;t t
 s,@PROXY_LIBS@,$PROXY_LIBS,;t t
 s,@SSL_LIBS@,$SSL_LIBS,;t t
-s,@JNI@,$JNI,;t t
-s,@JNI_INCLUDE@,$JNI_INCLUDE,;t t
 s,@INCLUDES@,$INCLUDES,;t t
 s,@CFLAGS_OPENSSL@,$CFLAGS_OPENSSL,;t t
-s,@CFLAGS_JNI@,$CFLAGS_JNI,;t t
 s,@SSL_OBJ@,$SSL_OBJ,;t t
 s,@PERL@,$PERL,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
@@ -11345,7 +11180,6 @@
 s,@apache_conf@,$apache_conf,;t t
 s,@apache_dir@,$apache_dir,;t t
 s,@apache_cflags@,$apache_cflags,;t t
-s,@JAVA_HOME@,$JAVA_HOME,;t t
 s,@resin_home@,$resin_home,;t t
 s,@LINUX_SRC@,$LINUX_SRC,;t t
 s,@HARDCORE_CFLAGS@,$HARDCORE_CFLAGS,;t t
@@ -11358,11 +11192,8 @@
 s,@LIBS_SHLIB@,$LIBS_SHLIB,;t t
 s,@PROXY_LIBS@,$PROXY_LIBS,;t t
 s,@SSL_LIBS@,$SSL_LIBS,;t t
-s,@JNI@,$JNI,;t t
-s,@JNI_INCLUDE@,$JNI_INCLUDE,;t t
 s,@INCLUDES@,$INCLUDES,;t t
 s,@CFLAGS_OPENSSL@,$CFLAGS_OPENSSL,;t t
-s,@CFLAGS_JNI@,$CFLAGS_JNI,;t t
 s,@SSL_OBJ@,$SSL_OBJ,;t t
 s,@PERL@,$PERL,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t