You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Brian Havard <br...@kheldar.apana.org.au> on 2001/08/22 03:50:41 UTC
Re: cvs commit: httpd-2.0/build rules.mk
On 21 Aug 2001 23:41:35 -0000, rbb@apache.org wrote:
>rbb 01/08/21 16:41:35
>
> Modified: . STATUS configure.in
> build rules.mk
> Log:
> Allow Apache to use libtool 1.4. In order to do this, we check the
> libtool version of the machine, and we add the correct flags to the build.
> We also had to remove the --disable-shared in order to make this work
> correctly.
>
> Revision Changes Path
> 1.274 +1 -14 httpd-2.0/STATUS
>
> Index: configure.in
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/configure.in,v
> retrieving revision 1.170
> retrieving revision 1.171
> diff -u -r1.170 -r1.171
> --- configure.in 2001/08/20 12:19:50 1.170
> +++ configure.in 2001/08/21 23:41:35 1.171
> @@ -103,15 +103,31 @@
> MK_IMPLIB="emximp"
> other_targets="$other_targets os2core"
> INSTALL_PROG_FLAGS="-e .exe"
> + SHLTCFLAGS=""
> + LTCFLAGS=""
> ;;
> *)
> if test "x$LTFLAGS" = "x"; then
> LTFLAGS='--silent'
> fi
> LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool $(LTFLAGS)'
> - SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
> + libtoolversion=`$abs_builddir/srclib/apr/libtool --version`
> + case $libtoolversion in
> + *1.4*)
> + SH_LIBTOOL='$(LIBTOOL)'
> + SHLTCFLAGS="-prefer-pic"
> + LTCFLAGS="-prefer-non-pic -static"
> + ;;
> + *)
> + SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
> + SHLTCFLAGS=""
> + LTCFLAGS=""
> + ;;
> + esac
> ;;
> esac
> +APACHE_SUBST(SHLTCFLAGS)
> +APACHE_SUBST(LTCFLAGS)
>
> case $host in
> *-apple-aux3*)
> @@ -385,7 +401,7 @@
> ;;
> esac
>
> -AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile,,[
> +AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,,[
> APACHE_GEN_MAKEFILES
> ])
Eh? This causes rules.mk to get nuked as there's no rules.mk.in!
Did you mean to add one?
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/build rules.mk
Posted by Ryan Bloom <rb...@covalent.net>.
Yes. It's on the way.
Sorry about this.
Ryan
On Tuesday 21 August 2001 18:50, Brian Havard wrote:
> On 21 Aug 2001 23:41:35 -0000, rbb@apache.org wrote:
> >rbb 01/08/21 16:41:35
> >
> > Modified: . STATUS configure.in
> > build rules.mk
> > Log:
> > Allow Apache to use libtool 1.4. In order to do this, we check the
> > libtool version of the machine, and we add the correct flags to the
> > build. We also had to remove the --disable-shared in order to make this
> > work correctly.
> >
> > Revision Changes Path
> > 1.274 +1 -14 httpd-2.0/STATUS
> >
> > Index: configure.in
> > ===================================================================
> > RCS file: /home/cvs/httpd-2.0/configure.in,v
> > retrieving revision 1.170
> > retrieving revision 1.171
> > diff -u -r1.170 -r1.171
> > --- configure.in 2001/08/20 12:19:50 1.170
> > +++ configure.in 2001/08/21 23:41:35 1.171
> > @@ -103,15 +103,31 @@
> > MK_IMPLIB="emximp"
> > other_targets="$other_targets os2core"
> > INSTALL_PROG_FLAGS="-e .exe"
> > + SHLTCFLAGS=""
> > + LTCFLAGS=""
> > ;;
> > *)
> > if test "x$LTFLAGS" = "x"; then
> > LTFLAGS='--silent'
> > fi
> > LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool $(LTFLAGS)'
> > - SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
> > + libtoolversion=`$abs_builddir/srclib/apr/libtool --version`
> > + case $libtoolversion in
> > + *1.4*)
> > + SH_LIBTOOL='$(LIBTOOL)'
> > + SHLTCFLAGS="-prefer-pic"
> > + LTCFLAGS="-prefer-non-pic -static"
> > + ;;
> > + *)
> > + SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool
> > $(LTFLAGS)' + SHLTCFLAGS=""
> > + LTCFLAGS=""
> > + ;;
> > + esac
> > ;;
> > esac
> > +APACHE_SUBST(SHLTCFLAGS)
> > +APACHE_SUBST(LTCFLAGS)
> >
> > case $host in
> > *-apple-aux3*)
> > @@ -385,7 +401,7 @@
> > ;;
> > esac
> >
> > -AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl
> > support/dbmmanage support/log_server_status support/logresolve.pl
> > support/phf_abuse_log.cgi support/split-logfile,,[
> > +AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl
> > support/dbmmanage support/log_server_status support/logresolve.pl
> > support/phf_abuse_log.cgi support/split-logfile build/rules.mk,,[
> > APACHE_GEN_MAKEFILES
> > ])
>
> Eh? This causes rules.mk to get nuked as there's no rules.mk.in!
> Did you mean to add one?
--
______________________________________________________________
Ryan Bloom rbb@apache.org
Covalent Technologies rbb@covalent.net
--------------------------------------------------------------