Attachment #77319 for bug #89158

View | Details | Raw Unified | Return to bug 89158 | Differences between
Collapse All | Expand All




# 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 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.

  --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



  --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

 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;}

   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





#
# fill in compilation stuff
#

    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


#

#
# 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)


if test -z "$apache"; then
  a=b
elif test -r "${apr_incdir}/apr_thread_mutex.h"; then
  echo "Using Apache 2.0 configuration ${apache_conf}"

  plugins="$plugins apache2"

  i?86)
	CPU=i386
	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
	CFLAGS_JNI="-D_FILE_OFFSET_BITS=64"
	;;

  sparc*)

  x86_64)
	CPU=$target_cpu
	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
	CFLAGS_JNI="-D_FILE_OFFSET_BITS=64"
	;;

  *)


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*)

	;;

  *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
#

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

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

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

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

Return to bug 89158

Lines 469-475 Link Here

(-)resin-3.0.15.orig/configure (-176 / +7 lines)
469	# include <unistd.h>	469	# include <unistd.h>
470	#endif"	470	#endif"
471		471
472	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'	472	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'
473	ac_subst_files=''	473	ac_subst_files=''
474		474
475	# Initialize some variables set by options.	475	# Initialize some variables set by options.
Lines 1018-1024 Link Here
1018	--disable-libtool-lock avoid locking (might break parallel builds)	1018	--disable-libtool-lock avoid locking (might break parallel builds)
1019	--enable-64bit Enable 64 bit	1019	--enable-64bit Enable 64 bit
1020	--enable-linux-smp Compile with smp	1020	--enable-linux-smp Compile with smp
1021	--enable-jni Turn on jni
1022	--enable-ssl Turn on ssl	1021	--enable-ssl Turn on ssl
1023	--enable-debug Turn on debugging	1022	--enable-debug Turn on debugging
1024		1023
Lines 1043-1058 Link Here
1043		1042
1044	--with-apache-cflags=flags flags for compiling mod_caucho	1043	--with-apache-cflags=flags flags for compiling mod_caucho
1045		1044
1046	--with-java-home=DIR java home
1047
1048	--with-linux-src=DIR Linux src dir	1045	--with-linux-src=DIR Linux src dir
1049		1046
1050	--with-hardcore=DIR Linux src dir	1047	--with-hardcore=DIR Linux src dir
1051		1048
1052	--with-hardcore-cflags=flags Linux src dir	1049	--with-hardcore-cflags=flags Linux src dir
1053		1050
1054	--with-jni-include="-Idir -Idir" jni include string
1055
1056	--with-openssl=DIR Openssl directory	1051	--with-openssl=DIR Openssl directory
1057		1052
1058	--with-openssl-include=DIR Openssl include directory	1053	--with-openssl-include=DIR Openssl include directory
Lines 8512-8517 Link Here
8512	apache_exe="${apache_bin}/httpd"	8507	apache_exe="${apache_bin}/httpd"
8513	elif test -x "${apache_bin}/httpd2"; then	8508	elif test -x "${apache_bin}/httpd2"; then
8514	apache_exe="${apache_bin}/httpd2"	8509	apache_exe="${apache_bin}/httpd2"
		8510	elif test -x "${apache_bin}/apache"; then
		8511	apache_exe="${apache_bin}/apache"
		8512	elif test -x "${apache_bin}/apache2"; then
		8513	apache_exe="${apache_bin}/apache2"
