You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by be...@hyperreal.org on 1998/09/05 18:18:57 UTC
cvs commit: apache-2.0/apache-nspr/include conf.h
ben 98/09/05 09:18:57
Modified: apache-nspr/include conf.h
Added: apache-nspr Configuration.ben Configuration.dean HOWTOBUILD
Removed: apache-nspr Configuration
Log:
Add some hints for building, avoid clashes with Configuration files. Fix
includes (perhaps suboptimally).
Revision Changes Path
1.1 apache-2.0/apache-nspr/Configuration.ben
Index: Configuration.ben
===================================================================
EXTRA_CFLAGS=-Wall -Wshadow -Wmissing-prototypes -pipe -fno-common -DNSPR
EXTRA_LDFLAGS=-g -L/home/ben/work/apache-2.0/dist/FreeBSD2.2.7_DBG.OBJ/lib
EXTRA_LIBS=-lnspr21
EXTRA_INCLUDES=-I/home/ben/work/apache-2.0/dist/FreeBSD2.2.7_DBG.OBJ/include
CC=gcc
OPTIM=-O2 -g
#RANLIB=
Rule SHARED_CORE=default
Rule STATUS=yes
Rule SOCKS4=no
Rule IRIXNIS=no
Rule IRIXN32=yes
Rule PARANOID=no
Rule WANTHSREGEX=default
AddModule modules/standard/mod_env.o
AddModule modules/standard/mod_log_config.o
AddModule modules/standard/mod_mime_magic.o
AddModule modules/standard/mod_mime.o
AddModule modules/standard/mod_negotiation.o
#AddModule modules/standard/mod_status.o
#AddModule modules/standard/mod_info.o
AddModule modules/standard/mod_include.o
AddModule modules/standard/mod_autoindex.o
AddModule modules/standard/mod_dir.o
AddModule modules/standard/mod_cgi.o
# AddModule modules/standard/mod_asis.o
AddModule modules/standard/mod_imap.o
AddModule modules/standard/mod_actions.o
# AddModule modules/standard/mod_speling.o
AddModule modules/standard/mod_userdir.o
# AddModule modules/proxy/libproxy.a
AddModule modules/standard/mod_alias.o
AddModule modules/standard/mod_rewrite.o
AddModule modules/standard/mod_access.o
AddModule modules/standard/mod_auth.o
AddModule modules/standard/mod_auth_anon.o
# AddModule modules/standard/mod_auth_dbm.o
# AddModule modules/standard/mod_auth_db.o
# AddModule modules/standard/mod_digest.o
AddModule modules/standard/mod_cern_meta.o
# AddModule modules/standard/mod_expires.o
AddModule modules/standard/mod_headers.o
# AddModule modules/standard/mod_usertrack.o
# AddModule modules/example/mod_example.o
# AddModule modules/standard/mod_unique_id.o
# AddModule modules/standard/mod_so.o
# AddModule modules/experimental/mod_mmap_static.o
AddModule modules/standard/mod_setenvif.o
1.1 apache-2.0/apache-nspr/Configuration.dean
Index: Configuration.dean
===================================================================
EXTRA_CFLAGS=-Wall -Wshadow -Wmissing-prototypes -pipe -fno-common -DNSPR
EXTRA_LDFLAGS=-g -Wl,-Map -Wl,httpd.map -Wl,-rpath -Wl,/home/dgaudet/nsprlink/lib -static
EXTRA_LIBS=-L/home/dgaudet/nsprlink/lib -lnspr21 -ldl
EXTRA_INCLUDES=-I/home/dgaudet/nsprlink/include
CC=egcs
OPTIM=-O2 -g
#RANLIB=
Rule SHARED_CORE=default
Rule STATUS=yes
Rule SOCKS4=no
Rule IRIXNIS=no
Rule IRIXN32=yes
Rule PARANOID=no
Rule WANTHSREGEX=no
AddModule modules/standard/mod_env.o
AddModule modules/standard/mod_log_config.o
AddModule modules/standard/mod_mime_magic.o
AddModule modules/standard/mod_mime.o
AddModule modules/standard/mod_negotiation.o
#AddModule modules/standard/mod_status.o
#AddModule modules/standard/mod_info.o
AddModule modules/standard/mod_include.o
AddModule modules/standard/mod_autoindex.o
AddModule modules/standard/mod_dir.o
AddModule modules/standard/mod_cgi.o
# AddModule modules/standard/mod_asis.o
AddModule modules/standard/mod_imap.o
AddModule modules/standard/mod_actions.o
# AddModule modules/standard/mod_speling.o
AddModule modules/standard/mod_userdir.o
# AddModule modules/proxy/libproxy.a
AddModule modules/standard/mod_alias.o
AddModule modules/standard/mod_rewrite.o
AddModule modules/standard/mod_access.o
AddModule modules/standard/mod_auth.o
AddModule modules/standard/mod_auth_anon.o
# AddModule modules/standard/mod_auth_dbm.o
# AddModule modules/standard/mod_auth_db.o
# AddModule modules/standard/mod_digest.o
AddModule modules/standard/mod_cern_meta.o
# AddModule modules/standard/mod_expires.o
AddModule modules/standard/mod_headers.o
# AddModule modules/standard/mod_usertrack.o
# AddModule modules/example/mod_example.o
# AddModule modules/standard/mod_unique_id.o
# AddModule modules/standard/mod_so.o
# AddModule modules/experimental/mod_mmap_static.o
AddModule modules/standard/mod_setenvif.o
1.1 apache-2.0/apache-nspr/HOWTOBUILD
Index: HOWTOBUILD
===================================================================
This is a temporary note for developers during the 2.0 development process.
First, build nspr:
cd .../apache-2.0/pubnspr
make (or gmake)
This produces a directory .../apache-2.0/dist/<platform>_DBG.OBJ, containing
include and lib. Tweak .../apache-2.0/apache-nspr/Configuration to reflect this
path (use full pathnames). Note that Configuration.tmpl is currently bullshit -
use one of Configuration.ben or Configuration.dean as a basis (note that Dean
seems to have some symbolic links set up, and uses egcs/Linux[?] - Ben links
directly to the NSPR stuff and is using gcc/FreeBSD).
cd .../apache-2.0/apache-nspr
./Configure
make (gmake should NOT be needed in this case)
Ben 5 Sep 1998
1.3 +1 -0 apache-2.0/apache-nspr/include/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/apache-nspr/include/conf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- conf.h 1998/06/30 08:57:05 1.2
+++ conf.h 1998/09/05 16:18:56 1.3
@@ -164,6 +164,7 @@
#if defined(USE_HSREGEX)
#include "hsregex.h"
#else
+#include <sys/types.h>
#include <regex.h>
#endif