Hi,
I have committed it. Note that the --disable-shared MUST NOT be removed
otherwise libtool uses the dynamic libraries and we want it to use the static
ones.
Cheers
Jean-frederic
Ryan Bloom wrote:
>
> > > > LOCAL_HEADER([Configuring APR])
> > > > LOCAL_FILTEREXEC(
> > > > - [./configure --enable-static --disable-shared --disable-threads],
> > > > + [./configure --enable-static --disable-threads],
> > > > ["APR configure"])
> > > > if ${TEST} "${ret}" -ne "0"
> > > > then
> > >
> > > Hmm... I'd like to rely on the APR code coming with Apache 2.0 instead of
> > > building our local copy with Apache 2.0... (I'll see what I can figure
> > > out, hoping that 2.0 works on my OS/X box :)
> >
> > Oh, if that's what you want to do, I can make that happen. Give me five
> > minutes, and you'll have a patch. :-)
>
> Sorry, I got called into a meeting, so this took a little bit longer than I wanted it
> to. Here is a patch that stops us from building APR, and we just use the one
> from Apache 2.0.
>
> Index: Makefile.in
> ===================================================================
> RCS file: /home/cvspublic/jakarta-tomcat-connectors/webapp/Makefile.in,v
> retrieving revision 1.16
> diff -u -d -b -w -u -r1.16 Makefile.in
> --- Makefile.in 2001/08/31 10:26:24 1.16
> +++ Makefile.in 2001/08/31 20:36:29
> @@ -70,11 +70,11 @@
> config.log \
> config.status
>
> -all: apr-all local-all
> +all: @APR_BUILD@ local-all
>
> install: local-install
>
> -clean: apr-clean local-clean
> +clean: @APR_CLEAN@ local-clean
>
> distclean: clean
> @$(ECHO) ""
> Index: configure.in
> ===================================================================
> RCS file: /home/cvspublic/jakarta-tomcat-connectors/webapp/configure.in,v
> retrieving revision 1.24
> diff -u -d -b -w -u -r1.24 configure.in
> --- configure.in 2001/08/31 10:26:24 1.24
> +++ configure.in 2001/08/31 20:36:29
> @@ -210,15 +210,21 @@
> APA=`${GREP} STANDARD20 ${APXS}`
> if ${TEST} -z "$APA" ; then
> TARGET="${SRCDIR}/apache-1.3"
> + APR_BUILD="apr-all"
> + APR_CLEAN="apr-clean"
> makefile="apache-1.3/Makefile"
> else
> TARGET="${SRCDIR}/apache-2.0"
> + APR_BUILD=""
> + APR_CLEAN=""
> makefile="apache-2.0/Makefile"
> fi
> AC_MSG_RESULT([setting target module to... ${TARGET}])
> ]
> )
> AC_SUBST(TARGET)
> +AC_SUBST(APR_BUILD)
> +AC_SUBST(APR_CLEAN)
>
> dnl --------------------------------------------------------------------------
> dnl Process the --with-apr=... command line argument
> @@ -226,10 +232,16 @@
> AC_MSG_CHECKING([APR directory])
> AC_ARG_WITH(apr,
> [ --with-apr=DIR where the APR sources can be found.],
> - APRDIR="${withval}",
> - APRDIR="${SRCDIR}/apr"
> + APRDIR="${withval}"
> )
>
> +if ${TEST} -z "${APA}" -a -z "${APRDIR}" ; then
> + APRDIR="{SRCDIR}/apr"
> +else
> + APRDIR="${APXS_PREFIX}"
> +fi
> +
> +if ${TEST} -z "${APA}" ; then
> if ${TEST} ! -d "${APRDIR}" ; then
> AC_MSG_ERROR([Cannot find APR sources directory \"${APRDIR}\"])
> fi
> @@ -267,6 +279,9 @@
> AC_MSG_ERROR([APR configure script terminated with error code ${ret}])
> fi
> cd ${curdir}
> +else
> + AC_MSG_RESULT(Using APR from Apache build)
> +fi
>
> dnl --------------------------------------------------------------------------
> dnl Retrieving APR default values
> @@ -275,19 +290,29 @@
>
> if ${TEST} ! -f ${APRDIR}/APRVARS
> then
> + if ${TEST} "${APA}" ; then
> + LIBDIR="/lib"
> + else
> AC_MSG_RESULT([error])
> AC_MSG_ERROR([Cannot find APR defaults in ${APRDIR}/APRVARS])
> fi
> +else
> + LIBDIR=""
> +fi
>
> if ${TEST} ! -x ${APRDIR}/libtool
> then
> + if ${TEST} "${APA}" ; then
> + LIBTOOL="${APXS_PREFIX}/build/libtool"
> + else
> AC_MSG_RESULT([error])
> AC_MSG_ERROR([Cannot find APR libtool binary])
> + fi
> else
> LIBTOOL="${APRDIR}/libtool"
> fi
>
> -eval `cat ${APRDIR}/APRVARS`
> +eval `cat ${APRDIR}${LIBDIR}/APRVARS`
> AC_SUBST(CC)
> AC_SUBST(CPP)
> AC_SUBST(SHELL)
>
> ______________________________________________________________
> Ryan Bloom [EMAIL PROTECTED]
> Covalent Technologies [EMAIL PROTECTED]
> --------------------------------------------------------------