8515	else	8514	else
8516	{ { echo "$as_me:$LINENO: error: Can't find Apache binary in directory ${apache_bin}" >&5	8515	{ { echo "$as_me:$LINENO: error: Can't find Apache binary in directory ${apache_bin}" >&5
8517	echo "$as_me: error: Can't find Apache binary in directory ${apache_bin}" >&2;}	8516	echo "$as_me: error: Can't find Apache binary in directory ${apache_bin}" >&2;}
Lines 8594-8599 Link Here
8594	apr_bin=`${apxs} -q APR_BINDIR 2> /dev/null`	8593	apr_bin=`${apxs} -q APR_BINDIR 2> /dev/null`
8595	if test -x "${apr_bin}/apr-config"; then	8594	if test -x "${apr_bin}/apr-config"; then
8596	apr_inc=`"${apr_bin}/apr-config" --includes`	8595	apr_inc=`"${apr_bin}/apr-config" --includes`
		8596	apr_incdir=`"${apr_bin}/apr-config" --includedir`
8597	APACHE_INC="${APACHE_INC} ${apr_inc}"	8597	APACHE_INC="${APACHE_INC} ${apr_inc}"
8598	fi	8598	fi
8599	fi	8599	fi
Lines 8602-8608 Link Here
8602		8602
8603		8603
8604		8604
8605
8606	#	8605	#
8607	# fill in compilation stuff	8606	# fill in compilation stuff
8608	#	8607	#
Lines 8624-8680 Link Here
8624	echo "Using shared library flags from ${apxs}"	8623	echo "Using shared library flags from ${apxs}"
8625	fi	8624	fi
8626	fi	8625	fi
8627	#
8628	# --with-java-home
8629	#
8630
8631	# Check whether --with-java-home or --without-java-home was given.
8632	if test "${with_java_home+set}" = set; then
8633	withval="$with_java_home"
8634
8635	JAVA_HOME=${withval}
8636
8637	fi;
8638
8639	if test -z "$JAVA_HOME"; then
8640	java=`which java 2>/dev/null`
8641	if test $? = "0"; then
8642	while test -h "$java"
8643	do
8644	head=`dirname $java`
8645	tail=`/bin/ls -l $java \| awk '{ print $NF; }'`
8646	if test -f "$tail"; then
8647	java=$tail
8648	else
8649	java=$head/$tail
8650	fi
8651	done
8652
8653	javabin=`dirname $java`
8654	JAVA_HOME=`cd $javabin/..; pwd`
8655
8656	# we're in $JAVA_HOME/jre
8657	if test -f "$JAVA_HOME/lib/rt.jar"; then
8658	JAVA_HOME=`cd $JAVA_HOME/..; pwd`
8659	elif test -d "/usr/java"; then
8660	JAVA_HOME=/usr/java
8661	elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
8662	JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
8663	fi
8664	elif test -d "/usr/java"; then
8665	JAVA_HOME=/usr/java
8666	elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
8667	JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
8668	fi
8669	fi
8670
8671	echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
8672		8626
8673	if test ! -d "$JAVA_HOME"; then
8674	{ { echo "$as_me:$LINENO: error: Can't find valid JAVA_HOME ${JAVA_HOME}" >&5
8675	echo "$as_me: error: Can't find valid JAVA_HOME ${JAVA_HOME}" >&2;}
8676	{ (exit 1); exit 1; }; }
8677	fi
8678		8627
8679		8628
8680	#	8629	#
Lines 8687-8717 Link Here
8687	#	8636	#
8688	# 64bit heuristics	8637	# 64bit heuristics
8689	#	8638	#
8690	echo -n "checking if Java is 64-bit... "
8691
8692	tmpname="/tmp/java$$.out"
8693
8694	$JAVA_HOME/bin/java -version 2> $tmpname
8695	grep "64-Bit" $tmpname 1> /dev/null
8696
8697	if test "$?" = "0"; then
8698	b64=true
8699	fi
8700
8701	$JAVA_HOME/bin/java -d64 -version 2> $tmpname
8702	grep "64-Bit" $tmpname 1> /dev/null
8703
8704	if test "$?" = "0"; then
8705	b64=true
8706	fi
8707
8708	if test -n "$b64"; then
8709	echo "yes"
8710	else
8711	echo "no"
8712	fi
8713
8714	rm -f $tmpname
8715		8639
8716	case "$target_cpu" in	8640	case "$target_cpu" in
8717	x86_64)	8641	x86_64)
Lines 8916-8922 Link Here
8916		8840
8917	if test -z "$apache"; then	8841	if test -z "$apache"; then
8918	a=b	8842	a=b
8919	elif test -r "${apache_include}/apr_thread_mutex.h"; then	8843	elif test -r "${apr_incdir}/apr_thread_mutex.h"; then
8920	echo "Using Apache 2.0 configuration ${apache_conf}"	8844	echo "Using Apache 2.0 configuration ${apache_conf}"
8921		8845
8922	plugins="$plugins apache2"	8846	plugins="$plugins apache2"
Lines 8976-8982 Link Here
8976	i?86)	8900	i?86)
8977	CPU=i386	8901	CPU=i386
8978	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"	8902	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
8979	CFLAGS_JNI="-D_FILE_OFFSET_BITS=64"
8980	;;	8903	;;
8981		8904
8982	sparc*)	8905	sparc*)
Lines 8991-8997 Link Here
8991	x86_64)	8914	x86_64)
8992	CPU=$target_cpu	8915	CPU=$target_cpu
8993	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"	8916	resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
8994	CFLAGS_JNI="-D_FILE_OFFSET_BITS=64"
8995	;;	8917	;;
8996		8918
8997	*)	8919	*)
Lines 9001-9019 Link Here
9001		8923
9002	case "$target_os" in	8924	case "$target_os" in
9003	linux*)	8925	linux*)
9004	jni_os=linux
9005	PROXY_LIBS='-lpthread'	8926	PROXY_LIBS='-lpthread'
9006	;;	8927	;;
9007		8928
9008	solaris)	8929	solaris)
9009	jni_os=solaris
9010	CFLAGS="$CFLAGS -D__SOLARIS__"	8930	CFLAGS="$CFLAGS -D__SOLARIS__"
9011	PROXY_LIBS='-lnsl -lsocket -lthread'	8931	PROXY_LIBS='-lnsl -lsocket -lthread'
9012	;;	8932	;;
9013		8933
9014	freebsd)	8934	freebsd)
9015	PROXY_LIBS='-lc_r'	8935	PROXY_LIBS='-lc_r'
9016	jni_os=freebsd
9017	;;	8936	;;
9018		8937
9019	darwin)	8938	darwin)
Lines 9023-9113 Link Here
9023	;;	8942	;;
9024		8943
9025	hpux)	8944	hpux)
9026	if test -r "$JAVA_HOME/include/hpux/jni_md.h"; then
9027	jni_os=hpux
9028	else
9029	jni_os=hp-ux
9030	fi
9031	;;	8945	;;
9032	esac	8946	esac
9033		8947
9034		8948
9035		8949
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045	#
9046	# --with-jni-include
9047	#
9048
9049	# Check whether --with-jni-include or --without-jni-include was given.
9050	if test "${with_jni_include+set}" = set; then
9051	withval="$with_jni_include"
9052
9053	JNI_INCLUDE=${withval}
9054	JNI="yes"
9055
9056	fi;
9057
9058	#
9059	# --enable-jni
9060	#
9061	# Check whether --enable-jni or --disable-jni was given.
9062	if test "${enable_jni+set}" = set; then
9063	enableval="$enable_jni"
9064	case "${enableval}" in
9065	yes) JNI=true ;;
9066	no) JNI="" ;;
9067	*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-jni" >&5
9068	echo "$as_me: error: bad value ${enableval} for --enable-jni" >&2;}
9069	{ (exit 1); exit 1; }; } ;;
9070	esac
9071	else
9072	JNI=""
9073	fi;
9074
9075	if test -n "$JNI_INCLUDE"; then
9076	JNI=yes
9077	elif test -r "$JAVA_HOME/include/jni_md.h"; then
9078	JNI_INCLUDE="-I$JAVA_HOME/include"
9079	JNI=yes
9080	echo "checking for JNI in $JAVA_HOME/include ... found"
9081	elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
9082	JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
9083	JNI=yes
9084	echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
9085	elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
9086	# Darwin
9087	echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
9088	JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
9089	JNI=yes
9090	else
9091	JNI=""
9092	{ echo "$as_me:$LINENO: WARNING: Can't find JNI directory ${JAVA_HOME}/include/$jni_os" >&5
9093	echo "$as_me: WARNING: Can't find JNI directory ${JAVA_HOME}/include/$jni_os" >&2;}
9094	fi
9095
9096	if test -r "$JAVA_HOME/include/jvmti.h"; then
9097	echo "Using JVMTI for class reloading"
9098
9099	CFLAGS="$CFLAGS -DHAS_JVMTI"
9100	fi
9101
9102	if test -n "$JNI"; then
9103	plugins="$plugins $resin_plugin resin_os"
9104	else
9105	echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
9106	fi
9107
9108
9109
9110
9111	#	8950	#
9112	# --enable-ssl	8951	# --enable-ssl
9113	#	8952	#
Lines 10119-10125 Link Here
10119	s,@apache_conf@,$apache_conf,;t t	9958	s,@apache_conf@,$apache_conf,;t t
10120	s,@apache_dir@,$apache_dir,;t t	9959	s,@apache_dir@,$apache_dir,;t t
10121	s,@apache_cflags@,$apache_cflags,;t t	9960	s,@apache_cflags@,$apache_cflags,;t t
10122	s,@JAVA_HOME@,$JAVA_HOME,;t t
10123	s,@resin_home@,$resin_home,;t t	9961	s,@resin_home@,$resin_home,;t t
10124	s,@LINUX_SRC@,$LINUX_SRC,;t t	9962	s,@LINUX_SRC@,$LINUX_SRC,;t t
10125	s,@HARDCORE_CFLAGS@,$HARDCORE_CFLAGS,;t t	9963	s,@HARDCORE_CFLAGS@,$HARDCORE_CFLAGS,;t t
Lines 10132-10142 Link Here
10132	s,@LIBS_SHLIB@,$LIBS_SHLIB,;t t	9970	s,@LIBS_SHLIB@,$LIBS_SHLIB,;t t
10133	s,@PROXY_LIBS@,$PROXY_LIBS,;t t	9971	s,@PROXY_LIBS@,$PROXY_LIBS,;t t
10134	s,@SSL_LIBS@,$SSL_LIBS,;t t	9972	s,@SSL_LIBS@,$SSL_LIBS,;t t
10135	s,@JNI@,$JNI,;t t
10136	s,@JNI_INCLUDE@,$JNI_INCLUDE,;t t
10137	s,@INCLUDES@,$INCLUDES,;t t	9973	s,@INCLUDES@,$INCLUDES,;t t
10138	s,@CFLAGS_OPENSSL@,$CFLAGS_OPENSSL,;t t	9974	s,@CFLAGS_OPENSSL@,$CFLAGS_OPENSSL,;t t
10139	s,@CFLAGS_JNI@,$CFLAGS_JNI,;t t
10140	s,@SSL_OBJ@,$SSL_OBJ,;t t	9975	s,@SSL_OBJ@,$SSL_OBJ,;t t
10141	s,@PERL@,$PERL,;t t	9976	s,@PERL@,$PERL,;t t
10142	s,@LIBOBJS@,$LIBOBJS,;t t	9977	s,@LIBOBJS@,$LIBOBJS,;t t
Lines 11345-11351 Link Here
11345	s,@apache_conf@,$apache_conf,;t t	11180	s,@apache_conf@,$apache_conf,;t t
11346	s,@apache_dir@,$apache_dir,;t t	11181	s,@apache_dir@,$apache_dir,;t t
11347	s,@apache_cflags@,$apache_cflags,;t t	11182	s,@apache_cflags@,$apache_cflags,;t t
11348	s,@JAVA_HOME@,$JAVA_HOME,;t t
11349	s,@resin_home@,$resin_home,;t t	11183	s,@resin_home@,$resin_home,;t t
11350	s,@LINUX_SRC@,$LINUX_SRC,;t t	11184	s,@LINUX_SRC@,$LINUX_SRC,;t t
11351	s,@HARDCORE_CFLAGS@,$HARDCORE_CFLAGS,;t t	11185	s,@HARDCORE_CFLAGS@,$HARDCORE_CFLAGS,;t t
Lines 11358-11368 Link Here
11358	s,@LIBS_SHLIB@,$LIBS_SHLIB,;t t	11192	s,@LIBS_SHLIB@,$LIBS_SHLIB,;t t
11359	s,@PROXY_LIBS@,$PROXY_LIBS,;t t	11193	s,@PROXY_LIBS@,$PROXY_LIBS,;t t
11360	s,@SSL_LIBS@,$SSL_LIBS,;t t	11194	s,@SSL_LIBS@,$SSL_LIBS,;t t
11361	s,@JNI@,$JNI,;t t
11362	s,@JNI_INCLUDE@,$JNI_INCLUDE,;t t
11363	s,@INCLUDES@,$INCLUDES,;t t	11195	s,@INCLUDES@,$INCLUDES,;t t
11364	s,@CFLAGS_OPENSSL@,$CFLAGS_OPENSSL,;t t	11196	s,@CFLAGS_OPENSSL@,$CFLAGS_OPENSSL,;t t
11365	s,@CFLAGS_JNI@,$CFLAGS_JNI,;t t
11366	s,@SSL_OBJ@,$SSL_OBJ,;t t	11197	s,@SSL_OBJ@,$SSL_OBJ,;t t
11367	s,@PERL@,$PERL,;t t	11198	s,@PERL@,$PERL,;t t
11368	s,@LIBOBJS@,$LIBOBJS,;t t	11199	s,@LIBOBJS@,$LIBOBJS,;t t