Attachment #220905 for bug #306591




AC_CONFIG_FILES([doc/pcc.conf])
AC_CONFIG_FILES([sa-tests/pcc-test.conf])
AC_CONFIG_FILES([webconnect/Makefile])
AC_CONFIG_FILES([webconnect/fastcgi/Makefile])
AC_CONFIG_FILES([webconnect/micro/Makefile])
AC_CONFIG_FILES([compiler/Makefile])
AC_CONFIG_FILES([tools/c-interface/Makefile])
AC_CONFIG_FILES([tools/profiler/Makefile])
AC_CONFIG_FILES([tools/readline/Makefile])
AC_CONFIG_FILES([runtime/Makefile])
AC_CONFIG_FILES([runtime/php-ext/pdo/Makefile])
AC_CONFIG_FILES([runtime/php-ext/pdo/pdo_class.php])
AC_CONFIG_FILES([compiler/config.scm])

AC_CONFIG_SUBDIRS([tools/libwebserver])
AC_OUTPUT

dnl ==========================================================================

Lines 28-35 Link Here

(-)Makefile.config.in.orig (-2 / +3 lines)
28	dllcmd = gcc -shared -o $(1) -Wl,--enable-auto-import,--enable-auto-image-base,--out-implib,$(1).a	28	dllcmd = gcc -shared -o $(1) -Wl,--enable-auto-import,--enable-auto-image-base,--out-implib,$(1).a
29	dllcmd_i = gcc -shared -o $(1) -Wl,--enable-auto-import,--enable-auto-image-base,--out-implib,$(1).a	29	dllcmd_i = gcc -shared -o $(1) -Wl,--enable-auto-import,--enable-auto-image-base,--out-implib,$(1).a
30	else	30	else
31	dllcmd = gcc -shared -o $(1)	31	dllcmd = $(CC) -shared -o $(1) $(LDFLAGS)
32	dllcmd_i = gcc -shared -o $(1)	32	dllcmd_i = $(CC) -shared -o $(1) $(LDFLAGS)
33	endif	33	endif
34	endif	34	endif
35		35
Lines 72-77 Link Here
72	# std	72	# std
73	STD_CFLAGS = @STD_CFLAGS@	73	STD_CFLAGS = @STD_CFLAGS@
74	STD_LIBS = @STD_LIBS@	74	STD_LIBS = @STD_LIBS@
		75	STD_LDFLAGS = @STD_LDFLAGS@
75		76
76	# mysql	77	# mysql
77	MYSQL_CFLAGS = @MYSQL_CFLAGS@	78	MYSQL_CFLAGS = @MYSQL_CFLAGS@





BHEAPFLAGS	= -unsafe -mkaddheap -mkaddlib -L $(BGL_DEFAULT_LIB_DIR)

BCOMMONFLAGS	+= @@CFLAGS@@ @@LDFLAGS@@
CCOMMONFLAGS	+= $(CFLAGS)

# -fsharing? 
# -mkaddlib shortens our startup time because it changes bigloo's constant allocation mode
BSAFEFLAGS	= -mkaddlib -L $(BGL_DEFAULT_LIB_DIR) -unsafev -copt -D$(PCC_OS) -srfi $(PCC_OS) -O3 -g -cg +rm $(PROFILEFLAGS) $(BCOMMONFLAGS)
BUNSAFEFLAGS	= -mkaddlib -L $(BGL_DEFAULT_LIB_DIR) -copt -D$(PCC_OS) -srfi $(PCC_OS) -srfi unsafe -O6 -unsafe $(BCOMMONFLAGS)

# the -srfi bit makes cond-expand work in scheme code
CSAFEFLAGS    = -D$(PCC_OS) $(CFLAGS) $(PROFILEFLAGS) $(CCOMMONFLAGS)
CUNSAFEFLAGS  = -D$(PCC_OS) $(CFLAGS) $(CCOMMONFLAGS) $(CCOMMONFLAGS)

CPPSAFEFLAGS  = $(CSAFEFLAGS)
CPPUNSAFEFLAGS  = $(CUNSAFEFLAGS)

