cvs commit: apache-2.0/src buildconf

[manoj]

manoj   99/12/21 19:16:38

  Modified:src  buildconf
  Log:
  --include-deps only seems to take advantage of pregenerated
  dependencies, and makes the build process refuse to generate them, so
  this removes it. It should be used when making a distribution, though.
  
  Revision  ChangesPath
  1.9   +1 -1  apache-2.0/src/buildconf
  
  Index: buildconf
  ===
  RCS file: /home/cvs/apache-2.0/src/buildconf,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -d -u -r1.8 -r1.9
  --- buildconf 1999/12/21 07:21:37 1.8
  +++ buildconf 1999/12/22 03:16:37 1.9
  @@ -91,7 +91,7 @@
   files="Makefile `find ap lib main modules regex os -name Makefile.am | sed 
's#\.am##' | tr '\n' ' '`"
   
   # suppress stupid automake warning
  -automake --add-missing --include-deps $automake_flags $files 2>&1 | grep -v 
\$APACHE_OUTPUT_FILES >&2
  +automake --add-missing $automake_flags $files 2>&1 | grep -v 
\$APACHE_OUTPUT_FILES >&2
   
   
   mv configure configure.old 2>/dev/null
  
  
  

cvs commit: apache-2.0/src Configure

[manoj]

manoj   99/12/21 22:03:56

  Modified:src  Configure
  Log:
  Add a temporary ultrahack to make building easier for people jumping
  into Apache 2.0 that aren't messing with the configuration system.
  
  Submitted by: Chris Costello <[EMAIL PROTECTED]> (partially)
  
  Revision  ChangesPath
  1.19  +8 -4  apache-2.0/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-2.0/src/Configure,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -d -u -r1.18 -r1.19
  --- Configure 1999/12/19 18:18:10 1.18
  +++ Configure 1999/12/22 06:03:48 1.19
  @@ -54,6 +54,10 @@
   ## For more information on the Apache Group and the Apache HTTP server
   ## project, please see .
   
  +# XXX - the FreeBSD and Linux pthread references are a hack to be able
  +# to build until we figure out how to do more MPM-specific build flags
  +# If this config system sticks around, they really, really should be removed
  +
   # Uses 6 supplemental scripts located in ./helpers:
   #CutRule: Determines the value for a specified Rule
   #GuessOS: Uses uname to determine OS/platform
  @@ -430,8 +434,8 @@
   *-linux2)
DEF_WANTHSREGEX=yes
OS='Linux'
  - CFLAGS="$CFLAGS -DLINUX=2"
  - LIBS="$LIBS -lm"
  + CFLAGS="$CFLAGS -DLINUX=2 -D_REENTRANT"
  + LIBS="$LIBS -lm -pthread"
;;
   *-linux1)
DEF_WANTHSREGEX=yes
  @@ -474,10 +478,10 @@
case "$PLATOSVERS" in
[234]*)
DEF_WANTHSREGEX=no
  - CFLAGS="$CFLAGS -funsigned-char"
  + CFLAGS="$CFLAGS -D_REENTRANT -funsigned-char"
;;
esac
  - LIBS="$LIBS -lcrypt"
  + LIBS="$LIBS -lcrypt -pthread"
DBM_LIB=""
DB_LIB=""
;;
  
  
  

cvs commit: apache-2.0 STATUS

[manoj]

manoj   99/12/21 22:20:12

  Modified:.STATUS
  Log:
  I don't have to get up before 2PM for almost 2 weeks!
  
  Revision  ChangesPath
  1.24  +4 -4  apache-2.0/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-2.0/STATUS,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -d -u -r1.23 -r1.24
  --- STATUS1999/12/21 08:26:49 1.23
  +++ STATUS1999/12/22 06:20:11 1.24
  @@ -1,11 +1,11 @@
   Apache 2.0 STATUS:
  -Last modified at [$Date: 1999/12/21 08:26:49 $]
  +Last modified at [$Date: 1999/12/22 06:20:11 $]
   
   Release:
   
  -Assuming more features aren't demanded for the 2.0 release
  +Vague plan, assuming more features aren't demanded for the 2.0 release
   2.0a1/b1: January 2000
  -2.0 : Early 2000
  +2.0 : later in 2000
   
   RELEASE SHOWSTOPPERS:
   
  @@ -85,7 +85,7 @@
   Status: Manoj has placed an initial version into the 2.0
   repository. Todos include:
 
  -  - "make install" and "make depend" should work
  +  - "make install" should work
 - a tool to simplfy third-party module building should be
   written. Something like apxs
 - Add a lot more checks to satisfy the various platforms, e.g.
  
  
  

cvs commit: apache-2.0/src/lib/apr Makefile.in

[ben]

ben 99/12/22 03:46:36

  Modified:src/lib/apr Makefile.in
  Log:
  We now link on FreeBSD 2.2.x.
  
  Revision  ChangesPath
  1.15  +1 -0  apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.in   1999/12/21 22:05:04 1.14
  +++ Makefile.in   1999/12/22 11:46:35 1.15
  @@ -44,6 +44,7 @@
@rm -f @[EMAIL PROTECTED]
for i in $(SUBDIRS); do cp $$i/*.o objs ; done;
$(AR) cr @[EMAIL PROTECTED] objs/*.o
  + $(RANLIB) @[EMAIL PROTECTED]
   
   clean: subdirs_clean
$(RM) -f *.o *.a *.so objs/*.o
  
  
  

Re: cvs commit: apache-2.0/src/lib/apr Makefile.in

[Ben Laurie]

[EMAIL PROTECTED] wrote:
> 
> ben 99/12/22 03:46:36
> 
>   Modified:src/lib/apr Makefile.in
>   Log:
>   We now link on FreeBSD 2.2.x.

But somewhere recently we've started to require GNU make.

Cheers,

Ben.

--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm

http://www.apache-ssl.org/ben.html

"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
 - Indira Gandhi

cvs commit: apache-1.3/src/lib/expat-lite expat_lite.dsw

[stoddard]

stoddard99/12/22 04:34:30

  Removed: src/lib/expat-lite expat_lite.dsw
  Log:
  Win32: Remove .dsw file. It is not needed to build expat on Windows.

Re: cvs commit: apache-2.0/src/lib/apr Makefile.in

[Ryan Bloom]

On Wed, 22 Dec 1999, Ben Laurie wrote:

> [EMAIL PROTECTED] wrote:
> > 
> > ben 99/12/22 03:46:36
> > 
> >   Modified:src/lib/apr Makefile.in
> >   Log:
> >   We now link on FreeBSD 2.2.x.
> 
> But somewhere recently we've started to require GNU make.

When did that happen?  Is it APR or Apache that is requiring GNU make?

Ryan

___
Ryan Bloom  [EMAIL PROTECTED]
4205 S Miami Blvd   
RTP, NC 27709   

Come to the first official Apache Software Foundation
Conference!  

Re: cvs commit: apache-2.0/src/lib/apr Makefile.in

[Ben Laurie]

Ryan Bloom wrote:
> 
> On Wed, 22 Dec 1999, Ben Laurie wrote:
> 
> > [EMAIL PROTECTED] wrote:
> > >
> > > ben 99/12/22 03:46:36
> > >
> > >   Modified:src/lib/apr Makefile.in
> > >   Log:
> > >   We now link on FreeBSD 2.2.x.
> >
> > But somewhere recently we've started to require GNU make.
> 
> When did that happen?  Is it APR or Apache that is requiring GNU make?

Diagnosed: its the include stuff. You can't say:

-include $(DEP_FILES)

in BSD make. You have to include them individually with .include and
quotemarks...

Does that work with GNU make?

Cheers,

Ben.

--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm

http://www.apache-ssl.org/ben.html

"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
 - Indira Gandhi

Re: cvs commit: apache-2.0/src/lib/apr Makefile.in

[Sascha Schumann]

On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote:
> Ryan Bloom wrote:
> > 
> > On Wed, 22 Dec 1999, Ben Laurie wrote:
> > 
> > > [EMAIL PROTECTED] wrote:
> > > >
> > > > ben 99/12/22 03:46:36
> > > >
> > > >   Modified:src/lib/apr Makefile.in
> > > >   Log:
> > > >   We now link on FreeBSD 2.2.x.
> > >
> > > But somewhere recently we've started to require GNU make.
> > 
> > When did that happen?  Is it APR or Apache that is requiring GNU make?
> 
> Diagnosed: its the include stuff. You can't say:
> 
> -include $(DEP_FILES)
> 
> in BSD make. You have to include them individually with .include and
> quotemarks...
> 
> Does that work with GNU make?
> 

include filename

is the portable version. Works with GNU, BSD, SysV make.

-- 

  Regards,

Sascha Schumann
 Consultant

Re: cvs commit: apache-2.0/src/lib/apr Makefile.in

[Ben Laurie]

Sascha Schumann wrote:
> 
> On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote:
> > Ryan Bloom wrote:
> > >
> > > On Wed, 22 Dec 1999, Ben Laurie wrote:
> > >
> > > > [EMAIL PROTECTED] wrote:
> > > > >
> > > > > ben 99/12/22 03:46:36
> > > > >
> > > > >   Modified:src/lib/apr Makefile.in
> > > > >   Log:
> > > > >   We now link on FreeBSD 2.2.x.
> > > >
> > > > But somewhere recently we've started to require GNU make.
> > >
> > > When did that happen?  Is it APR or Apache that is requiring GNU make?
> >
> > Diagnosed: its the include stuff. You can't say:
> >
> > -include $(DEP_FILES)
> >
> > in BSD make. You have to include them individually with .include and
> > quotemarks...
> >
> > Does that work with GNU make?
> >
> 
> include filename
> 
> is the portable version. Works with GNU, BSD, SysV make.

Aha. Thanks.

Cheers,

Ben.

--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm

http://www.apache-ssl.org/ben.html

"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
 - Indira Gandhi

Re: cvs commit: apache-2.0/src/lib/apr Makefile.in

[Ben Laurie]

Sascha Schumann wrote:
> 
> On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote:
> > Ryan Bloom wrote:
> > >
> > > On Wed, 22 Dec 1999, Ben Laurie wrote:
> > >
> > > > [EMAIL PROTECTED] wrote:
> > > > >
> > > > > ben 99/12/22 03:46:36
> > > > >
> > > > >   Modified:src/lib/apr Makefile.in
> > > > >   Log:
> > > > >   We now link on FreeBSD 2.2.x.
> > > >
> > > > But somewhere recently we've started to require GNU make.
> > >
> > > When did that happen?  Is it APR or Apache that is requiring GNU make?
> >
> > Diagnosed: its the include stuff. You can't say:
> >
> > -include $(DEP_FILES)
> >
> > in BSD make. You have to include them individually with .include and
> > quotemarks...
> >
> > Does that work with GNU make?
> >
> 
> include filename
> 
> is the portable version. Works with GNU, BSD, SysV make.

Marvellous. In that case it is automake that is broken. I'm running
v1.4.

Cheers,

Ben.

--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm

http://www.apache-ssl.org/ben.html

"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
 - Indira Gandhi

Re: cvs commit: apache-2.0/src/lib/apr Makefile.in

[Sascha Schumann]

On Wed, Dec 22, 1999 at 06:27:18PM +, Ben Laurie wrote:
> Sascha Schumann wrote:
> > 
> > On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote:
> > > Ryan Bloom wrote:
> > > >
> > > > On Wed, 22 Dec 1999, Ben Laurie wrote:
> > > >
> > > > > [EMAIL PROTECTED] wrote:
> > > > > >
> > > > > > ben 99/12/22 03:46:36
> > > > > >
> > > > > >   Modified:src/lib/apr Makefile.in
> > > > > >   Log:
> > > > > >   We now link on FreeBSD 2.2.x.
> > > > >
> > > > > But somewhere recently we've started to require GNU make.
> > > >
> > > > When did that happen?  Is it APR or Apache that is requiring GNU make?
> > >
> > > Diagnosed: its the include stuff. You can't say:
> > >
> > > -include $(DEP_FILES)
> > >
> > > in BSD make. You have to include them individually with .include and
> > > quotemarks...
> > >
> > > Does that work with GNU make?
> > >
> > 
> > include filename
> > 
> > is the portable version. Works with GNU, BSD, SysV make.
> 
> Marvellous. In that case it is automake that is broken. I'm running
> v1.4.

make clean? Yes, that's broken :(

-- 

  Regards,

Sascha Schumann
 Consultant

cvs commit: apache-2.0/src/modules/mpm/prefork config.m4

[rbb]

rbb 99/12/22 12:29:20

  Modified:src/lib/apr acconfig.h configure.in
   src/lib/apr/locks/unix intraproc.c
   src/lib/apr/misc/unix start.c
   src/modules/mpm/prefork config.m4
  Log:
  Clean up APR's configure script a bit.  This commit also allows Apache to
  specify that APR should be built without threads for the prefork MPM.  This
  is broken if we then try to configure Apache again using a threaded MPM, but
  this is easily fixable, and I will be doing that soon.  Lastly, I removed all
  thread calls from APR when it is told to build without threads.
  
  Revision  ChangesPath
  1.18  +1 -0  apache-2.0/src/lib/apr/acconfig.h
  
  Index: acconfig.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- acconfig.h1999/12/21 21:16:14 1.17
  +++ acconfig.h1999/12/22 20:29:16 1.18
  @@ -45,6 +45,7 @@
   #undef USEBCOPY
   
   #undef HAVE_GMTOFF
  +#undef USE_THREADS
   
   #undef SIZEOF_SSIZE_T
   
  
  
  
  1.38  +50 -67apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- configure.in  1999/12/21 21:16:17 1.37
  +++ configure.in  1999/12/22 20:29:16 1.38
  @@ -1,3 +1,4 @@
  +
   AC_CONFIG_AUX_DIR(./helpers)
   OS=`./config.guess`
   OS=`./config.sub $OS` 
  @@ -28,6 +29,42 @@
   AC_CHECK_PROG(RM, rm, rm)
   AC_CHECK_PROG(AR, ar, ar)
   
  +# This macro needs to be here in case we are on an AIX box.
  +AC_AIX
  +
  +AC_CACHE_CHECK([for threads], ac_cv_enable_threads, 
  +  [ AC_ARG_ENABLE(threads,
  +[  --enable-threads  Enable threading support in APR.], 
  +[ ] , 
  +[ AC_CHECK_HEADERS(pthread.h,  
  +   [ ac_cv_enable_threads="pthread" ] , 
  +   [ ac_cv_enable_threads="no" ] ) ] ) ] ) 
  +
  +if test "$ac_cv_enable_threads" = "no"; then 
  +threads="0"
  +pthreadh="0"
  +else
  +if test "$ac_cv_enable_threads" = "pthread"; then
  +  AC_CHECK_HEADERS(pthread.h, [ 
  +  threads="1"
  +  pthreadh="1"
  +  AC_DEFINE(USE_THREADS) ], [
  +  threads="0"
  +  pthreadh="0" ] )
  +fi
  +fi
  +
  +pthreadser="0"
  +if test "$threads" = "1"; then
  +AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
  +AC_CHECK_LIB(pthread, pthread_mutex_init, [
  +AC_DEFINE(USE_PTHREAD_SERIALIZE)
  +pthreadser="1" ])
  +AC_CHECK_LIB(c_r, pthread_mutex_init, [ 
  +AC_DEFINE(USE_PTHREAD_SERIALIZE)
  +pthreadser="1"])
  +fi
  +
   AC_ARG_WITH(debug,[  --with-debug  Turn on debugging and compile 
time warnings],
[if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else 
CFLAGS="$CFLAGS -g"; fi])
   
  @@ -42,10 +79,6 @@
   ;;
   esac
   
  -
  -# This macro needs to be here in case we are on an AIX box.
  -AC_AIX
  -
   dnl Checks for standard typedefs
   AC_TYPE_OFF_T
   AC_TYPE_PID_T
  @@ -80,9 +113,6 @@
   if test "$ac_cv_sizeof_longlong" = "8"; then
   long_value="__int64"
   fi
  -AC_SUBST(short_value)
  -AC_SUBST(int_value)
  -AC_SUBST(long_value)
   
   if test "$ac_cv_type_off_t" = "yes"; then
   off_t_value="off_t"
  @@ -100,10 +130,6 @@
   ssize_t_value="ap_int32_t"
   fi
   
  -AC_SUBST(off_t_value)
  -AC_SUBST(size_t_value)
  -AC_SUBST(ssize_t_value)
  -
   AC_CHECK_SIZEOF_EXTENDED([#include ], ssize_t, 8)
   
   # Use /bin/sh if it exists, otherwise go looking for sh in the path
  @@ -114,7 +140,6 @@
   
   AC_CHECK_DEFINE(LOCK_EX, sys/file.h)
   AC_CHECK_DEFINE(F_SETLK, fcntl.h)
  -AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
   
   dnl Checks for libraries.
   AC_BEGIN_DECISION([lock implementation method])
  @@ -153,24 +178,9 @@
   procpthreadser="0"
   fi
   
  -AC_SUBST(flockser)
  -AC_SUBST(sysvser)
  -AC_SUBST(fcntlser)
  -AC_SUBST(procpthreadser)
  -
  -pthreadser="0"
  -AC_CHECK_LIB(pthread, pthread_mutex_init, [
  -AC_DEFINE(USE_PTHREAD_SERIALIZE)
  -pthreadser="1" ])
  -AC_CHECK_LIB(c_r, pthread_mutex_init, [ 
  -AC_DEFINE(USE_PTHREAD_SERIALIZE)
  -pthreadser="1"])
  -AC_SUBST(pthreadser)
  -
   ac_cv_define_READDIR_IS_THREAD_SAFE=no
   AC_CHECK_LIB(c_r, readdir, AC_DEFINE(READDIR_IS_THREAD_SAFE))
   
  -
   case "$OS" in
  *-os2*)
  CFLAGS="$CFLAGS -DOS2 -Zmt"
  @@ -308,46 +318,6 @@
   
   AC_CHECK_FUNCS(gmtime_r localtime_r)
   
  -AC_MSG_CHECKING(whether to enable thread support)
  -AC_ARG_ENABLE(threads,
  -[  --enable-threads  Enable threading support in APR.],
  -[
  -  if test "$enableval" = "no"; then 
  -threads="0"
  -pthreadh="0"
  -AC_SUBST(threads)
  -AC_SUBST(pthreadh)
  -  

cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread config.m4

[rbb]

rbb 99/12/22 13:24:47

  Modified:src/lib/apr configure.in
   src/modules/mpm/dexter config.m4
   src/modules/mpm/mpmt_pthread config.m4
  Log:
  This fixes the bug in my last commit.  Apache always caches a value for
  enable-threads.  This allows us to re-configure the server for different
  MPM's without worrying about not having APR-threads available.
  
  Revision  ChangesPath
  1.39  +12 -0 apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- configure.in  1999/12/22 20:29:16 1.38
  +++ configure.in  1999/12/22 21:24:42 1.39
  @@ -45,6 +45,18 @@
   pthreadh="0"
   else
   if test "$ac_cv_enable_threads" = "pthread"; then
  +# We have specified pthreads for our threading library, just make sure
  +# that we have everything we need
  +  AC_CHECK_HEADERS(pthread.h, [ 
  +  threads="1"
  +  pthreadh="1"
  +  AC_DEFINE(USE_THREADS) ], [
  +  threads="0"
  +  pthreadh="0" ] )
  +else
  +# We basically specified that we wanted threads, but not how to implement
  +# them.  In this case, just look for pthreads.  In the future, we can check
  +# for other threading libraries as well.
 AC_CHECK_HEADERS(pthread.h, [ 
 threads="1"
 pthreadh="1"
  
  
  
  1.2   +3 -0  apache-2.0/src/modules/mpm/dexter/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/config.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.m4 1999/11/29 23:46:38 1.1
  +++ config.m4 1999/12/22 21:24:44 1.2
  @@ -1,6 +1,9 @@
   dnl ## XXX - Need a more thorough check of the proper flags to use
   
   if test "$MPM_NAME" = "dexter" ; then
  +ac_cv_enable_threads="yes"
  +AC_CACHE_SAVE
  +
   APACHE_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
   APACHE_MPM_PTHREAD
   APACHE_MPM_CHECK_SHMEM
  
  
  
  1.3   +3 -0  apache-2.0/src/modules/mpm/mpmt_pthread/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/config.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.m4 1999/11/30 03:52:41 1.2
  +++ config.m4 1999/12/22 21:24:45 1.3
  @@ -1,6 +1,9 @@
   dnl ## XXX - Need a more thorough check of the proper flags to use
   
   if test "$MPM_NAME" = "mpmt_pthread" ; then
  +ac_cv_enable_threads="yes"
  +AC_CACHE_SAVE
  +
   APACHE_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
   
   APACHE_MPM_PTHREAD