jfclere 01/11/12 10:02:01 Modified: webapp configure.in Log: Prevent in configure mixing native cc and gcc on Solaris. In apache-1.3 it was causing unresolved __lshrdi3 when loading mod_webapp.so In apache-2.0 it was not compiling. Revision Changes Path 1.47 +25 -1 jakarta-tomcat-connectors/webapp/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- configure.in 2001/11/01 22:20:51 1.46 +++ configure.in 2001/11/12 18:02:01 1.47 @@ -58,7 +58,7 @@ dnl -------------------------------------------------------------------------- dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]> dnl Author Jon S. Stevens <mailto:[EMAIL PROTECTED]> -dnl Version $Id: configure.in,v 1.46 2001/11/01 22:20:51 pier Exp $ +dnl Version $Id: configure.in,v 1.47 2001/11/12 18:02:01 jfclere Exp $ dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- @@ -509,6 +509,9 @@ APR_LIBDIR="${TGTDIR}/lib" TARGET="${TARGET} apr" LIBTOOL="${APR_SRCDIR}/libtool" + eval `${GREP} "^CC=" ${APR_VARFIL} | ${SED} "s/^CC=/APR_CC=/"` +else + APR_CC="${CC}" fi dnl -------------------------------------------------------------------------- @@ -524,6 +527,27 @@ AC_MSG_RESULT([error]) AC_MSG_ERROR([Cannot find required APRVARS file]) fi + +dnl Check that we are not mixing native and gnu compilers +dnl on the platfroms that do not support it. + +eval `${GREP} "^NM=" ${LIBTOOL}` +gnu_cc=`${APR_CC} --help | ${GREP} gnu` +if ${TEST} ! -z "${gnu_cc}" +then + APACHE_DIR=`${APXS} -q SBINDIR` + is_apache_gcc="Yes" + case $host in + sparc-sun-solaris2.8) + is_apache_gcc=`${NM} ${APACHE_DIR}/httpd | ${GREP} __lshrdi3` + ;; + esac + if ${TEST} -z "${is_apache_gcc}" + then + AC_MSG_ERROR([Cannot mix gcc and native cc]) + fi +fi + AC_MSG_RESULT([ok]) eval `${CAT} ${APR_VARFIL} | ${GREP} "EXTRA_" | ${SED} "s/EXTRA_/APR_/g"` AC_SUBST(APR_CFLAGS)
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