Lines 21-27 Link Here

(-)runtime/php-ext/php-extensions.mk.orig (-1 / +1 lines)
21	MY_TESTDIR = $(MY_DIR)tests/	21	MY_TESTDIR = $(MY_DIR)tests/
22	MY_TESTOUTDIR = $(MY_TESTDIR)testoutput/	22	MY_TESTOUTDIR = $(MY_TESTDIR)testoutput/
23		23
24	PCC_COMMON = -v -L $(PCC_ROOT)/libs -L $(BIGLOO_LIB_PATH)	24	PCC_COMMON = -v -L $(PCC_ROOT)/libs -L $(BIGLOO_LIB_PATH) @@CFLAGS@@ @@LDFLAGS@@ @@PCCCFLAGS@@ @@PCCLDFLAGS@@
25		25
26	TAGFILE = $(LIBNAME).tags	26	TAGFILE = $(LIBNAME).tags
27	APIDOCFILE = $(TOPLEVEL)doc/api/ext-$(LIBNAME).texi	27	APIDOCFILE = $(TOPLEVEL)doc/api/ext-$(LIBNAME).texi

Lines 15-22 Link Here

(-)tools/libwebserver/Makefile.in.orig (-3 / +3 lines)
15	libdir=@libdir@	15	libdir=@libdir@
16	includedir=@includedir@	16	includedir=@includedir@
17		17
18	all:	18	all:
19	cd src; $(MAKE)	19	cd src; $(MAKE)
20	# cd help; $(MAKE)	20	# cd help; $(MAKE)
21	# cd examples; $(MAKE) -i	21	# cd examples; $(MAKE) -i
22		22
Lines 28-34 Link Here
28	# cd help; $(MAKE) clean	28	# cd help; $(MAKE) clean
29		29
30		30
31	distclean:	31	distclean:
32	@rm -f config.cache	32	@rm -f config.cache
33	@rm -f config.log	33	@rm -f config.log
34	@rm -f config.status	34	@rm -f config.status

Lines 1-4 Link Here

(-)tools/libwebserver/src/Makefile.in.orig (-8 / +11 lines)
		1	AR=@AR@
1	CC=@CC@	2	CC=@CC@
		3	RANLIB=@RANLIB@
		4	LDFLAGS=@LDFLAGS@
2	INCLUDE=-I../include @INCLUDE@	5	INCLUDE=-I../include @INCLUDE@
3	BIN=../bin	6	BIN=../bin
4	LIBDIR=@LIBDIR@	7	LIBDIR=@LIBDIR@
Lines 16-28 Link Here
16	CFLAGS=@CFLAGS@ -I ../Win32 -O2 -fomit-frame-pointer -Wall	19	CFLAGS=@CFLAGS@ -I ../Win32 -O2 -fomit-frame-pointer -Wall
17	else	20	else
18	ifeq ($(MACOSX),yes)	21	ifeq ($(MACOSX),yes)
19	CFLAGS=@CFLAGS@ -fPIC -O2 -fomit-frame-pointer -Wall	22	CFLAGS=@CFLAGS@ -fPIC -Wall
20	DLL=libwebserver.dylib	23	DLL=libwebserver.dylib
21	SHAREDFLAG=-r -dynamiclib -undefined dynamic_lookup -single_module	24	SHAREDFLAG=-r -dynamiclib -undefined dynamic_lookup -single_module
22	LIBS=@LIBS@	25	LIBS=@LIBS@
23	DEFINES=@DEFS@ -D_SERVER_VERSION="\"@VERSION@\""	26	DEFINES=@DEFS@ -D_SERVER_VERSION="\"@VERSION@\""
24	else	27	else
25	CFLAGS=@CFLAGS@ -fPIC -O2 -fomit-frame-pointer -Wall	28	CFLAGS=@CFLAGS@ -fPIC -Wall
26	DLL=libwebserver.so	29	DLL=libwebserver.so
27	SHAREDFLAG=-shared	30	SHAREDFLAG=-shared
28	LIBS=@LIBS@	31	LIBS=@LIBS@
Lines 31-39 Link Here
31	endif	34	endif
32		35
33	all: $(OBJS) $(WIN_OBJS)	36	all: $(OBJS) $(WIN_OBJS)
34	$(CC) $(WIN_LINKCMD) $(OBJS) $(WIN_OBJS) $(LIBS) $(LIBDIR) $(SHAREDFLAG) -o $(DLL)	37	$(CC) $(WIN_LINKCMD) $(OBJS) $(WIN_OBJS) $(LIBS) $(LIBDIR) $(SHAREDFLAG) -o $(DLL) $(LDFLAGS)
35	ar -r libwebserver.a *.o	38	$(AR) -r libwebserver.a *.o
36	ranlib libwebserver.a	39	$(RANLIB) libwebserver.a
37	#ifeq ($(MINGW32),no)	40	#ifeq ($(MINGW32),no)
38	# mkdir -p $(BIN);	41	# mkdir -p $(BIN);
39	# cp libwebserver.a $(DLL) $(BIN)	42	# cp libwebserver.a $(DLL) $(BIN)
Lines 41-55 Link Here
41		44
42		45
43	.c.o:	46	.c.o:
44	$(CC) -c $< $(CFLAGS) $(DEFINES) $(INCLUDE)	47	$(CC) -c $< $(CFLAGS) $(DEFINES) $(INCLUDE) $(LDFLAGS)
45		48
46		49
47		50
48		51
49		52
50	clean:	53	clean:
51	@echo "Cleaning...";	54	@echo "Cleaning...";
52	@rm -f *.o	55	@rm -f *.o
53	@rm Makefile	56	@rm Makefile
54	@rm -f $(DLL)	57	@rm -f $(DLL)
55	@rm -f libwebserver.a	58	@rm -f libwebserver.a




