You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jeff Trawick <tr...@bellsouth.net> on 2000/12/19 20:19:36 UTC
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
rbb@locus.apache.org writes:
> Log:
> Force all Apache functions to be linked into the executable, whether they
> are used or not. This uses the same mechanism that is used for APR
> and APR-util. This may not be the correct solution, but it works, and that
> is what I really care about. This also renames CHARSET_EBCDIC to
> AP_CHARSET_EBCDIC. This is for namespace correctness, but it also makes
> the exports script a bit easier.
>
> Revision Changes Path
> 1.14 +7 -0 httpd-2.0/CHANGES
...
>
> Index: Makefile.in
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
> retrieving revision 1.26
> retrieving revision 1.27
> diff -u -r1.26 -r1.27
> --- Makefile.in 2000/12/07 11:37:04 1.26
> +++ Makefile.in 2000/12/19 17:05:15 1.27
> @@ -1,8 +1,9 @@
>
> -CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
> +CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h apache.exports
>
> SUBDIRS = mpm
>
> +TARGET_EXPORTS = apache.exports
> LTLIBRARY_NAME = libmain.la
> LTLIBRARY_SOURCES = \
> uri_delims.h test_char.h \
> @@ -31,7 +32,21 @@
> util_uri.lo: uri_delims.h
> util.lo: test_char.h
>
> -EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports
> +EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports apache.exports
>
> -exports.c: $(EXPORT_FILES)
> - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> +delete-exports:
> + @if test -f $(TARGET_EXPORTS); then \
> + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> + if test -n "$$headers"; then \
> + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> + echo $(RM) -f $(TARGET_EXPORTS) ; \
RM is not defined for me (and I suspect not for anyone else) in
config_vars.mk, so touching a header file breaks the build.
another issue:
The prefork MPM is broken right now because ap_start_shutdown() is not
implemented by prefork.c but no feature test macro is used in
include/ap_mpm.h around the declaration of it, so exports.c always
refers to ap_start_shutdown() and link fails with prefork.
--
Jeff Trawick | trawickj@bellsouth.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by Jeff Trawick <tr...@bellsouth.net>.
rbb@covalent.net writes:
> > > -exports.c: $(EXPORT_FILES)
> > > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > > +delete-exports:
> > > + @if test -f $(TARGET_EXPORTS); then \
> > > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > > + if test -n "$$headers"; then \
> > > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > > + echo $(RM) -f $(TARGET_EXPORTS) ; \
> >
> > RM is not defined for me (and I suspect not for anyone else) in
> > config_vars.mk, so touching a header file breaks the build.
>
> I'll fix the RM issue now.
>
> > another issue:
> >
> > The prefork MPM is broken right now because ap_start_shutdown() is not
> > implemented by prefork.c but no feature test macro is used in
> > include/ap_mpm.h around the declaration of it, so exports.c always
> > refers to ap_start_shutdown() and link fails with prefork.
>
> I'll look at this too.
Thanks a bunch! I'm running dangerously low on caffeine at the
moment.
--
Jeff Trawick | trawickj@bellsouth.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by Ben Laurie <be...@algroup.co.uk>.
rbb@covalent.net wrote:
>
> > > > > -exports.c: $(EXPORT_FILES)
> > > > > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > > > > +delete-exports:
> > > > > + @if test -f $(TARGET_EXPORTS); then \
> > > > > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > > > > + if test -n "$$headers"; then \
> > > > > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > > > > + echo $(RM) -f $(TARGET_EXPORTS) ; \
> > > >
> > > > RM is not defined for me (and I suspect not for anyone else) in
> > > > config_vars.mk, so touching a header file breaks the build.
> > >
> > > I'll fix the RM issue now.
> >
> > You'll have noticed that he didn't (but I did, by changing it to rm).
>
> Actually, I thought I did. ARGH! I added the check in configure.in, but
> it wasn't added to config_vars. :-(
Why do you want to check for rm? Surely it can't be missing - and what
would you use in its place if it were?
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by Ben Laurie <be...@algroup.co.uk>.
rbb@covalent.net wrote:
>
> > > > > -exports.c: $(EXPORT_FILES)
> > > > > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > > > > +delete-exports:
> > > > > + @if test -f $(TARGET_EXPORTS); then \
> > > > > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > > > > + if test -n "$$headers"; then \
> > > > > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > > > > + echo $(RM) -f $(TARGET_EXPORTS) ; \
> > > >
> > > > RM is not defined for me (and I suspect not for anyone else) in
> > > > config_vars.mk, so touching a header file breaks the build.
> > >
> > > I'll fix the RM issue now.
> >
> > You'll have noticed that he didn't (but I did, by changing it to rm).
>
> Actually, I thought I did. ARGH! I added the check in configure.in, but
> it wasn't added to config_vars. :-(
Why do you want to check for rm? Surely it can't be missing - and what
would you use in its place if it were?
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by rb...@covalent.net.
> > > > -exports.c: $(EXPORT_FILES)
> > > > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > > > +delete-exports:
> > > > + @if test -f $(TARGET_EXPORTS); then \
> > > > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > > > + if test -n "$$headers"; then \
> > > > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > > > + echo $(RM) -f $(TARGET_EXPORTS) ; \
> > >
> > > RM is not defined for me (and I suspect not for anyone else) in
> > > config_vars.mk, so touching a header file breaks the build.
> >
> > I'll fix the RM issue now.
>
> You'll have noticed that he didn't (but I did, by changing it to rm).
Actually, I thought I did. ARGH! I added the check in configure.in, but
it wasn't added to config_vars. :-(
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by rb...@covalent.net.
> > > > -exports.c: $(EXPORT_FILES)
> > > > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > > > +delete-exports:
> > > > + @if test -f $(TARGET_EXPORTS); then \
> > > > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > > > + if test -n "$$headers"; then \
> > > > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > > > + echo $(RM) -f $(TARGET_EXPORTS) ; \
> > >
> > > RM is not defined for me (and I suspect not for anyone else) in
> > > config_vars.mk, so touching a header file breaks the build.
> >
> > I'll fix the RM issue now.
>
> You'll have noticed that he didn't (but I did, by changing it to rm).
Actually, I thought I did. ARGH! I added the check in configure.in, but
it wasn't added to config_vars. :-(
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by Ben Laurie <be...@algroup.co.uk>.
rbb@covalent.net wrote:
>
> > > -exports.c: $(EXPORT_FILES)
> > > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > > +delete-exports:
> > > + @if test -f $(TARGET_EXPORTS); then \
> > > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > > + if test -n "$$headers"; then \
> > > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > > + echo $(RM) -f $(TARGET_EXPORTS) ; \
> >
> > RM is not defined for me (and I suspect not for anyone else) in
> > config_vars.mk, so touching a header file breaks the build.
>
> I'll fix the RM issue now.
You'll have noticed that he didn't (but I did, by changing it to rm).
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by Ben Laurie <be...@algroup.co.uk>.
rbb@covalent.net wrote:
>
> > > -exports.c: $(EXPORT_FILES)
> > > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > > +delete-exports:
> > > + @if test -f $(TARGET_EXPORTS); then \
> > > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > > + if test -n "$$headers"; then \
> > > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > > + echo $(RM) -f $(TARGET_EXPORTS) ; \
> >
> > RM is not defined for me (and I suspect not for anyone else) in
> > config_vars.mk, so touching a header file breaks the build.
>
> I'll fix the RM issue now.
You'll have noticed that he didn't (but I did, by changing it to rm).
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by rb...@covalent.net.
> > -exports.c: $(EXPORT_FILES)
> > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > +delete-exports:
> > + @if test -f $(TARGET_EXPORTS); then \
> > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > + if test -n "$$headers"; then \
> > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > + echo $(RM) -f $(TARGET_EXPORTS) ; \
>
> RM is not defined for me (and I suspect not for anyone else) in
> config_vars.mk, so touching a header file breaks the build.
I'll fix the RM issue now.
> another issue:
>
> The prefork MPM is broken right now because ap_start_shutdown() is not
> implemented by prefork.c but no feature test macro is used in
> include/ap_mpm.h around the declaration of it, so exports.c always
> refers to ap_start_shutdown() and link fails with prefork.
I'll look at this too.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Posted by rb...@covalent.net.
> > -exports.c: $(EXPORT_FILES)
> > - (cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
> > +delete-exports:
> > + @if test -f $(TARGET_EXPORTS); then \
> > + headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
> > + if test -n "$$headers"; then \
> > + echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
> > + echo $(RM) -f $(TARGET_EXPORTS) ; \
>
> RM is not defined for me (and I suspect not for anyone else) in
> config_vars.mk, so touching a header file breaks the build.
I'll fix the RM issue now.
> another issue:
>
> The prefork MPM is broken right now because ap_start_shutdown() is not
> implemented by prefork.c but no feature test macro is used in
> include/ap_mpm.h around the declaration of it, so exports.c always
> refers to ap_start_shutdown() and link fails with prefork.
I'll look at this too.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------