* Get rid of libphp_util.la

* Don't build CGI from convenience library
    * Add additional checks to regex.h (Apache build broke)

Makefile.am

@@ -7,18 +7,18 @@ CPPFLAGS := $(INCLUDES) -I$(ZEND_DIR) -I$(srcdir)/TSRM
 
 BUILDLDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS)
 
-noinst_LTLIBRARIES = libphp_util.la
-libphp_util_la_SOURCES = \
+phptemp_LTLIBRARIES = libphp4.la
+libphp4_la_SOURCES = \
        main.c internal_functions.c snprintf.c php3_sprintf.c \
        configuration-parser.y configuration-scanner.l request_info.c \
        safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \
        php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \
 	   strlcat.c
 
-libphp_util_la_LIBADD = libzend/libzend.la \
+libphp4_la_LIBADD = libzend/libzend.la \
 		sapi/$(PHP_SAPI)/libphpsapi_$(PHP_SAPI).la \
-		regex/libregex.la $(EXT_LTLIBS) $(TSRM_LIB)
-		
+		regex/libregex.la $(EXT_LTLIBS) $(TSRM_LIB) $(EXTRA_LIBS)
+libphp4_la_LDFLAGS = -avoid-version $(BUILDLDFLAGS) $(PHP_RPATHS)		
 
 configuration-parser.h configuration-parser.c: configuration-parser.y
 	$(YACC) -p cfg -v -d $< -o configuration-parser.c
@@ -28,15 +28,10 @@ configuration-scanner.c: configuration-scanner.l
 
 EXTRA_PROGRAMS = php
 
-phptemp_LTLIBRARIES = libphp4.la
-libphp4_la_SOURCES = stub.c
-libphp4_la_LIBADD = libphp_util.la $(EXTRA_LIBS)
-libphp4_la_LDFLAGS = -module -avoid-version $(BUILDLDFLAGS) $(NATIVE_RPATHS)
-
 noinst_PROGRAMS = $(PHP_PROGRAM)
 php_SOURCES = stub.c
-php_LDADD = libphp_util.la $(EXTRA_LIBS)
-php_LDFLAGS = -export-dynamic $(BUILDLDFLAGS) $(PHP_RPATHS)
+php_LDADD = libphp4.la
+php_LDFLAGS = -export-dynamic
 
 install-data-local:
 	$(INSTALL_IT)

ext/ereg/regex/regex.h

@@ -1,3 +1,5 @@
+#ifndef _REGEX_H_
+#define _REGEX_H_
 #ifndef _REGEX_H
 #define	_REGEX_H	/* never again */
 /* ========= begin header generated by ././mkh ========= */
@@ -77,3 +79,4 @@ API_EXPORT(void) regfree(regex_t *);
 #endif
 /* ========= end header generated by ././mkh ========= */
 #endif
+#endif

regex/regex.h

@@ -1,3 +1,5 @@
+#ifndef _REGEX_H_
+#define _REGEX_H_
 #ifndef _REGEX_H
 #define	_REGEX_H	/* never again */
 /* ========= begin header generated by ././mkh ========= */
@@ -77,3 +79,4 @@ API_EXPORT(void) regfree(regex_t *);
 #endif
 /* ========= end header generated by ././mkh ========= */
 #endif
+#endif