AC_CONFIG_HEADER([include/config.h])
AC_CANONICAL_SYSTEM # for target_os


openssl="disabled"
debug="disabled"
#VERSION="libwebserver v`pwd |sed \"s/^.*libwebserver\/\\(.*\\)$/\1/\"`"

VERSION="libwebserver 0.53-RE"
RELEASE="0.53-RE"


dnl Checks for programs.
CFLAGS="";
AC_PROG_CC
AC_PROG_MAKE_SET
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_MINGW32
dnl AC_PROG_AR is not provided with autotools
AC_ARG_VAR([AR],[path to ar])
AC_PATH_PROGS(AR,ar)
if test "$AR" = ""; then
    AC_MSG_ERROR([ar is required])
fi

case "$target_os" in 
darwin*)

AC_ARG_ENABLE(debug, [ --enable-debug], 
[ 
AC_DEFINE(DEBUG,1)
CFLAGS="$CFLAGS -g"
debug="enabled"
VERSION="$VERSION (debug)"
 ])

Lines 3-10 Link Here

(-)runtime/Makefile.in.orig (-3 / +3 lines)
3		3
4	#-D_ISOC99_SOURCE is necessary for the isfinite and isnan macros	4	#-D_ISOC99_SOURCE is necessary for the isfinite and isnan macros
5	#-D_GNU_SOURCE includes _ISOC99_SOURCE and gives us some stuff for fstat	5	#-D_GNU_SOURCE includes _ISOC99_SOURCE and gives us some stuff for fstat
6	BCOMMONFLAGS = -L $(BGL_DEFAULT_LIB_DIR) -copt -D_GNU_SOURCE -L ../libs # -D_ISOC99_SOURCE	6	BCOMMONFLAGS += -L $(BGL_DEFAULT_LIB_DIR) -copt -D_GNU_SOURCE -L ../libs
7	CCOMMONFLAGS = -I. -I$(BGL_DEFAULT_LIB_DIR)	7	CCOMMONFLAGS += -I. -I$(BGL_DEFAULT_LIB_DIR)
8		8
9	SOURCE_LIST = php-runtime php-hash php-object php-ini utils opaque-math-binding \	9	SOURCE_LIST = php-runtime php-hash php-object php-ini utils opaque-math-binding \
10	grasstable url-rewriter signatures extended-streams constants finalizers \	10	grasstable url-rewriter signatures extended-streams constants finalizers \
Lines 55-61 Link Here
55	$(call dllcmd,../libs/libphp-runtime_$(SUV).$(SOEXT)) $(POPULATION) $(C_POPULATION) $(RUNTIME_DLL_LIBS)	55	$(call dllcmd,../libs/libphp-runtime_$(SUV).$(SOEXT)) $(POPULATION) $(C_POPULATION) $(RUNTIME_DLL_LIBS)
56		56
57	../libs/libphp-runtime_$(SUV).a: ../libs/php-runtime.heap $(STATIC_POPULATION) $(C_STATIC_POPULATION)	57	../libs/libphp-runtime_$(SUV).a: ../libs/php-runtime.heap $(STATIC_POPULATION) $(C_STATIC_POPULATION)
58	ar ruv ../libs/libphp-runtime_$(SUV).a $(STATIC_POPULATION) $(C_STATIC_POPULATION)	58	$(AR) ruv ../libs/libphp-runtime_$(SUV).a $(STATIC_POPULATION) $(C_STATIC_POPULATION)
59		59
60	../libs/php-runtime.heap: php-runtime.sch $(SOURCE_FILES)	60	../libs/php-runtime.heap: php-runtime.sch $(SOURCE_FILES)
61	$(BIGLOO) $(BHEAPFLAGS) -heap-library php-runtime make-lib.scm -addheap ../libs/php-runtime.heap	61	$(BIGLOO) $(BHEAPFLAGS) -heap-library php-runtime make-lib.scm -addheap ../libs/php-runtime.heap

Lines 1-8 Link Here

(-)compiler/Makefile.in.orig (-2 / +2 lines)
1	PCC_ROOT = ..	1	PCC_ROOT = ..
2	include $(PCC_ROOT)/bigloo-rules.mk	2	include $(PCC_ROOT)/bigloo-rules.mk
3		3
4	BCOMMONFLAGS = $(READLINE_SRFI) -L $(BGL_DEFAULT_LIB_DIR) -L ../libs -I ../libs	4	BCOMMONFLAGS += $(READLINE_SRFI) -L $(BGL_DEFAULT_LIB_DIR) -L ../libs -I ../libs
5	CCOMMONFLAGS = -I. -I$(BGL_DEFAULT_LIB_DIR)	5	CCOMMONFLAGS += -I. -I$(BGL_DEFAULT_LIB_DIR)
6		6
7	# for pcc	7	# for pcc
8	SOURCE_LIST = ast lexers parser driver evaluate commandline containers \	8	SOURCE_LIST = ast lexers parser driver evaluate commandline containers \

Lines 38-45 Link Here

(-)runtime/ext/extensions.mk.orig (-2 / +2 lines)
38	MY_TESTDIR = $(MY_DIR)tests/	38	MY_TESTDIR = $(MY_DIR)tests/
39	MY_TESTOUTDIR = $(MY_TESTDIR)testoutput/	39	MY_TESTOUTDIR = $(MY_TESTDIR)testoutput/
40		40
41	CCOMMONFLAGS = -I. -I$(BGL_DEFAULT_LIB_DIR) $(C_SOURCE_FLAGS)	41	CCOMMONFLAGS += -I. -I$(BGL_DEFAULT_LIB_DIR) $(C_SOURCE_FLAGS)
42	BCOMMONFLAGS = -L $(BGL_DEFAULT_LIB_DIR) $(BCFLAGS) $(PHPOO_INC) $(PHPOO_LIBS)	42	BCOMMONFLAGS += -L $(BGL_DEFAULT_LIB_DIR) $(BCFLAGS) $(PHPOO_INC) $(PHPOO_LIBS)
43		43
44		44
45	TAGFILE = $(LIBNAME).tags	45	TAGFILE = $(LIBNAME).tags

Lines 1-8 Link Here

(-)tools/profiler/Makefile.in.orig (-3 / +3 lines)
1	PCC_ROOT = ../..	1	PCC_ROOT = ../..
2	include $(PCC_ROOT)/bigloo-rules.mk	2	include $(PCC_ROOT)/bigloo-rules.mk
3		3
4	BCOMMONFLAGS = -copt -D_ISOC99_SOURCE	4	BCOMMONFLAGS += -copt -D_ISOC99_SOURCE
5	CCOMMONFLAGS = -I. -I$(BGL_DEFAULT_LIB_DIR) -O -I/usr/local/include	5	CCOMMONFLAGS += -I. -I$(BGL_DEFAULT_LIB_DIR) -I/usr/local/include
6		6
7	SOURCE_LIST = profiler profiler-c-bindings	7	SOURCE_LIST = profiler profiler-c-bindings
8	C_SOURCE_LIST = $(WINDOWS_TIME_SUPPORT)	8	C_SOURCE_LIST = $(WINDOWS_TIME_SUPPORT)
Lines 37-43 Link Here
37	$(call dllcmd,../../libs/libprofiler_$(SUV).$(SOEXT)) $(POPULATION) $(C_POPULATION) $(PROFILER_DLL_LIBS)	37	$(call dllcmd,../../libs/libprofiler_$(SUV).$(SOEXT)) $(POPULATION) $(C_POPULATION) $(PROFILER_DLL_LIBS)
38		38
39	../../libs/libprofiler_$(SUV).a: ../../libs/profiler.heap $(STATIC_POPULATION) $(C_STATIC_POPULATION)	39	../../libs/libprofiler_$(SUV).a: ../../libs/profiler.heap $(STATIC_POPULATION) $(C_STATIC_POPULATION)
40	ar ruv ../../libs/libprofiler_$(SUV).a $(STATIC_POPULATION) $(C_STATIC_POPULATION)	40	$(AR) ruv ../../libs/libprofiler_$(SUV).a $(STATIC_POPULATION) $(C_STATIC_POPULATION)
41		41
42	../../libs/profiler.heap: $(SOURCE_FILES)	42	../../libs/profiler.heap: $(SOURCE_FILES)
43	$(BIGLOO) $(BHEAPFLAGS) -heap-library profiler make-lib.scm -addheap ../../libs/profiler.heap	43	$(BIGLOO) $(BHEAPFLAGS) -heap-library profiler make-lib.scm -addheap ../../libs/profiler.heap

Lines 1-11 Link Here

(-)tools/c-interface/Makefile.in.orig (-2 / +2 lines)
1	PCC_ROOT = ../..	1	PCC_ROOT = ../..
2	include $(PCC_ROOT)/bigloo-rules.mk	2	include $(PCC_ROOT)/bigloo-rules.mk
3		3
4	BCOMMONFLAGS = -I $(PCC_ROOT)/libs -L $(PCC_ROOT)/libs	4	BCOMMONFLAGS += -I $(PCC_ROOT)/libs -L $(PCC_ROOT)/libs
5	SOURCE_LIST = c-interface	5	SOURCE_LIST = c-interface
6	C_SOURCE_LIST = c-glue	6	C_SOURCE_LIST = c-glue
7		7
8	CCOMMONFLAGS = -I. -I$(BGL_DEFAULT_LIB_DIR) -O -I/usr/local/include -L$(PCC_ROOT)/libs -I$(PCC_ROOT)/runtime	8	CCOMMONFLAGS += -I. -I$(BGL_DEFAULT_LIB_DIR) -I/usr/local/include -L$(PCC_ROOT)/libs -I$(PCC_ROOT)/runtime
9		9
10	C_SOURCE_FILES := $(patsubst %,%.c,$(C_SOURCE_LIST))	10	C_SOURCE_FILES := $(patsubst %,%.c,$(C_SOURCE_LIST))
11	C_POPULATION := $(patsubst %,%_$(SU).o,$(C_SOURCE_LIST))	11	C_POPULATION := $(patsubst %,%_$(SU).o,$(C_SOURCE_LIST))

Lines 1-8 Link Here

(-)tools/readline/Makefile.in.orig (-2 / +2 lines)
1	PCC_ROOT = ../..	1	PCC_ROOT = ../..
2	include $(PCC_ROOT)/bigloo-rules.mk	2	include $(PCC_ROOT)/bigloo-rules.mk
3		3
4	BCOMMONFLAGS = -copt -D_ISOC99_SOURCE	4	BCOMMONFLAGS += -copt -D_ISOC99_SOURCE
5	CCOMMONFLAGS = -I. -I$(BGL_DEFAULT_LIB_DIR) -O -I/usr/local/include	5	CCOMMONFLAGS += -I. -I$(BGL_DEFAULT_LIB_DIR) -I/usr/local/include
6		6
7	SOURCE_LIST = readline history	7	SOURCE_LIST = readline history
8	C_SOURCE_LIST =	8	C_SOURCE_LIST =

Lines 5-11 Link Here

(-)webconnect/Makefile.in.orig (-1 / +1 lines)
5		5
6	BIGLOO_VERSION = `bigloo -eval '(begin (print bigloo-version) (exit 0))'`	6	BIGLOO_VERSION = `bigloo -eval '(begin (print bigloo-version) (exit 0))'`
7	PHPOO_INC = -I ../.. -library profiler	7	PHPOO_INC = -I ../.. -library profiler
8	BCOMMONFLAGS = -L ../libs -copt -I/usr/local/include	8	BCOMMONFLAGS += -L ../libs -copt -I/usr/local/include
9		9
10	SOURCE_LIST = webconnect make-lib cgi	10	SOURCE_LIST = webconnect make-lib cgi
11		11

Lines 5-11 Link Here

(-)webconnect/fastcgi/Makefile.in.orig (-1 / +1 lines)
5		5
6	BIGLOO_VERSION = `bigloo -eval '(begin (print bigloo-version) (exit 0))'`	6	BIGLOO_VERSION = `bigloo -eval '(begin (print bigloo-version) (exit 0))'`
7	PHPOO_INC = -I ../.. -library profiler	7	PHPOO_INC = -I ../.. -library profiler
8	BCOMMONFLAGS = -L ../../libs -copt -I$(PCC_ROOT)/../include -copt -L$(PCC_ROOT)/../lib	8	BCOMMONFLAGS += -L ../../libs -copt -I$(PCC_ROOT)/../include -copt -L$(PCC_ROOT)/../lib
9		9
10	SOURCE_LIST = fastcgi fcgi-binding c-fcgi-bindings	10	SOURCE_LIST = fastcgi fcgi-binding c-fcgi-bindings
11	C_SOURCE_LIST = c-fcgi	11	C_SOURCE_LIST = c-fcgi

Lines 2-8 Link Here

(-)webconnect/micro/Makefile.in.orig (-2 / +2 lines)
2	include $(PCC_ROOT)/bigloo-rules.mk	2	include $(PCC_ROOT)/bigloo-rules.mk
3		3
4	BIGLOO_VERSION = `bigloo -eval '(begin (print bigloo-version) (exit 0))'`	4	BIGLOO_VERSION = `bigloo -eval '(begin (print bigloo-version) (exit 0))'`
5	BCOMMONFLAGS = -L $(PCC_ROOT)libs -copt -I$(PCC_ROOT)libs -copt -I$(PCC_ROOT)/tools/libwebserver/include	5	BCOMMONFLAGS += -L $(PCC_ROOT)libs -copt -I$(PCC_ROOT)libs -copt -I$(PCC_ROOT)/tools/libwebserver/include
6		6
7	# cgen binary	7	# cgen binary
8	CGEN = $(shell which cgen)	8	CGEN = $(shell which cgen)
Lines 32-38 Link Here
32	$(call dllcmd_i,$(PCC_ROOT)libs/libmhttpd_$(SUV).$(SOEXT)) $(M_POPULATION) $(MHTTPD_DLL_LIBS)	32	$(call dllcmd_i,$(PCC_ROOT)libs/libmhttpd_$(SUV).$(SOEXT)) $(M_POPULATION) $(MHTTPD_DLL_LIBS)
33		33
34	$(PCC_ROOT)libs/libmhttpd_$(SUV).a: $(PCC_ROOT)libs/mhttpd.heap $(M_STATIC_POPULATION)	34	$(PCC_ROOT)libs/libmhttpd_$(SUV).a: $(PCC_ROOT)libs/mhttpd.heap $(M_STATIC_POPULATION)
35	ar ruv $(PCC_ROOT)libs/libmhttpd_$(SUV).a $(M_STATIC_POPULATION)	35	$(AR) ruv $(PCC_ROOT)libs/libmhttpd_$(SUV).a $(M_STATIC_POPULATION)
36		36
37	$(PCC_ROOT)libs/mhttpd.heap: $(M_POPULATION)	37	$(PCC_ROOT)libs/mhttpd.heap: $(M_POPULATION)
38	$(BIGLOO) $(BHEAPFLAGS) make-mhttpd-lib.scm -heap-library mhttpd -addheap $(PCC_ROOT)libs/mhttpd.heap	38	$(BIGLOO) $(BHEAPFLAGS) make-mhttpd-lib.scm -heap-library mhttpd -addheap $(PCC_ROOT)libs/mhttpd.heap

Return to bug 306591

Lines 472-482 Link Here

(-)configure.in.orig (-1 / +8 lines)
472	AC_CONFIG_FILES([doc/pcc.conf])	472	AC_CONFIG_FILES([doc/pcc.conf])
473	AC_CONFIG_FILES([sa-tests/pcc-test.conf])	473	AC_CONFIG_FILES([sa-tests/pcc-test.conf])
474	AC_CONFIG_FILES([webconnect/Makefile])	474	AC_CONFIG_FILES([webconnect/Makefile])
		475	AC_CONFIG_FILES([webconnect/fastcgi/Makefile])
		476	AC_CONFIG_FILES([webconnect/micro/Makefile])
		477	AC_CONFIG_FILES([compiler/Makefile])
		478	AC_CONFIG_FILES([tools/c-interface/Makefile])
		479	AC_CONFIG_FILES([tools/profiler/Makefile])
		480	AC_CONFIG_FILES([tools/readline/Makefile])
		481	AC_CONFIG_FILES([runtime/Makefile])
475	AC_CONFIG_FILES([runtime/php-ext/pdo/Makefile])	482	AC_CONFIG_FILES([runtime/php-ext/pdo/Makefile])
476	AC_CONFIG_FILES([runtime/php-ext/pdo/pdo_class.php])	483	AC_CONFIG_FILES([runtime/php-ext/pdo/pdo_class.php])
477	AC_CONFIG_FILES([compiler/config.scm])	484	AC_CONFIG_FILES([compiler/config.scm])
478		485
479	#AC_CONFIG_SUBDIRS([tools/libwebserver])	486	AC_CONFIG_SUBDIRS([tools/libwebserver])
480	AC_OUTPUT	487	AC_OUTPUT
481		488
482	dnl ==========================================================================	489	dnl ==========================================================================

Lines 28-41 Link Here

(-)bigloo-rules.mk.orig (-3 / +6 lines)
28		28
29	BHEAPFLAGS = -unsafe -mkaddheap -mkaddlib -L $(BGL_DEFAULT_LIB_DIR)	29	BHEAPFLAGS = -unsafe -mkaddheap -mkaddlib -L $(BGL_DEFAULT_LIB_DIR)
30		30
		31	BCOMMONFLAGS += @@CFLAGS@@ @@LDFLAGS@@
		32	CCOMMONFLAGS += $(CFLAGS)
		33
31	# -fsharing?	34	# -fsharing?
32	# -mkaddlib shortens our startup time because it changes bigloo's constant allocation mode	35	# -mkaddlib shortens our startup time because it changes bigloo's constant allocation mode
33	BSAFEFLAGS = -mkaddlib -L $(BGL_DEFAULT_LIB_DIR) -unsafev -copt -D$(PCC_OS) -srfi $(PCC_OS) -O3 -g -cg +rm $(PROFILEFLAGS) $(BCOMMONFLAGS)	36	BSAFEFLAGS = -mkaddlib -L $(BGL_DEFAULT_LIB_DIR) -unsafev -copt -D$(PCC_OS) -srfi $(PCC_OS) -O3 -g -cg +rm $(PROFILEFLAGS) $(BCOMMONFLAGS)
34	BUNSAFEFLAGS = -mkaddlib -L $(BGL_DEFAULT_LIB_DIR) -copt -D$(PCC_OS) -srfi $(PCC_OS) -srfi unsafe -O6 -unsafe $(BCOMMONFLAGS)	37	BUNSAFEFLAGS = -mkaddlib -L $(BGL_DEFAULT_LIB_DIR) -copt -D$(PCC_OS) -srfi $(PCC_OS) -srfi unsafe -O6 -unsafe $(BCOMMONFLAGS)
35		38
36	# the -srfi bit makes cond-expand work in scheme code	39	# the -srfi bit makes cond-expand work in scheme code
37	CSAFEFLAGS = -D$(PCC_OS) -O -g $(PROFILEFLAGS) $(CCOMMONFLAGS)	40	CSAFEFLAGS = -D$(PCC_OS) $(CFLAGS) $(PROFILEFLAGS) $(CCOMMONFLAGS)
38	CUNSAFEFLAGS = -D$(PCC_OS) -O4 $(CCOMMONFLAGS)	41	CUNSAFEFLAGS = -D$(PCC_OS) $(CFLAGS) $(CCOMMONFLAGS) $(CCOMMONFLAGS)
39		42
40	CPPSAFEFLAGS = $(CSAFEFLAGS)	43	CPPSAFEFLAGS = $(CSAFEFLAGS)
41	CPPUNSAFEFLAGS = $(CUNSAFEFLAGS)	44	CPPUNSAFEFLAGS = $(CUNSAFEFLAGS)

Lines 4-10 Link Here

(-)tools/libwebserver/configure.in.orig (-5 / +8 lines)
4	AC_CONFIG_HEADER([include/config.h])	4	AC_CONFIG_HEADER([include/config.h])
5	AC_CANONICAL_SYSTEM # for target_os	5	AC_CANONICAL_SYSTEM # for target_os
6		6
7
8	openssl="disabled"	7	openssl="disabled"
9	debug="disabled"	8	debug="disabled"
10	#VERSION="libwebserver v`pwd \|sed \"s/^.libwebserver\/\\(.\\)$/\1/\"`"	9	#VERSION="libwebserver v`pwd \|sed \"s/^.libwebserver\/\\(.\\)$/\1/\"`"
Lines 12-25 Link Here
12	VERSION="libwebserver 0.53-RE"	11	VERSION="libwebserver 0.53-RE"
13	RELEASE="0.53-RE"	12	RELEASE="0.53-RE"
14		13
15
16	dnl Checks for programs.	14	dnl Checks for programs.
17	CFLAGS="";
18	AC_PROG_CC	15	AC_PROG_CC
19	AC_PROG_MAKE_SET	16	AC_PROG_MAKE_SET
20	AC_PROG_RANLIB	17	AC_LIBTOOL_DLOPEN
		18	AC_PROG_LIBTOOL
21	AC_PROG_INSTALL	19	AC_PROG_INSTALL
22	AC_MINGW32	20	AC_MINGW32
		21	dnl AC_PROG_AR is not provided with autotools
		22	AC_ARG_VAR([AR],[path to ar])
		23	AC_PATH_PROGS(AR,ar)
		24	if test "$AR" = ""; then
		25	AC_MSG_ERROR([ar is required])
		26	fi
23		27
24	case "$target_os" in	28	case "$target_os" in
25	darwin*)	29	darwin*)
Lines 55-61 Link Here
55	AC_ARG_ENABLE(debug, [ --enable-debug],	59	AC_ARG_ENABLE(debug, [ --enable-debug],
56	[	60	[
57	AC_DEFINE(DEBUG,1)	61	AC_DEFINE(DEBUG,1)
58	CFLAGS="$CFLAGS -g"
59	debug="enabled"	62	debug="enabled"
60	VERSION="$VERSION (debug)"	63	VERSION="$VERSION (debug)"
61	])	64	])