From: mhei Date: Wed, 19 Oct 2011 19:23:51 +0000 (+0000) Subject: [packages] php5: Add support for using the system timezone database X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=9fa6d05c3238387ae4faffe3f9413e47b6d22b81;p=packages.git [packages] php5: Add support for using the system timezone database Using the systems database rather than embedding a copy has several advantages. Its easier to keep the database up-to-date and it can be used by multiple applications. So some bytes in the firmware image can be saved, especially when only required timezones are installed. Additionally, it not necessary anymore to configure the timezone explicitly via php.ini (required since PHP 5.3). Instead OpenWRTs system-wide settings are used. This new approach is enabled by default, however it is possible to deselect this feature to restore PHP's original behaviour. The patches are taken from the Debian PHP patches. Signed-off-by: Peter Naulls Signed-off-by: Michael Heimpold git-svn-id: svn://svn.openwrt.org/openwrt/packages@28491 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 2b2f020d5..2e9753413 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=5.3.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ @@ -40,7 +40,7 @@ PHP5_MODULES = \ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_php5-cgi CONFIG_PACKAGE_php5-cli \ $(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \ - CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML + CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML PHP5_SYSTEMTZDATA include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -68,6 +68,16 @@ define Package/php5/config config PHP5_LIBXML bool "PHP5 LIBXML support" depends on PACKAGE_php5-cli || PACKAGE_php5-cgi + + config PHP5_SYSTEMTZDATA + bool "Use system timezone data instead of php's built-in database" + depends on PACKAGE_php5-cli || PACKAGE_php5-cgi + select PACKAGE_zoneinfo-core + default y + help + Enabling this feature automatically selects the zoneinfo-core package + which contains data for UTC timezone. To use other timezones you have + to install the corresponding zoneinfo-... package(s). endef define Package/php5 @@ -431,6 +441,12 @@ else CONFIGURE_ARGS+= --disable-libxml endif +ifneq ($(CONFIG_PHP5_SYSTEMTZDATA),) + CONFIGURE_ARGS+= --with-system-tzdata +else + CONFIGURE_ARGS+= --without-system-tzdata +endif + CONFIGURE_VARS+= \ LIBS="$(CONFIGURE_LIBS)" \ ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \ diff --git a/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch b/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch new file mode 100644 index 000000000..24a283a52 --- /dev/null +++ b/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch @@ -0,0 +1,655 @@ + +Add support for use of the system timezone database, rather +than embedding a copy. Discussed upstream but was not desired. + +History: +r7: per Sean Finney's review: simpler lat/long rounding, + use stat() not access() to check existence of timezone, + improve comments throughout. +r6: fix fd leak in r5, fix country code/BC flag use in + timezone_identifiers_list() using system db, + fix use of PECL timezonedb to override system db, +r5: reverts addition of "System/Localtime" fake tzname. + updated for 5.3.0, parses zone.tab to pick up mapping between + timezone name, country code and long/lat coords +r4: added "System/Localtime" tzname which uses /etc/localtime +r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) +r2: add filesystem trawl to set up name alias index +r1: initial revision + +--- a/ext/date/lib/parse_tz.c ++++ b/ext/date/lib/parse_tz.c +@@ -20,6 +20,16 @@ + + #include "timelib.h" + ++#ifdef HAVE_SYSTEM_TZDATA ++#include ++#include ++#include ++#include ++#include ++ ++#include "php_scandir.h" ++#endif ++ + #include + + #ifdef HAVE_LOCALE_H +@@ -31,7 +41,12 @@ + #else + #include + #endif ++ ++#ifndef HAVE_SYSTEM_TZDATA + #include "timezonedb.h" ++#endif ++ ++#include + + #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) + # if defined(__LITTLE_ENDIAN__) +@@ -51,6 +66,11 @@ + + static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) + { ++ if (memcmp(tzf, "TZif", 4) == 0) { ++ *tzf += 20; ++ return; ++ } ++ + /* skip ID */ + *tzf += 4; + +@@ -256,7 +276,435 @@ void timelib_dump_tzinfo(timelib_tzinfo + } + } + +-static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) ++#ifdef HAVE_SYSTEM_TZDATA ++ ++#ifdef HAVE_SYSTEM_TZDATA_PREFIX ++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX ++#else ++#define ZONEINFO_PREFIX "/usr/share/zoneinfo" ++#endif ++ ++/* Hash table entry for the cache of the zone.tab mapping table. */ ++struct location_info { ++ char code[2]; /* Country code. */ ++ double latitude, longitude; ++ char name[64]; ++ char *comment; ++ struct location_info *next; ++}; ++ ++/* System timezone database pointer. */ ++static const timelib_tzdb *timezonedb_system = NULL; ++ ++/* Cache of zone.tab location data. */ ++static struct location_info **system_location_table; ++ ++/* Size of the zone.tab hash table; a random-ish prime big enough to ++ * prevent too many collisions. */ ++#define LOCINFO_HASH_SIZE (1021) ++ ++/* Hash function for indexing the location_info hash table. */ ++static uint32_t tz_hash(const char *str) ++{ ++ const unsigned char *p = (const unsigned char *)str; ++ uint32_t hash = 5381; ++ int c; ++ ++ while ((c = *p++) != '\0') { ++ hash = (hash << 5) ^ hash ^ c; ++ } ++ ++ return hash % LOCINFO_HASH_SIZE; ++} ++ ++/* Parse an ISO-6709 co-ordinate as used in zone.tab. Returns end of ++ * the parsed string on success, or NULL on parse error. On success, ++ * writes the parsed number to *result. */ ++static char *parse_iso6709(char *p, double *result) ++{ ++ double v, sign; ++ char *pend; ++ size_t len; ++ ++ if (*p == '+') ++ sign = 1.0; ++ else if (*p == '-') ++ sign = -1.0; ++ else ++ return NULL; ++ ++ p++; ++ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) ++ ;; ++ ++ /* Annoying encoding used by zone.tab has no decimal point, so use ++ * the length to determine the format: ++ * ++ * 4 = DDMM ++ * 5 = DDDMM ++ * 6 = DDMMSS ++ * 7 = DDDMMSS ++ */ ++ len = pend - p; ++ if (len < 4 || len > 7) { ++ return NULL; ++ } ++ ++ /* p => [D]DD */ ++ v = (p[0] - '0') * 10.0 + (p[1] - '0'); ++ p += 2; ++ if (len == 5 || len == 7) ++ v = v * 10.0 + (*p++ - '0'); ++ /* p => MM[SS] */ ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 60.0; ++ p += 2; ++ /* p => [SS] */ ++ if (len > 5) { ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 3600.0; ++ p += 2; ++ } ++ ++ /* Round to five decimal place, not because it's a good idea, ++ * but, because the builtin data uses rounded data, so, match ++ * that. */ ++ *result = sign * (int)(v * 100000.0 + 0.5) / 100000.0; ++ ++ return p; ++} ++ ++/* This function parses the zone.tab file to build up the mapping of ++ * timezone to country code and geographic location, and returns a ++ * hash table. The hash table is indexed by the function: ++ * ++ * tz_hash(timezone-name) ++ */ ++static struct location_info **create_location_table(void) ++{ ++ struct location_info **li, *i; ++ char zone_tab[PATH_MAX]; ++ char line[512]; ++ FILE *fp; ++ ++ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); ++ ++ fp = fopen(zone_tab, "r"); ++ if (!fp) { ++ return NULL; ++ } ++ ++ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); ++ ++ while (fgets(line, sizeof line, fp)) { ++ char *p = line, *code, *name, *comment; ++ uint32_t hash; ++ double latitude, longitude; ++ ++ while (isspace(*p)) ++ p++; ++ ++ if (*p == '#' || *p == '\0' || *p == '\n') ++ continue; ++ ++ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t') ++ continue; ++ ++ /* code => AA */ ++ code = p; ++ p[2] = 0; ++ p += 3; ++ ++ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */ ++ p = parse_iso6709(p, &latitude); ++ if (!p) { ++ continue; ++ } ++ p = parse_iso6709(p, &longitude); ++ if (!p) { ++ continue; ++ } ++ ++ if (!p || *p != '\t') { ++ continue; ++ } ++ ++ /* name = string */ ++ name = ++p; ++ while (*p != '\t' && *p && *p != '\n') ++ p++; ++ ++ *p++ = '\0'; ++ ++ /* comment = string */ ++ comment = p; ++ while (*p != '\t' && *p && *p != '\n') ++ p++; ++ ++ if (*p == '\n' || *p == '\t') ++ *p = '\0'; ++ ++ hash = tz_hash(name); ++ i = malloc(sizeof *i); ++ memcpy(i->code, code, 2); ++ strncpy(i->name, name, sizeof i->name); ++ i->comment = strdup(comment); ++ i->longitude = longitude; ++ i->latitude = latitude; ++ i->next = li[hash]; ++ li[hash] = i; ++ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */ ++ } ++ ++ fclose(fp); ++ ++ return li; ++} ++ ++/* Return location info from hash table, using given timezone name. ++ * Returns NULL if the name could not be found. */ ++const struct location_info *find_zone_info(struct location_info **li, ++ const char *name) ++{ ++ uint32_t hash = tz_hash(name); ++ const struct location_info *l; ++ ++ if (!li) { ++ return NULL; ++ } ++ ++ for (l = li[hash]; l; l = l->next) { ++ if (strcasecmp(l->name, name) == 0) ++ return l; ++ } ++ ++ return NULL; ++} ++ ++/* Filter out some non-tzdata files and the posix/right databases, if ++ * present. */ ++static int index_filter(const struct dirent *ent) ++{ ++ return strcmp(ent->d_name, ".") != 0 ++ && strcmp(ent->d_name, "..") != 0 ++ && strcmp(ent->d_name, "posix") != 0 ++ && strcmp(ent->d_name, "posixrules") != 0 ++ && strcmp(ent->d_name, "right") != 0 ++ && strstr(ent->d_name, ".tab") == NULL; ++} ++ ++/* Comparison callback for qsort(), used to alpha-sort the index ++ * array by timezone name. */ ++static int sysdbcmp(const void *first, const void *second) ++{ ++ const timelib_tzdb_index_entry *alpha = first, *beta = second; ++ ++ return strcmp(alpha->id, beta->id); ++} ++ ++ ++/* Create the zone identifier index by trawling the filesystem. */ ++static void create_zone_index(timelib_tzdb *db) ++{ ++ size_t dirstack_size, dirstack_top; ++ size_t index_size, index_next; ++ timelib_tzdb_index_entry *db_index; ++ char **dirstack; ++ ++ /* LIFO stack to hold directory entries to scan; each slot is a ++ * directory name relative to the zoneinfo prefix. */ ++ dirstack_size = 32; ++ dirstack = malloc(dirstack_size * sizeof *dirstack); ++ dirstack_top = 1; ++ dirstack[0] = strdup(""); ++ ++ /* Index array. */ ++ index_size = 64; ++ db_index = malloc(index_size * sizeof *db_index); ++ index_next = 0; ++ ++ do { ++ struct dirent **ents; ++ char name[PATH_MAX], *top; ++ int count; ++ ++ /* Pop the top stack entry, and iterate through its contents. */ ++ top = dirstack[--dirstack_top]; ++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top); ++ ++ count = php_scandir(name, &ents, index_filter, php_alphasort); ++ ++ while (count > 0) { ++ struct stat st; ++ const char *leaf = ents[count - 1]->d_name; ++ ++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", ++ top, leaf); ++ ++ if (strlen(name) && stat(name, &st) == 0) { ++ /* Name, relative to the zoneinfo prefix. */ ++ const char *root = top; ++ ++ if (root[0] == '/') root++; ++ ++ snprintf(name, sizeof name, "%s%s%s", root, ++ *root ? "/": "", leaf); ++ ++ if (S_ISDIR(st.st_mode)) { ++ if (dirstack_top == dirstack_size) { ++ dirstack_size *= 2; ++ dirstack = realloc(dirstack, ++ dirstack_size * sizeof *dirstack); ++ } ++ dirstack[dirstack_top++] = strdup(name); ++ } ++ else { ++ if (index_next == index_size) { ++ index_size *= 2; ++ db_index = realloc(db_index, ++ index_size * sizeof *db_index); ++ } ++ ++ db_index[index_next++].id = strdup(name); ++ } ++ } ++ ++ free(ents[--count]); ++ } ++ ++ if (count != -1) free(ents); ++ free(top); ++ } while (dirstack_top); ++ ++ /* Alpha-sort the index array; shouldn't be technically necessary ++ * but some of the test cases rely on this, and, it matches the ++ * builtin database. */ ++ qsort(db_index, index_next, sizeof *db_index, sysdbcmp); ++ ++ db->index = db_index; ++ db->index_size = index_next; ++ ++ free(dirstack); ++} ++ ++#define FAKE_HEADER "1234\0??\1??" ++#define FAKE_BC_POS (0) ++#define FAKE_UTC_POS (7 - 4) ++ ++/* Create a fake data segment for database 'sysdb'. This mocks ++ * up a fake ->data segment for the given timezone database. ++ * php_date.c::timezone_identifiers_list() looks at data[pos + 4] ++ * through data[pos + 6] to compare the country code and BC flag, ++ * which are stored in the builtin data array like: ++ * ++ * (pos + 4) => BC flag ++ * (pos + 5, pos + 6) => Two chars of country code ++ * ++ * where pos is the index corresponding to the timezone name. ++ * ++ * Timezone names are classified here into three types: ++ * 1) UTC, which is special ++ * 2) "normal" zone names ++ * 3) "backwards-compat" zone names ++ * ++ * (boolean logic of the BC flag seems to be inverted, but hey) ++ * ++ * UTC is special since it has BC=\1, code = "??" ++ * "normal" zones exist in zone.tab and have the given c-code and BC=\1 ++ * "backwards-compat" zones don't exist in zone.tab and have BC=\0 ++ * ++ * Since UTC and the BC zones are constant, they are encoded in the ++ * FAKE_HEADER prefix, and pos pointers index into that. ++ * ++ * FAKE_HEADER is hence four random bytes, then the BC zone segment ++ * (three bytes), then the UTC zone segment (another three). ++ * ++ * For all "normal" zones, three bytes are appended to the data array; ++ * the BC flag, always 1, and the two bytes of country code. ++ */ ++static void fake_data_segment(timelib_tzdb *sysdb, ++ struct location_info **info) ++{ ++ size_t n; ++ char *data, *p; ++ ++ /* Worst case maximum is 3 bytes per zone, plus the header. */ ++ data = malloc((3 * sysdb->index_size) + sizeof(FAKE_HEADER) - 1); ++ ++ /* Append the fake header, p then = next byte */ ++ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); ++ ++ for (n = 0; n < sysdb->index_size; n++) { ++ const struct location_info *li; ++ timelib_tzdb_index_entry *ent; ++ ++ /* Lost const'ness since we're modifying the pos pointer. */ ++ ent = (timelib_tzdb_index_entry *)&sysdb->index[n]; ++ ++ /* Lookup the timezone name in the hash table. */ ++ if (strcmp(ent->id, "UTC") == 0) { ++ ent->pos = FAKE_UTC_POS; ++ continue; ++ } ++ ++ li = find_zone_info(info, ent->id); ++ if (li) { ++ /* If found, append the BC byte and the country code; set ++ * the position index for the timezone to point to ++ * this. */ ++ ent->pos = (p - data) - 4; ++ *p++ = '\x01'; ++ *p++ = li->code[0]; ++ *p++ = li->code[1]; ++ } ++ else { ++ /* If not found, the timezone data can ++ * point at the header. */ ++ ent->pos = 0; ++ } ++ } ++ ++ /* Store the fake data array */ ++ sysdb->data = (unsigned char *)data; ++} ++ ++/* Evaluates to true if given timezone name is valid. */ ++#define is_valid_tz_name(tz_) (tz_[0] && strstr(tz_, "..") == NULL) ++ ++/* Return the mmap()ed tzfile if found, else NULL. On success, the ++ * length of the mapped data is placed in *length. */ ++static char *map_tzfile(const char *timezone, size_t *length) ++{ ++ char fname[PATH_MAX]; ++ struct stat st; ++ char *p; ++ int fd; ++ ++ if (!is_valid_tz_name(timezone)) { ++ return NULL; ++ } ++ ++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); ++ ++ fd = open(fname, O_RDONLY); ++ if (fd == -1) { ++ return NULL; ++ } else if (fstat(fd, &st) != 0 || st.st_size < 21) { ++ close(fd); ++ return NULL; ++ } ++ ++ *length = st.st_size; ++ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); ++ close(fd); ++ ++ return p != MAP_FAILED ? p : NULL; ++} ++#endif ++ ++/* seek_to_tz_position() for a builtin/external database. */ ++static int inmem_seek_to_tz_position(const unsigned char **tzf, ++ char *timezone, const timelib_tzdb *tzdb) + { + int left = 0, right = tzdb->index_size - 1; + #ifdef HAVE_SETLOCALE +@@ -295,36 +743,131 @@ static int seek_to_tz_position(const uns + return 0; + } + ++/* Modified seek_to_tz_position wrapper which handles the system ++ * database and the builtin/external databases in the same way. ++ * Returns zero on failure on non-zero on success. On success, (*map, ++ * *maplen) is an mmap'ed region if *map is non-NULL, and must be ++ * munmaped after use. */ ++static int seek_to_tz_position(const unsigned char **tzf, char *timezone, ++ char **map, size_t *maplen, ++ const timelib_tzdb *tzdb) ++{ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (tzdb == timezonedb_system) { ++ char *orig; ++ ++ orig = map_tzfile(timezone, maplen); ++ if (orig == NULL) { ++ return 0; ++ } ++ ++ (*tzf) = (unsigned char *)orig ; ++ *map = orig; ++ ++ return 1; ++ } ++ else ++#endif ++ { ++ return inmem_seek_to_tz_position(tzf, timezone, tzdb); ++ } ++} ++ + const timelib_tzdb *timelib_builtin_db(void) + { ++#ifdef HAVE_SYSTEM_TZDATA ++ if (timezonedb_system == NULL) { ++ timelib_tzdb *tmp = malloc(sizeof *tmp); ++ ++ tmp->version = "0.system"; ++ tmp->data = NULL; ++ create_zone_index(tmp); ++ system_location_table = create_location_table(); ++ fake_data_segment(tmp, system_location_table); ++ timezonedb_system = tmp; ++ } ++ ++ return timezonedb_system; ++#else + return &timezonedb_builtin; ++#endif + } + + const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count) + { ++#ifdef HAVE_SYSTEM_TZDATA ++ *count = timezonedb_system->index_size; ++ return timezonedb_system->index; ++#else + *count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin); + return timezonedb_idx_builtin; ++#endif + } + + int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) + { + const unsigned char *tzf; +- return (seek_to_tz_position(&tzf, timezone, tzdb)); ++ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (tzdb == timezonedb_system) { ++ char fname[PATH_MAX]; ++ struct stat st; ++ ++ if (!is_valid_tz_name(timezone)) { ++ return 0; ++ } ++ ++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); ++ ++ return stat(fname, &st) == 0 && S_ISREG(st.st_mode); ++ } ++#endif ++ ++ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); + } + + timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) + { + const unsigned char *tzf; ++ char *memmap = NULL; ++ size_t maplen; + timelib_tzinfo *tmp; + +- if (seek_to_tz_position(&tzf, timezone, tzdb)) { ++ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { + tmp = timelib_tzinfo_ctor(timezone); + + read_preamble(&tzf, tmp); + read_header(&tzf, tmp); + read_transistions(&tzf, tmp); + read_types(&tzf, tmp); +- read_location(&tzf, tmp); ++ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (memmap) { ++ const struct location_info *li; ++ ++ /* TZif-style - grok the location info from the system database, ++ * if possible. */ ++ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { ++ tmp->location.comments = strdup(li->comment); ++ strncpy(tmp->location.country_code, li->code, 2); ++ tmp->location.longitude = li->longitude; ++ tmp->location.latitude = li->latitude; ++ tmp->bc = 1; ++ } ++ else { ++ strcpy(tmp->location.country_code, "??"); ++ tmp->bc = 0; ++ tmp->location.comments = strdup(""); ++ } ++ ++ /* Now done with the mmap segment - discard it. */ ++ munmap(memmap, maplen); ++ } else ++#endif ++ { ++ /* PHP-style - use the embedded info. */ ++ read_location(&tzf, tmp); ++ } + } else { + tmp = NULL; + } +--- a/ext/date/lib/timelib.m4 ++++ b/ext/date/lib/timelib.m4 +@@ -78,3 +78,17 @@ stdlib.h + + dnl Check for strtoll, atoll + AC_CHECK_FUNCS(strtoll atoll strftime) ++ ++PHP_ARG_WITH(system-tzdata, for use of system timezone data, ++[ --with-system-tzdata[=DIR] to specify use of system timezone data], ++no, no) ++ ++if test "$PHP_SYSTEM_TZDATA" != "no"; then ++ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) ++ ++ if test "$PHP_SYSTEM_TZDATA" != "yes"; then ++ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", ++ [Define for location of system timezone data]) ++ fi ++fi ++ diff --git a/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch b/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch new file mode 100644 index 000000000..fa4c0d192 --- /dev/null +++ b/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch @@ -0,0 +1,64 @@ +Author: Sean Finney +Forwarded: no (upstream doesn't want it) +Description: Silence warnings about using the default system timezone info + In vanilla upstream php, this is considered an error (i.e. the user must + set the timezone explicitly), though with our use of the system timezonedb + patch, we actually feel quite comfortable using the default timezone info. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762 +--- a/ext/date/php_date.c ++++ b/ext/date/php_date.c +@@ -878,7 +878,7 @@ static char* guess_timezone(const timeli + tzid = "UTC"; + } + +- php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown"); ++ // php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown"); + return tzid; + } + #endif +--- a/ext/date/tests/date_default_timezone_get-1.phpt ++++ /dev/null +@@ -1,16 +0,0 @@ +---TEST-- +-date_default_timezone_get() function [1] +---INI-- +-date.timezone= +---FILE-- +- +---EXPECTF-- +-Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 3 +-UTC +- +-Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 4 +-UTC +--- a/ext/date/tests/date_default_timezone_get-2.phpt ++++ /dev/null +@@ -1,12 +0,0 @@ +---TEST-- +-date_default_timezone_get() function [2] +---INI-- +-date.timezone= +---FILE-- +- +---EXPECTF-- +-Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-2.php on line 3 +-UTC +--- a/ext/date/tests/date_default_timezone_set-1.phpt ++++ b/ext/date/tests/date_default_timezone_set-1.phpt +@@ -18,9 +18,6 @@ date.timezone= + echo date(DATE_ISO8601, $date4), "\n"; + ?> + --EXPECTF-- +-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 3 +- +-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 4 + America/Indiana/Knox + 2005-01-12T03:00:00-0500 + 2005-07-12T03:00:00-0500 diff --git a/lang/php5/patches/900-prevent_buildconf_force.patch b/lang/php5/patches/900-prevent_buildconf_force.patch index 81962c427..a5bc22cb9 100644 --- a/lang/php5/patches/900-prevent_buildconf_force.patch +++ b/lang/php5/patches/900-prevent_buildconf_force.patch @@ -1,6 +1,15 @@ --- a/configure +++ b/configure -@@ -847,6 +847,30 @@ ac_help="$ac_help +@@ -826,6 +826,8 @@ ac_help="$ac_help + --disable-all Disable all extensions which are enabled by default + " + ac_help="$ac_help ++ --with-system-tzdata[=DIR] to specify use of system timezone data" ++ac_help="$ac_help + --with-regex=TYPE regex library type: system, php. [TYPE=php] + WARNING: Do NOT use unless you know what you are doing!" + ac_help="$ac_help +@@ -847,6 +849,30 @@ ac_help="$ac_help ac_help="$ac_help --with-zlib-dir= Define the location of zlib install directory" ac_help="$ac_help @@ -31,7 +40,7 @@ --enable-bcmath Enable bc style precision math functions" ac_help="$ac_help --with-bz2[=DIR] Include BZip2 support" -@@ -884,6 +908,8 @@ ac_help="$ac_help +@@ -884,6 +910,8 @@ ac_help="$ac_help ac_help="$ac_help --disable-flatfile DBA: FlatFile support (bundled)" ac_help="$ac_help @@ -40,7 +49,7 @@ --disable-dom Disable DOM support" ac_help="$ac_help --with-libxml-dir[=DIR] DOM: libxml2 install prefix" -@@ -951,6 +977,8 @@ ac_help="$ac_help +@@ -951,6 +979,8 @@ ac_help="$ac_help ac_help="$ac_help --with-ldap-sasl[=DIR] LDAP: Include Cyrus SASL support" ac_help="$ac_help @@ -49,7 +58,7 @@ --enable-mbstring Enable multibyte string support" ac_help="$ac_help --disable-mbregex MBSTRING: Disable multibyte regex support" -@@ -1167,6 +1195,24 @@ ac_help="$ac_help +@@ -1167,6 +1197,24 @@ ac_help="$ac_help ac_help="$ac_help --with-pcre-dir ZIP: pcre install prefix" ac_help="$ac_help @@ -74,42 +83,42 @@ --disable-mysqlnd-compression-support Disable support for the MySQL compressed protocol in mysqlnd" ac_help="$ac_help -@@ -1890,12 +1936,12 @@ fi +@@ -1890,12 +1938,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1894: checking for Cygwin environment" >&5 -+echo "configure:1940: checking for Cygwin environment" >&5 ++echo "configure:1942: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else -@@ -1923,19 +1969,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 +@@ -1923,19 +1971,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1927: checking for mingw32 environment" >&5 -+echo "configure:1973: checking for mingw32 environment" >&5 ++echo "configure:1975: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else -@@ -1954,7 +2000,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y +@@ -1954,7 +2002,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for egrep""... $ac_c" 1>&6 -echo "configure:1958: checking for egrep" >&5 -+echo "configure:2004: checking for egrep" >&5 ++echo "configure:2006: checking for egrep" >&5 if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1969,7 +2015,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6 +@@ -1969,7 +2017,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6 echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 -echo "configure:1973: checking for a sed that does not truncate output" >&5 -+echo "configure:2019: checking for a sed that does not truncate output" >&5 ++echo "configure:2021: checking for a sed that does not truncate output" >&5 if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2119,7 +2165,7 @@ else { echo "configure: error: can not r +@@ -2119,7 +2167,7 @@ else { echo "configure: error: can not r fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:2123: checking host system type" >&5 -+echo "configure:2169: checking host system type" >&5 ++echo "configure:2171: checking host system type" >&5 host_alias=$host case "$host_alias" in -@@ -2140,7 +2186,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- +@@ -2140,7 +2188,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:2144: checking target system type" >&5 -+echo "configure:2190: checking target system type" >&5 ++echo "configure:2192: checking target system type" >&5 target_alias=$target case "$target_alias" in -@@ -2252,7 +2298,7 @@ rm -f libs/* +@@ -2252,7 +2300,7 @@ rm -f libs/* # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2256: checking for $ac_word" >&5 -+echo "configure:2302: checking for $ac_word" >&5 ++echo "configure:2304: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2282,7 +2328,7 @@ if test -z "$CC"; then +@@ -2282,7 +2330,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2286: checking for $ac_word" >&5 -+echo "configure:2332: checking for $ac_word" >&5 ++echo "configure:2334: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2333,7 +2379,7 @@ fi +@@ -2333,7 +2381,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2337: checking for $ac_word" >&5 -+echo "configure:2383: checking for $ac_word" >&5 ++echo "configure:2385: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2365,7 +2411,7 @@ fi +@@ -2365,7 +2413,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2369: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2415: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2417: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2376,12 +2422,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -2376,12 +2424,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2380 "configure" -+#line 2426 "configure" ++#line 2428 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then -@@ -2407,12 +2453,12 @@ if test $ac_cv_prog_cc_works = no; then +@@ -2407,12 +2455,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2411: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2457: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2459: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2416: checking whether we are using GNU C" >&5 -+echo "configure:2462: checking whether we are using GNU C" >&5 ++echo "configure:2464: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2421,7 +2467,7 @@ else +@@ -2421,7 +2469,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no -@@ -2440,7 +2486,7 @@ ac_test_CFLAGS="${CFLAGS+set}" +@@ -2440,7 +2488,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2444: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2490: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2492: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2472,7 +2518,7 @@ else +@@ -2472,7 +2520,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2476: checking how to run the C preprocessor" >&5 -+echo "configure:2522: checking how to run the C preprocessor" >&5 ++echo "configure:2524: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -2487,13 +2533,13 @@ else +@@ -2487,13 +2535,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -2504,13 +2550,13 @@ else +@@ -2504,13 +2552,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -2521,13 +2567,13 @@ else +@@ -2521,13 +2569,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -2554,9 +2600,9 @@ echo "$ac_t""$CPP" 1>&6 +@@ -2554,9 +2602,9 @@ echo "$ac_t""$CPP" 1>&6 ICC="no" echo $ac_n "checking for icc""... $ac_c" 1>&6 -echo "configure:2558: checking for icc" >&5 -+echo "configure:2604: checking for icc" >&5 ++echo "configure:2606: checking for icc" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2582: checking for suncc" >&5 -+echo "configure:2628: checking for suncc" >&5 ++echo "configure:2630: checking for suncc" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2607: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:2653: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:2655: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:2610: checking whether cc understands -c and -o together" >&5 -+echo "configure:2656: checking whether cc understands -c and -o together" >&5 ++echo "configure:2658: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" -@@ -2618,16 +2664,16 @@ else +@@ -2618,16 +2666,16 @@ else # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:2622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:2668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:2669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:2670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:2671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:2630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:2676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : -@@ -2654,7 +2700,7 @@ EOF +@@ -2654,7 +2702,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2658: checking how to run the C preprocessor" >&5 -+echo "configure:2704: checking how to run the C preprocessor" >&5 ++echo "configure:2706: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -2669,13 +2715,13 @@ else +@@ -2669,13 +2717,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -2686,13 +2732,13 @@ else +@@ -2686,13 +2734,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -2703,13 +2749,13 @@ else +@@ -2703,13 +2751,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -2734,9 +2780,9 @@ fi +@@ -2734,9 +2782,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2738: checking for AIX" >&5 -+echo "configure:2784: checking for AIX" >&5 ++echo "configure:2786: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2762: checking whether ln -s works" >&5 -+echo "configure:2808: checking whether ln -s works" >&5 ++echo "configure:2810: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2783,7 +2829,7 @@ fi +@@ -2783,7 +2831,7 @@ fi php_with_libdir=lib echo $ac_n "checking for system library directory""... $ac_c" 1>&6 -echo "configure:2787: checking for system library directory" >&5 -+echo "configure:2833: checking for system library directory" >&5 ++echo "configure:2835: checking for system library directory" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then withval="$with_libdir" -@@ -2806,7 +2852,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -2806,7 +2854,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_rpath=yes echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6 -echo "configure:2810: checking whether to enable runpaths" >&5 -+echo "configure:2856: checking whether to enable runpaths" >&5 ++echo "configure:2858: checking whether to enable runpaths" >&5 # Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" -@@ -2827,7 +2873,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -2827,7 +2875,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6 -echo "configure:2831: checking if compiler supports -R" >&5 -+echo "configure:2877: checking if compiler supports -R" >&5 ++echo "configure:2879: checking if compiler supports -R" >&5 if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2835,14 +2881,14 @@ else +@@ -2835,14 +2883,14 @@ else SAVE_LIBS=$LIBS LIBS="-R /usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_dashr=yes else -@@ -2860,7 +2906,7 @@ if test $php_cv_cc_dashr = "yes"; then +@@ -2860,7 +2908,7 @@ if test $php_cv_cc_dashr = "yes"; then ld_runpath_switch=-R else echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6 -echo "configure:2864: checking if compiler supports -Wl,-rpath," >&5 -+echo "configure:2910: checking if compiler supports -Wl,-rpath," >&5 ++echo "configure:2912: checking if compiler supports -Wl,-rpath," >&5 if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2868,14 +2914,14 @@ else +@@ -2868,14 +2916,14 @@ else SAVE_LIBS=$LIBS LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_rpath=yes else -@@ -2906,7 +2952,7 @@ do +@@ -2906,7 +2954,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2910: checking for $ac_word" >&5 -+echo "configure:2956: checking for $ac_word" >&5 ++echo "configure:2958: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2947,7 +2993,7 @@ test -n "$AWK" || AWK="bork" +@@ -2947,7 +2995,7 @@ test -n "$AWK" || AWK="bork" ;; *) echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6 -echo "configure:2951: checking if $AWK is broken" >&5 -+echo "configure:2997: checking if $AWK is broken" >&5 ++echo "configure:2999: checking if $AWK is broken" >&5 if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then echo "$ac_t""yes" 1>&6 { echo "configure: error: You should install GNU awk" 1>&2; exit 1; } -@@ -2966,7 +3012,7 @@ do +@@ -2966,7 +3014,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2970: checking for $ac_word" >&5 -+echo "configure:3016: checking for $ac_word" >&5 ++echo "configure:3018: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3006,7 +3052,7 @@ test -n "$YACC" || YACC="yacc" +@@ -3006,7 +3054,7 @@ test -n "$YACC" || YACC="yacc" bison_version=none if test "$YACC"; then echo $ac_n "checking for bison version""... $ac_c" 1>&6 -echo "configure:3010: checking for bison version" >&5 -+echo "configure:3056: checking for bison version" >&5 ++echo "configure:3058: checking for bison version" >&5 if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3044,7 +3090,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6 +@@ -3044,7 +3092,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6 # Extract the first word of "re2c", so it can be a program name with args. set dummy re2c; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3048: checking for $ac_word" >&5 -+echo "configure:3094: checking for $ac_word" >&5 ++echo "configure:3096: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3072,7 +3118,7 @@ fi +@@ -3072,7 +3120,7 @@ fi if test -n "$RE2C"; then echo $ac_n "checking for re2c version""... $ac_c" 1>&6 -echo "configure:3076: checking for re2c version" >&5 -+echo "configure:3122: checking for re2c version" >&5 ++echo "configure:3124: checking for re2c version" >&5 if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3111,7 +3157,7 @@ esac +@@ -3111,7 +3159,7 @@ esac php_enable_re2c_cgoto=no echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6 -echo "configure:3115: checking whether to enable computed goto gcc extension with re2c" >&5 -+echo "configure:3161: checking whether to enable computed goto gcc extension with re2c" >&5 ++echo "configure:3163: checking whether to enable computed goto gcc extension with re2c" >&5 # Check whether --enable-re2c-cgoto or --disable-re2c-cgoto was given. if test "${enable_re2c_cgoto+set}" = set; then enableval="$enable_re2c_cgoto" -@@ -3134,9 +3180,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then +@@ -3134,9 +3182,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then RE2C_FLAGS="" else echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6 -echo "configure:3138: checking whether re2c -g works" >&5 -+echo "configure:3184: checking whether re2c -g works" >&5 ++echo "configure:3186: checking whether re2c -g works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* RE2C_FLAGS="" -@@ -3220,7 +3266,7 @@ case $host_alias in +@@ -3220,7 +3268,7 @@ case $host_alias in gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6 -echo "configure:3224: checking whether $CC supports -no-cpp-precomp" >&5 -+echo "configure:3270: checking whether $CC supports -no-cpp-precomp" >&5 ++echo "configure:3272: checking whether $CC supports -no-cpp-precomp" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_no_cpp_precomp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3421,7 +3467,7 @@ esac +@@ -3421,7 +3469,7 @@ esac # Disable PIC mode by default where it is known to be safe to do so, # to avoid the performance hit from the lost register echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6 -echo "configure:3425: checking whether to force non-PIC code in shared modules" >&5 -+echo "configure:3471: checking whether to force non-PIC code in shared modules" >&5 ++echo "configure:3473: checking whether to force non-PIC code in shared modules" >&5 case $host_alias in i?86-*-linux*|i?86-*-freebsd*) if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then -@@ -3451,7 +3497,7 @@ esac +@@ -3451,7 +3499,7 @@ esac echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6 -echo "configure:3455: checking whether /dev/urandom exists" >&5 -+echo "configure:3501: checking whether /dev/urandom exists" >&5 ++echo "configure:3503: checking whether /dev/urandom exists" >&5 if test -r "/dev/urandom" && test -c "/dev/urandom"; then cat >> confdefs.h <<\EOF #define HAVE_DEV_URANDOM 1 -@@ -3512,7 +3558,7 @@ if test "$cross_compiling" = yes; then +@@ -3512,7 +3560,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -3530,7 +3576,7 @@ int main() { +@@ -3530,7 +3578,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3550,7 +3596,7 @@ fi +@@ -3550,7 +3598,7 @@ fi CFLAGS=$save_CFLAGS echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:3554: checking for pthreads_cflags" >&5 -+echo "configure:3600: checking for pthreads_cflags" >&5 ++echo "configure:3602: checking for pthreads_cflags" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3572,7 +3618,7 @@ if test "$cross_compiling" = yes; then +@@ -3572,7 +3620,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -3590,7 +3636,7 @@ int main() { +@@ -3590,7 +3638,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3620,7 +3666,7 @@ fi +@@ -3620,7 +3668,7 @@ fi echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:3624: checking for pthreads_lib" >&5 -+echo "configure:3670: checking for pthreads_lib" >&5 ++echo "configure:3672: checking for pthreads_lib" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3642,7 +3688,7 @@ if test "$cross_compiling" = yes; then +@@ -3642,7 +3690,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -3660,7 +3706,7 @@ int main() { +@@ -3660,7 +3708,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3791,7 +3837,7 @@ ext_output=$PHP_AOLSERVER +@@ -3791,7 +3839,7 @@ ext_output=$PHP_AOLSERVER echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6 -echo "configure:3795: checking for AOLserver support" >&5 -+echo "configure:3841: checking for AOLserver support" >&5 ++echo "configure:3843: checking for AOLserver support" >&5 if test "$PHP_AOLSERVER" != "no"; then if test -d "$PHP_AOLSERVER/include"; then -@@ -4056,7 +4102,7 @@ ext_output=$PHP_APXS +@@ -4056,7 +4104,7 @@ ext_output=$PHP_APXS echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:4060: checking for Apache 1.x module support via DSO through APXS" >&5 -+echo "configure:4106: checking for Apache 1.x module support via DSO through APXS" >&5 ++echo "configure:4108: checking for Apache 1.x module support via DSO through APXS" >&5 if test "$PHP_APXS" != "no"; then if test "$PHP_APXS" = "yes"; then -@@ -4387,7 +4433,7 @@ ext_output=$PHP_APACHE +@@ -4387,7 +4435,7 @@ ext_output=$PHP_APACHE echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6 -echo "configure:4391: checking for Apache 1.x module support" >&5 -+echo "configure:4437: checking for Apache 1.x module support" >&5 ++echo "configure:4439: checking for Apache 1.x module support" >&5 if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then -@@ -5264,7 +5310,7 @@ fi +@@ -5264,7 +5312,7 @@ fi php_enable_mod_charset=no echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 -echo "configure:5268: checking whether to enable Apache charset compatibility option" >&5 -+echo "configure:5314: checking whether to enable Apache charset compatibility option" >&5 ++echo "configure:5316: checking whether to enable Apache charset compatibility option" >&5 # Check whether --enable-mod-charset or --disable-mod-charset was given. if test "${enable_mod_charset+set}" = set; then enableval="$enable_mod_charset" -@@ -5296,7 +5342,7 @@ if test "$APACHE_MODULE" = "yes"; then +@@ -5296,7 +5344,7 @@ if test "$APACHE_MODULE" = "yes"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:5300: checking whether $CC supports -rdynamic" >&5 -+echo "configure:5346: checking whether $CC supports -rdynamic" >&5 ++echo "configure:5348: checking whether $CC supports -rdynamic" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5339,7 +5385,7 @@ if test -n "$APACHE_INSTALL"; then +@@ -5339,7 +5387,7 @@ if test -n "$APACHE_INSTALL"; then echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 -echo "configure:5343: checking for member fd in BUFF *" >&5 -+echo "configure:5389: checking for member fd in BUFF *" >&5 ++echo "configure:5391: checking for member fd in BUFF *" >&5 if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5351,14 +5397,14 @@ else +@@ -5351,14 +5399,14 @@ else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext < int main() { @@ -755,79 +764,79 @@ ; return 0; } EOF -if { (eval echo configure:5362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes -@@ -5431,7 +5477,7 @@ ext_output=$PHP_APXS2FILTER +@@ -5431,7 +5479,7 @@ ext_output=$PHP_APXS2FILTER echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:5435: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 -+echo "configure:5481: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 ++echo "configure:5483: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 if test "$PHP_APXS2FILTER" != "no"; then if test "$PHP_APXS2FILTER" = "yes"; then -@@ -6320,7 +6366,7 @@ ext_output=$PHP_APXS2 +@@ -6320,7 +6368,7 @@ ext_output=$PHP_APXS2 echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:6324: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 -+echo "configure:6370: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 ++echo "configure:6372: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 if test "$PHP_APXS2" != "no"; then if test "$PHP_APXS2" = "yes"; then -@@ -7210,7 +7256,7 @@ ext_output=$PHP_APACHE_HOOKS +@@ -7210,7 +7258,7 @@ ext_output=$PHP_APACHE_HOOKS echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:7214: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 -+echo "configure:7260: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 ++echo "configure:7262: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 if test "$PHP_APACHE_HOOKS" != "no"; then if test "$PHP_APACHE_HOOKS" = "yes"; then -@@ -7541,7 +7587,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC +@@ -7541,7 +7589,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6 -echo "configure:7545: checking for Apache 1.x (hooks) module support" >&5 -+echo "configure:7591: checking for Apache 1.x (hooks) module support" >&5 ++echo "configure:7593: checking for Apache 1.x (hooks) module support" >&5 if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then -@@ -8418,7 +8464,7 @@ fi +@@ -8418,7 +8466,7 @@ fi php_enable_mod_charset=no echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 -echo "configure:8422: checking whether to enable Apache charset compatibility option" >&5 -+echo "configure:8468: checking whether to enable Apache charset compatibility option" >&5 ++echo "configure:8470: checking whether to enable Apache charset compatibility option" >&5 # Check whether --enable-mod-charset or --disable-mod-charset was given. if test "${enable_mod_charset+set}" = set; then enableval="$enable_mod_charset" -@@ -8450,7 +8496,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; +@@ -8450,7 +8498,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:8454: checking whether $CC supports -rdynamic" >&5 -+echo "configure:8500: checking whether $CC supports -rdynamic" >&5 ++echo "configure:8502: checking whether $CC supports -rdynamic" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -8493,7 +8539,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then +@@ -8493,7 +8541,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 -echo "configure:8497: checking for member fd in BUFF *" >&5 -+echo "configure:8543: checking for member fd in BUFF *" >&5 ++echo "configure:8545: checking for member fd in BUFF *" >&5 if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -8505,14 +8551,14 @@ else +@@ -8505,14 +8553,14 @@ else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext < int main() { @@ -835,103 +844,103 @@ ; return 0; } EOF -if { (eval echo configure:8516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes -@@ -8586,7 +8632,7 @@ ext_output=$PHP_CAUDIUM +@@ -8586,7 +8634,7 @@ ext_output=$PHP_CAUDIUM echo $ac_n "checking for Caudium support""... $ac_c" 1>&6 -echo "configure:8590: checking for Caudium support" >&5 -+echo "configure:8636: checking for Caudium support" >&5 ++echo "configure:8638: checking for Caudium support" >&5 if test "$PHP_CAUDIUM" != "no"; then if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi -@@ -8656,7 +8702,7 @@ if test "$PHP_CAUDIUM" != "no"; then +@@ -8656,7 +8704,7 @@ if test "$PHP_CAUDIUM" != "no"; then PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE` fi echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6 -echo "configure:8660: checking for C includes in $PIKE_C_INCLUDE" >&5 -+echo "configure:8706: checking for C includes in $PIKE_C_INCLUDE" >&5 ++echo "configure:8708: checking for C includes in $PIKE_C_INCLUDE" >&5 if test -f $PIKE_C_INCLUDE/version.h; then PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` ###### VERSION MATCH CHECK ####### -@@ -8945,7 +8991,7 @@ ext_output=$PHP_CLI +@@ -8945,7 +8993,7 @@ ext_output=$PHP_CLI echo $ac_n "checking for CLI build""... $ac_c" 1>&6 -echo "configure:8949: checking for CLI build" >&5 -+echo "configure:8995: checking for CLI build" >&5 ++echo "configure:8997: checking for CLI build" >&5 if test "$PHP_CLI" != "no"; then src=$abs_srcdir/sapi/cli/Makefile.frag -@@ -8995,7 +9041,7 @@ echo "$ac_t""$PHP_CLI" 1>&6 +@@ -8995,7 +9043,7 @@ echo "$ac_t""$PHP_CLI" 1>&6 php_with_continuity=no echo $ac_n "checking for Continuity support""... $ac_c" 1>&6 -echo "configure:8999: checking for Continuity support" >&5 -+echo "configure:9045: checking for Continuity support" >&5 ++echo "configure:9047: checking for Continuity support" >&5 # Check whether --with-continuity or --without-continuity was given. if test "${with_continuity+set}" = set; then withval="$with_continuity" -@@ -9019,7 +9065,7 @@ if test "$PHP_CONTINUITY" != "no"; then +@@ -9019,7 +9067,7 @@ if test "$PHP_CONTINUITY" != "no"; then { echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; } fi echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6 -echo "configure:9023: checking for Continuity include files" >&5 -+echo "configure:9069: checking for Continuity include files" >&5 ++echo "configure:9071: checking for Continuity include files" >&5 if test -d $PHP_CONTINUITY/include ; then CAPI_INCLUDE=$PHP_CONTINUITY/include echo "$ac_t""Continuity Binary Distribution" 1>&6 -@@ -9277,7 +9323,7 @@ ext_output=$PHP_EMBED +@@ -9277,7 +9325,7 @@ ext_output=$PHP_EMBED echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6 -echo "configure:9281: checking for embedded SAPI library support" >&5 -+echo "configure:9327: checking for embedded SAPI library support" >&5 ++echo "configure:9329: checking for embedded SAPI library support" >&5 if test "$PHP_EMBED" != "no"; then case "$PHP_EMBED" in -@@ -9541,7 +9587,7 @@ ext_output=$PHP_FPM +@@ -9541,7 +9589,7 @@ ext_output=$PHP_FPM echo $ac_n "checking for FPM build""... $ac_c" 1>&6 -echo "configure:9545: checking for FPM build" >&5 -+echo "configure:9591: checking for FPM build" >&5 ++echo "configure:9593: checking for FPM build" >&5 if test "$PHP_FPM" != "no"; then echo "$ac_t""$PHP_FPM" 1>&6 -@@ -9549,12 +9595,12 @@ if test "$PHP_FPM" != "no"; then +@@ -9549,12 +9597,12 @@ if test "$PHP_FPM" != "no"; then for ac_func in setenv clearenv setproctitle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9553: checking for $ac_func" >&5 -+echo "configure:9599: checking for $ac_func" >&5 ++echo "configure:9601: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -9604,14 +9650,14 @@ done +@@ -9604,14 +9652,14 @@ done echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 -echo "configure:9608: checking for library containing socket" >&5 -+echo "configure:9654: checking for library containing socket" >&5 ++echo "configure:9656: checking for library containing socket" >&5 if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -939,43 +948,43 @@ ac_cv_search_socket="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="none required" else -@@ -9633,7 +9679,7 @@ rm -f conftest* +@@ -9633,7 +9681,7 @@ rm -f conftest* test "$ac_cv_search_socket" = "no" && for i in socket; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="-l$i" break -@@ -9666,14 +9712,14 @@ else : +@@ -9666,14 +9714,14 @@ else : fi echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6 -echo "configure:9670: checking for library containing inet_addr" >&5 -+echo "configure:9716: checking for library containing inet_addr" >&5 ++echo "configure:9718: checking for library containing inet_addr" >&5 if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -983,110 +992,110 @@ ac_cv_search_inet_addr="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="none required" else -@@ -9695,7 +9741,7 @@ rm -f conftest* +@@ -9695,7 +9743,7 @@ rm -f conftest* test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="-l$i" break -@@ -9731,17 +9777,17 @@ fi +@@ -9731,17 +9779,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9735: checking for $ac_hdr" >&5 -+echo "configure:9781: checking for $ac_hdr" >&5 ++echo "configure:9783: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -9771,17 +9817,17 @@ done +@@ -9771,17 +9819,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9775: checking for $ac_hdr" >&5 -+echo "configure:9821: checking for $ac_hdr" >&5 ++echo "configure:9823: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -9811,17 +9857,17 @@ done +@@ -9811,17 +9859,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9815: checking for $ac_hdr" >&5 -+echo "configure:9861: checking for $ac_hdr" >&5 ++echo "configure:9863: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -9850,17 +9896,17 @@ done +@@ -9850,17 +9898,17 @@ done echo $ac_n "checking for prctl""... $ac_c" 1>&6 -echo "configure:9854: checking for prctl" >&5 -+echo "configure:9900: checking for prctl" >&5 ++echo "configure:9902: checking for prctl" >&5 cat > conftest.$ac_ext < int main() { @@ -1094,20 +1103,20 @@ ; return 0; } EOF -if { (eval echo configure:9864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -9883,17 +9929,17 @@ rm -f conftest* +@@ -9883,17 +9931,17 @@ rm -f conftest* have_clock_gettime=no echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 -echo "configure:9887: checking for clock_gettime" >&5 -+echo "configure:9933: checking for clock_gettime" >&5 ++echo "configure:9935: checking for clock_gettime" >&5 cat > conftest.$ac_ext < int main() { @@ -1115,23 +1124,23 @@ ; return 0; } EOF -if { (eval echo configure:9897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_clock_gettime=yes -@@ -9911,20 +9957,20 @@ rm -f conftest* +@@ -9911,20 +9959,20 @@ rm -f conftest* if test "$have_clock_gettime" = "no"; then echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 -echo "configure:9915: checking for clock_gettime in -lrt" >&5 -+echo "configure:9961: checking for clock_gettime in -lrt" >&5 ++echo "configure:9963: checking for clock_gettime in -lrt" >&5 SAVED_LIBS="$LIBS" LIBS="$LIBS -lrt" cat > conftest.$ac_ext < int main() { @@ -1139,160 +1148,160 @@ ; return 0; } EOF -if { (eval echo configure:9928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_clock_gettime=yes -@@ -9953,13 +9999,13 @@ EOF +@@ -9953,13 +10001,13 @@ EOF if test "$have_clock_gettime" = "no"; then echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6 -echo "configure:9957: checking for clock_get_time" >&5 -+echo "configure:10003: checking for clock_get_time" >&5 ++echo "configure:10005: checking for clock_get_time" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include -@@ -9983,7 +10029,7 @@ else +@@ -9983,7 +10031,7 @@ else } EOF -if { (eval echo configure:9987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then have_clock_get_time=yes -@@ -10014,10 +10060,10 @@ EOF +@@ -10014,10 +10062,10 @@ EOF have_broken_ptrace=no echo $ac_n "checking for ptrace""... $ac_c" 1>&6 -echo "configure:10018: checking for ptrace" >&5 -+echo "configure:10064: checking for ptrace" >&5 ++echo "configure:10066: checking for ptrace" >&5 cat > conftest.$ac_ext < -@@ -10026,7 +10072,7 @@ int main() { +@@ -10026,7 +10074,7 @@ int main() { ptrace(0, 0, (void *) 0, 0); ; return 0; } EOF -if { (eval echo configure:10030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_ptrace=yes -@@ -10044,13 +10090,13 @@ rm -f conftest* +@@ -10044,13 +10092,13 @@ rm -f conftest* if test "$have_ptrace" = "yes"; then echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6 -echo "configure:10048: checking whether ptrace works" >&5 -+echo "configure:10094: checking whether ptrace works" >&5 ++echo "configure:10096: checking whether ptrace works" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < -@@ -10121,7 +10167,7 @@ else +@@ -10121,7 +10169,7 @@ else } EOF -if { (eval echo configure:10125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 -@@ -10152,10 +10198,10 @@ EOF +@@ -10152,10 +10200,10 @@ EOF if test "$have_broken_ptrace" = "yes"; then echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6 -echo "configure:10156: checking for mach_vm_read" >&5 -+echo "configure:10202: checking for mach_vm_read" >&5 ++echo "configure:10204: checking for mach_vm_read" >&5 cat > conftest.$ac_ext < #include -@@ -10166,7 +10212,7 @@ int main() { +@@ -10166,7 +10214,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mach_vm_read=yes -@@ -10202,13 +10248,13 @@ EOF +@@ -10202,13 +10250,13 @@ EOF if test -n "$proc_mem_file" ; then echo $ac_n "checking for proc mem file""... $ac_c" 1>&6 -echo "configure:10206: checking for proc mem file" >&5 -+echo "configure:10252: checking for proc mem file" >&5 ++echo "configure:10254: checking for proc mem file" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""$proc_mem_file" 1>&6 -@@ -10282,9 +10328,9 @@ EOF +@@ -10282,9 +10330,9 @@ EOF echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6 -echo "configure:10286: checking if gcc supports __sync_bool_compare_and_swap" >&5 -+echo "configure:10332: checking if gcc supports __sync_bool_compare_and_swap" >&5 ++echo "configure:10334: checking if gcc supports __sync_bool_compare_and_swap" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -10318,17 +10364,17 @@ rm -f conftest* +@@ -10318,17 +10366,17 @@ rm -f conftest* have_lq=no echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6 -echo "configure:10322: checking for TCP_INFO" >&5 -+echo "configure:10368: checking for TCP_INFO" >&5 ++echo "configure:10370: checking for TCP_INFO" >&5 cat > conftest.$ac_ext < int main() { @@ -1300,20 +1309,20 @@ ; return 0; } EOF -if { (eval echo configure:10332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_lq=tcp_info -@@ -10353,17 +10399,17 @@ EOF +@@ -10353,17 +10401,17 @@ EOF if test "$have_lq" = "no" ; then echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6 -echo "configure:10357: checking for SO_LISTENQLEN" >&5 -+echo "configure:10403: checking for SO_LISTENQLEN" >&5 ++echo "configure:10405: checking for SO_LISTENQLEN" >&5 cat > conftest.$ac_ext < int main() { @@ -1321,20 +1330,20 @@ ; return 0; } EOF -if { (eval echo configure:10367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_lq=so_listenq -@@ -10389,17 +10435,17 @@ EOF +@@ -10389,17 +10437,17 @@ EOF echo $ac_n "checking for sysconf""... $ac_c" 1>&6 -echo "configure:10393: checking for sysconf" >&5 -+echo "configure:10439: checking for sysconf" >&5 ++echo "configure:10441: checking for sysconf" >&5 cat > conftest.$ac_ext < int main() { @@ -1342,20 +1351,20 @@ ; return 0; } EOF -if { (eval echo configure:10403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -10420,17 +10466,17 @@ rm -f conftest* +@@ -10420,17 +10468,17 @@ rm -f conftest* echo $ac_n "checking for times""... $ac_c" 1>&6 -echo "configure:10424: checking for times" >&5 -+echo "configure:10470: checking for times" >&5 ++echo "configure:10472: checking for times" >&5 cat > conftest.$ac_ext < int main() { @@ -1363,157 +1372,157 @@ ; return 0; } EOF -if { (eval echo configure:10434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -10802,7 +10848,7 @@ fi +@@ -10802,7 +10850,7 @@ fi php_with_isapi=no echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6 -echo "configure:10806: checking for Zeus ISAPI support" >&5 -+echo "configure:10852: checking for Zeus ISAPI support" >&5 ++echo "configure:10854: checking for Zeus ISAPI support" >&5 # Check whether --with-isapi or --without-isapi was given. if test "${with_isapi+set}" = set; then withval="$with_isapi" -@@ -11056,7 +11102,7 @@ fi +@@ -11056,7 +11104,7 @@ fi echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6 -echo "configure:11060: checking for LiteSpeed support" >&5 -+echo "configure:11106: checking for LiteSpeed support" >&5 ++echo "configure:11108: checking for LiteSpeed support" >&5 php_with_litespeed=no -@@ -11319,7 +11365,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6 +@@ -11319,7 +11367,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6 php_with_milter=no echo $ac_n "checking for Milter support""... $ac_c" 1>&6 -echo "configure:11323: checking for Milter support" >&5 -+echo "configure:11369: checking for Milter support" >&5 ++echo "configure:11371: checking for Milter support" >&5 # Check whether --with-milter or --without-milter was given. if test "${with_milter+set}" = set; then withval="$with_milter" -@@ -11611,7 +11657,7 @@ fi +@@ -11611,7 +11659,7 @@ fi php_with_nsapi=no echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6 -echo "configure:11615: checking for NSAPI support" >&5 -+echo "configure:11661: checking for NSAPI support" >&5 ++echo "configure:11663: checking for NSAPI support" >&5 # Check whether --with-nsapi or --without-nsapi was given. if test "${with_nsapi+set}" = set; then withval="$with_nsapi" -@@ -11635,7 +11681,7 @@ if test "$PHP_NSAPI" != "no"; then +@@ -11635,7 +11683,7 @@ if test "$PHP_NSAPI" != "no"; then { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; } fi echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6 -echo "configure:11639: checking for NSAPI include files" >&5 -+echo "configure:11685: checking for NSAPI include files" >&5 ++echo "configure:11687: checking for NSAPI include files" >&5 if test -d $PHP_NSAPI/include ; then NSAPI_INC_DIR="$PHP_NSAPI/include" echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6 -@@ -11643,17 +11689,17 @@ echo "configure:11639: checking for NSAP +@@ -11643,17 +11691,17 @@ echo "configure:11639: checking for NSAP do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11647: checking for $ac_hdr" >&5 -+echo "configure:11693: checking for $ac_hdr" >&5 ++echo "configure:11695: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:11703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:11705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -11688,17 +11734,17 @@ done +@@ -11688,17 +11736,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11692: checking for $ac_hdr" >&5 -+echo "configure:11738: checking for $ac_hdr" >&5 ++echo "configure:11740: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:11748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:11750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -11971,7 +12017,7 @@ fi +@@ -11971,7 +12019,7 @@ fi php_with_phttpd=no echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6 -echo "configure:11975: checking for PHTTPD support" >&5 -+echo "configure:12021: checking for PHTTPD support" >&5 ++echo "configure:12023: checking for PHTTPD support" >&5 # Check whether --with-phttpd or --without-phttpd was given. if test "${with_phttpd+set}" = set; then withval="$with_phttpd" -@@ -12225,7 +12271,7 @@ fi +@@ -12225,7 +12273,7 @@ fi php_with_pi3web=no echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6 -echo "configure:12229: checking for Pi3Web support" >&5 -+echo "configure:12275: checking for Pi3Web support" >&5 ++echo "configure:12277: checking for Pi3Web support" >&5 # Check whether --with-pi3web or --without-pi3web was given. if test "${with_pi3web+set}" = set; then withval="$with_pi3web" -@@ -12597,7 +12643,7 @@ ext_output=$PHP_ROXEN +@@ -12597,7 +12645,7 @@ ext_output=$PHP_ROXEN php_enable_roxen_zts=no echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6 -echo "configure:12601: checking whether Roxen module is build using ZTS" >&5 -+echo "configure:12647: checking whether Roxen module is build using ZTS" >&5 ++echo "configure:12649: checking whether Roxen module is build using ZTS" >&5 # Check whether --enable-roxen-zts or --disable-roxen-zts was given. if test "${enable_roxen_zts+set}" = set; then enableval="$enable_roxen_zts" -@@ -12618,7 +12664,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -12618,7 +12666,7 @@ echo "$ac_t""$ext_output" 1>&6 RESULT= echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6 -echo "configure:12622: checking for Roxen/Pike support" >&5 -+echo "configure:12668: checking for Roxen/Pike support" >&5 ++echo "configure:12670: checking for Roxen/Pike support" >&5 if test "$PHP_ROXEN" != "no"; then if test ! -d $PHP_ROXEN ; then { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } -@@ -12904,7 +12950,7 @@ ext_output=$PHP_THTTPD +@@ -12904,7 +12952,7 @@ ext_output=$PHP_THTTPD echo $ac_n "checking for thttpd""... $ac_c" 1>&6 -echo "configure:12908: checking for thttpd" >&5 -+echo "configure:12954: checking for thttpd" >&5 ++echo "configure:12956: checking for thttpd" >&5 if test "$PHP_THTTPD" != "no"; then if test ! -d $PHP_THTTPD; then -@@ -12937,7 +12983,7 @@ if test "$PHP_THTTPD" != "no"; then +@@ -12937,7 +12985,7 @@ if test "$PHP_THTTPD" != "no"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:12941: checking whether $CC supports -rdynamic" >&5 -+echo "configure:12987: checking whether $CC supports -rdynamic" >&5 ++echo "configure:12989: checking whether $CC supports -rdynamic" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -13173,24 +13219,24 @@ ext_output=$PHP_TUX +@@ -13173,24 +13221,24 @@ ext_output=$PHP_TUX echo $ac_n "checking for TUX""... $ac_c" 1>&6 -echo "configure:13177: checking for TUX" >&5 -+echo "configure:13223: checking for TUX" >&5 ++echo "configure:13225: checking for TUX" >&5 if test "$PHP_TUX" != "no"; then INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so" for ac_hdr in tuxmodule.h @@ -1521,1444 +1530,1444 @@ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13184: checking for $ac_hdr" >&5 -+echo "configure:13230: checking for $ac_hdr" >&5 ++echo "configure:13232: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:13240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:13242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -13427,7 +13473,7 @@ ext_output=$PHP_WEBJAMES +@@ -13427,7 +13475,7 @@ ext_output=$PHP_WEBJAMES echo $ac_n "checking for webjames""... $ac_c" 1>&6 -echo "configure:13431: checking for webjames" >&5 -+echo "configure:13477: checking for webjames" >&5 ++echo "configure:13479: checking for webjames" >&5 if test "$PHP_WEBJAMES" != "no"; then -@@ -13687,14 +13733,14 @@ ext_output=$PHP_CGI +@@ -13687,14 +13735,14 @@ ext_output=$PHP_CGI if test "$PHP_SAPI" = "default"; then echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6 -echo "configure:13691: checking whether to build CGI binary" >&5 -+echo "configure:13737: checking whether to build CGI binary" >&5 ++echo "configure:13739: checking whether to build CGI binary" >&5 if test "$PHP_CGI" != "no"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 -echo "configure:13696: checking for socklen_t in sys/socket.h" >&5 -+echo "configure:13742: checking for socklen_t in sys/socket.h" >&5 ++echo "configure:13744: checking for socklen_t in sys/socket.h" >&5 cat > conftest.$ac_ext < EOF -@@ -13714,9 +13760,9 @@ rm -f conftest* +@@ -13714,9 +13762,9 @@ rm -f conftest* echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6 -echo "configure:13718: checking for sun_len in sys/un.h" >&5 -+echo "configure:13764: checking for sun_len in sys/un.h" >&5 ++echo "configure:13766: checking for sun_len in sys/un.h" >&5 cat > conftest.$ac_ext < EOF -@@ -13736,7 +13782,7 @@ rm -f conftest* +@@ -13736,7 +13784,7 @@ rm -f conftest* echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6 -echo "configure:13740: checking whether cross-process locking is required by accept()" >&5 -+echo "configure:13786: checking whether cross-process locking is required by accept()" >&5 ++echo "configure:13788: checking whether cross-process locking is required by accept()" >&5 case "`uname -sr`" in IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) echo "$ac_t""yes" 1>&6 -@@ -13980,7 +14026,7 @@ fi +@@ -13980,7 +14028,7 @@ fi echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6 -echo "configure:13984: checking for chosen SAPI module" >&5 -+echo "configure:14030: checking for chosen SAPI module" >&5 ++echo "configure:14032: checking for chosen SAPI module" >&5 echo "$ac_t""$PHP_SAPI" 1>&6 if test "$enable_maintainer_zts" = "yes"; then -@@ -14037,7 +14083,7 @@ fi +@@ -14037,7 +14085,7 @@ fi # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14041: checking for $ac_word" >&5 -+echo "configure:14087: checking for $ac_word" >&5 ++echo "configure:14089: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -14076,7 +14122,7 @@ fi +@@ -14076,7 +14124,7 @@ fi echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6 -echo "configure:14080: checking whether system uses EBCDIC" >&5 -+echo "configure:14126: checking whether system uses EBCDIC" >&5 ++echo "configure:14128: checking whether system uses EBCDIC" >&5 if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -14087,7 +14133,7 @@ else +@@ -14087,7 +14135,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_ebcdic=yes -@@ -14123,7 +14169,7 @@ EOF +@@ -14123,7 +14171,7 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:14127: checking whether byte ordering is bigendian" >&5 -+echo "configure:14173: checking whether byte ordering is bigendian" >&5 ++echo "configure:14175: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -14133,7 +14179,7 @@ else +@@ -14133,7 +14181,7 @@ else ac_cv_c_bigendian_php=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian_php=yes else -@@ -14175,7 +14221,7 @@ EOF +@@ -14175,7 +14223,7 @@ EOF echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6 -echo "configure:14179: checking whether writing to stdout works" >&5 -+echo "configure:14225: checking whether writing to stdout works" >&5 ++echo "configure:14227: checking whether writing to stdout works" >&5 if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -14186,7 +14232,7 @@ else +@@ -14186,7 +14234,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_write_stdout=yes -@@ -14279,12 +14325,12 @@ test -d /usr/ucblib && +@@ -14279,12 +14327,12 @@ test -d /usr/ucblib && unset found echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:14283: checking for socket" >&5 -+echo "configure:14329: checking for socket" >&5 ++echo "configure:14331: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else -@@ -14325,12 +14371,12 @@ if eval "test \"`echo '$ac_cv_func_'sock +@@ -14325,12 +14373,12 @@ if eval "test \"`echo '$ac_cv_func_'sock else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket""... $ac_c" 1>&6 -echo "configure:14329: checking for __socket" >&5 -+echo "configure:14375: checking for __socket" >&5 ++echo "configure:14377: checking for __socket" >&5 if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___socket=yes" else -@@ -14391,7 +14437,7 @@ EOF +@@ -14391,7 +14439,7 @@ EOF unset ac_cv_lib_socket___socket unset found echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:14395: checking for socket in -lsocket" >&5 -+echo "configure:14441: checking for socket in -lsocket" >&5 ++echo "configure:14443: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14399,7 +14445,7 @@ else +@@ -14399,7 +14447,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14430,7 +14476,7 @@ else +@@ -14430,7 +14478,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6 -echo "configure:14434: checking for __socket in -lsocket" >&5 -+echo "configure:14480: checking for __socket in -lsocket" >&5 ++echo "configure:14482: checking for __socket in -lsocket" >&5 ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14438,7 +14484,7 @@ else +@@ -14438,7 +14486,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14481,11 +14527,11 @@ fi +@@ -14481,11 +14529,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -14536,12 +14582,12 @@ EOF +@@ -14536,12 +14584,12 @@ EOF unset found echo $ac_n "checking for socketpair""... $ac_c" 1>&6 -echo "configure:14540: checking for socketpair" >&5 -+echo "configure:14586: checking for socketpair" >&5 ++echo "configure:14588: checking for socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socketpair=yes" else -@@ -14582,12 +14628,12 @@ if eval "test \"`echo '$ac_cv_func_'sock +@@ -14582,12 +14630,12 @@ if eval "test \"`echo '$ac_cv_func_'sock else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair""... $ac_c" 1>&6 -echo "configure:14586: checking for __socketpair" >&5 -+echo "configure:14632: checking for __socketpair" >&5 ++echo "configure:14634: checking for __socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___socketpair=yes" else -@@ -14648,7 +14694,7 @@ EOF +@@ -14648,7 +14696,7 @@ EOF unset ac_cv_lib_socket___socketpair unset found echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6 -echo "configure:14652: checking for socketpair in -lsocket" >&5 -+echo "configure:14698: checking for socketpair in -lsocket" >&5 ++echo "configure:14700: checking for socketpair in -lsocket" >&5 ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14656,7 +14702,7 @@ else +@@ -14656,7 +14704,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14687,7 +14733,7 @@ else +@@ -14687,7 +14735,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6 -echo "configure:14691: checking for __socketpair in -lsocket" >&5 -+echo "configure:14737: checking for __socketpair in -lsocket" >&5 ++echo "configure:14739: checking for __socketpair in -lsocket" >&5 ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14695,7 +14741,7 @@ else +@@ -14695,7 +14743,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14738,11 +14784,11 @@ fi +@@ -14738,11 +14786,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -14793,12 +14839,12 @@ EOF +@@ -14793,12 +14841,12 @@ EOF unset found echo $ac_n "checking for htonl""... $ac_c" 1>&6 -echo "configure:14797: checking for htonl" >&5 -+echo "configure:14843: checking for htonl" >&5 ++echo "configure:14845: checking for htonl" >&5 if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_htonl=yes" else -@@ -14839,12 +14885,12 @@ if eval "test \"`echo '$ac_cv_func_'hton +@@ -14839,12 +14887,12 @@ if eval "test \"`echo '$ac_cv_func_'hton else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl""... $ac_c" 1>&6 -echo "configure:14843: checking for __htonl" >&5 -+echo "configure:14889: checking for __htonl" >&5 ++echo "configure:14891: checking for __htonl" >&5 if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___htonl=yes" else -@@ -14905,7 +14951,7 @@ EOF +@@ -14905,7 +14953,7 @@ EOF unset ac_cv_lib_socket___htonl unset found echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6 -echo "configure:14909: checking for htonl in -lsocket" >&5 -+echo "configure:14955: checking for htonl in -lsocket" >&5 ++echo "configure:14957: checking for htonl in -lsocket" >&5 ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14913,7 +14959,7 @@ else +@@ -14913,7 +14961,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14944,7 +14990,7 @@ else +@@ -14944,7 +14992,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6 -echo "configure:14948: checking for __htonl in -lsocket" >&5 -+echo "configure:14994: checking for __htonl in -lsocket" >&5 ++echo "configure:14996: checking for __htonl in -lsocket" >&5 ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14952,7 +14998,7 @@ else +@@ -14952,7 +15000,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14995,11 +15041,11 @@ fi +@@ -14995,11 +15043,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15050,12 +15096,12 @@ EOF +@@ -15050,12 +15098,12 @@ EOF unset found echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:15054: checking for gethostname" >&5 -+echo "configure:15100: checking for gethostname" >&5 ++echo "configure:15102: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else -@@ -15096,12 +15142,12 @@ if eval "test \"`echo '$ac_cv_func_'geth +@@ -15096,12 +15144,12 @@ if eval "test \"`echo '$ac_cv_func_'geth else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 -echo "configure:15100: checking for __gethostname" >&5 -+echo "configure:15146: checking for __gethostname" >&5 ++echo "configure:15148: checking for __gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___gethostname=yes" else -@@ -15162,7 +15208,7 @@ EOF +@@ -15162,7 +15210,7 @@ EOF unset ac_cv_lib_nsl___gethostname unset found echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:15166: checking for gethostname in -lnsl" >&5 -+echo "configure:15212: checking for gethostname in -lnsl" >&5 ++echo "configure:15214: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15170,7 +15216,7 @@ else +@@ -15170,7 +15218,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15201,7 +15247,7 @@ else +@@ -15201,7 +15249,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:15205: checking for __gethostname in -lnsl" >&5 -+echo "configure:15251: checking for __gethostname in -lnsl" >&5 ++echo "configure:15253: checking for __gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15209,7 +15255,7 @@ else +@@ -15209,7 +15257,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15252,11 +15298,11 @@ fi +@@ -15252,11 +15300,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15307,12 +15353,12 @@ EOF +@@ -15307,12 +15355,12 @@ EOF unset found echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6 -echo "configure:15311: checking for gethostbyaddr" >&5 -+echo "configure:15357: checking for gethostbyaddr" >&5 ++echo "configure:15359: checking for gethostbyaddr" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyaddr=yes" else -@@ -15353,12 +15399,12 @@ if eval "test \"`echo '$ac_cv_func_'geth +@@ -15353,12 +15401,12 @@ if eval "test \"`echo '$ac_cv_func_'geth else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6 -echo "configure:15357: checking for __gethostbyaddr" >&5 -+echo "configure:15403: checking for __gethostbyaddr" >&5 ++echo "configure:15405: checking for __gethostbyaddr" >&5 if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___gethostbyaddr=yes" else -@@ -15419,7 +15465,7 @@ EOF +@@ -15419,7 +15467,7 @@ EOF unset ac_cv_lib_nsl___gethostbyaddr unset found echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:15423: checking for gethostbyaddr in -lnsl" >&5 -+echo "configure:15469: checking for gethostbyaddr in -lnsl" >&5 ++echo "configure:15471: checking for gethostbyaddr in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15427,7 +15473,7 @@ else +@@ -15427,7 +15475,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15458,7 +15504,7 @@ else +@@ -15458,7 +15506,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:15462: checking for __gethostbyaddr in -lnsl" >&5 -+echo "configure:15508: checking for __gethostbyaddr in -lnsl" >&5 ++echo "configure:15510: checking for __gethostbyaddr in -lnsl" >&5 ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15466,7 +15512,7 @@ else +@@ -15466,7 +15514,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15509,11 +15555,11 @@ fi +@@ -15509,11 +15557,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15564,12 +15610,12 @@ EOF +@@ -15564,12 +15612,12 @@ EOF unset found echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 -echo "configure:15568: checking for yp_get_default_domain" >&5 -+echo "configure:15614: checking for yp_get_default_domain" >&5 ++echo "configure:15616: checking for yp_get_default_domain" >&5 if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_yp_get_default_domain=yes" else -@@ -15610,12 +15656,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g +@@ -15610,12 +15658,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6 -echo "configure:15614: checking for __yp_get_default_domain" >&5 -+echo "configure:15660: checking for __yp_get_default_domain" >&5 ++echo "configure:15662: checking for __yp_get_default_domain" >&5 if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___yp_get_default_domain=yes" else -@@ -15676,7 +15722,7 @@ EOF +@@ -15676,7 +15724,7 @@ EOF unset ac_cv_lib_nsl___yp_get_default_domain unset found echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:15680: checking for yp_get_default_domain in -lnsl" >&5 -+echo "configure:15726: checking for yp_get_default_domain in -lnsl" >&5 ++echo "configure:15728: checking for yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15684,7 +15730,7 @@ else +@@ -15684,7 +15732,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15715,7 +15761,7 @@ else +@@ -15715,7 +15763,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:15719: checking for __yp_get_default_domain in -lnsl" >&5 -+echo "configure:15765: checking for __yp_get_default_domain in -lnsl" >&5 ++echo "configure:15767: checking for __yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15723,7 +15769,7 @@ else +@@ -15723,7 +15771,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15766,11 +15812,11 @@ fi +@@ -15766,11 +15814,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15822,12 +15868,12 @@ EOF +@@ -15822,12 +15870,12 @@ EOF unset found echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:15826: checking for dlopen" >&5 -+echo "configure:15872: checking for dlopen" >&5 ++echo "configure:15874: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else -@@ -15868,12 +15914,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop +@@ -15868,12 +15916,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen""... $ac_c" 1>&6 -echo "configure:15872: checking for __dlopen" >&5 -+echo "configure:15918: checking for __dlopen" >&5 ++echo "configure:15920: checking for __dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___dlopen=yes" else -@@ -15934,7 +15980,7 @@ EOF +@@ -15934,7 +15982,7 @@ EOF unset ac_cv_lib_dl___dlopen unset found echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:15938: checking for dlopen in -ldl" >&5 -+echo "configure:15984: checking for dlopen in -ldl" >&5 ++echo "configure:15986: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15942,7 +15988,7 @@ else +@@ -15942,7 +15990,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15973,7 +16019,7 @@ else +@@ -15973,7 +16021,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:15977: checking for __dlopen in -ldl" >&5 -+echo "configure:16023: checking for __dlopen in -ldl" >&5 ++echo "configure:16025: checking for __dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15981,7 +16027,7 @@ else +@@ -15981,7 +16029,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16024,11 +16070,11 @@ fi +@@ -16024,11 +16072,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16080,7 +16126,7 @@ EOF +@@ -16080,7 +16128,7 @@ EOF fi echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:16084: checking for sin in -lm" >&5 -+echo "configure:16130: checking for sin in -lm" >&5 ++echo "configure:16132: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16088,7 +16134,7 @@ else +@@ -16088,7 +16136,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16133,12 +16179,12 @@ fi +@@ -16133,12 +16181,12 @@ fi unset found echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:16137: checking for inet_aton" >&5 -+echo "configure:16183: checking for inet_aton" >&5 ++echo "configure:16185: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else -@@ -16179,12 +16225,12 @@ if eval "test \"`echo '$ac_cv_func_'inet +@@ -16179,12 +16227,12 @@ if eval "test \"`echo '$ac_cv_func_'inet else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6 -echo "configure:16183: checking for __inet_aton" >&5 -+echo "configure:16229: checking for __inet_aton" >&5 ++echo "configure:16231: checking for __inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___inet_aton=yes" else -@@ -16245,7 +16291,7 @@ EOF +@@ -16245,7 +16293,7 @@ EOF unset ac_cv_lib_resolv___inet_aton unset found echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:16249: checking for inet_aton in -lresolv" >&5 -+echo "configure:16295: checking for inet_aton in -lresolv" >&5 ++echo "configure:16297: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16253,7 +16299,7 @@ else +@@ -16253,7 +16301,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16284,7 +16330,7 @@ else +@@ -16284,7 +16332,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:16288: checking for __inet_aton in -lresolv" >&5 -+echo "configure:16334: checking for __inet_aton in -lresolv" >&5 ++echo "configure:16336: checking for __inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16292,7 +16338,7 @@ else +@@ -16292,7 +16340,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16335,11 +16381,11 @@ fi +@@ -16335,11 +16383,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16381,7 +16427,7 @@ EOF +@@ -16381,7 +16429,7 @@ EOF unset ac_cv_lib_bind___inet_aton unset found echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:16385: checking for inet_aton in -lbind" >&5 -+echo "configure:16431: checking for inet_aton in -lbind" >&5 ++echo "configure:16433: checking for inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16389,7 +16435,7 @@ else +@@ -16389,7 +16437,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16420,7 +16466,7 @@ else +@@ -16420,7 +16468,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:16424: checking for __inet_aton in -lbind" >&5 -+echo "configure:16470: checking for __inet_aton in -lbind" >&5 ++echo "configure:16472: checking for __inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16428,7 +16474,7 @@ else +@@ -16428,7 +16476,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16471,11 +16517,11 @@ fi +@@ -16471,11 +16519,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16526,12 +16572,12 @@ EOF +@@ -16526,12 +16574,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:16530: checking for ANSI C header files" >&5 -+echo "configure:16576: checking for ANSI C header files" >&5 ++echo "configure:16578: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -16539,7 +16585,7 @@ else +@@ -16539,7 +16587,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:16589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:16591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -16556,7 +16602,7 @@ rm -f conftest* +@@ -16556,7 +16604,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF -@@ -16574,7 +16620,7 @@ fi +@@ -16574,7 +16622,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF -@@ -16595,7 +16641,7 @@ if test "$cross_compiling" = yes; then +@@ -16595,7 +16643,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -16606,7 +16652,7 @@ if (XOR (islower (i), ISLOWER (i)) || to +@@ -16606,7 +16654,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:16610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -16634,12 +16680,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di +@@ -16634,12 +16682,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:16638: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:16684: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:16686: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> -@@ -16647,7 +16693,7 @@ int main() { +@@ -16647,7 +16695,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:16651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else -@@ -16672,7 +16718,7 @@ done +@@ -16672,7 +16720,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:16676: checking for opendir in -ldir" >&5 -+echo "configure:16722: checking for opendir in -ldir" >&5 ++echo "configure:16724: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16680,7 +16726,7 @@ else +@@ -16680,7 +16728,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16713,7 +16759,7 @@ fi +@@ -16713,7 +16761,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:16717: checking for opendir in -lx" >&5 -+echo "configure:16763: checking for opendir in -lx" >&5 ++echo "configure:16765: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16721,7 +16767,7 @@ else +@@ -16721,7 +16769,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16814,17 +16860,17 @@ assert.h +@@ -16814,17 +16862,17 @@ assert.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16818: checking for $ac_hdr" >&5 -+echo "configure:16864: checking for $ac_hdr" >&5 ++echo "configure:16866: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:16874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:16876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -16853,12 +16899,12 @@ done +@@ -16853,12 +16901,12 @@ done echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 -echo "configure:16857: checking for fopencookie" >&5 -+echo "configure:16903: checking for fopencookie" >&5 ++echo "configure:16905: checking for fopencookie" >&5 if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fopencookie=yes" else -@@ -16903,7 +16949,7 @@ fi +@@ -16903,7 +16951,7 @@ fi if test "$have_glibc_fopencookie" = "yes"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_cookie_io_functions_t=yes else -@@ -16932,7 +16978,7 @@ if test "$cross_compiling" = yes; then +@@ -16932,7 +16980,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cookie_io_functions_use_off64_t=yes -@@ -16984,7 +17030,7 @@ fi +@@ -16984,7 +17032,7 @@ fi else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_IO_cookie_io_functions_t=yes else -@@ -17028,7 +17074,7 @@ EOF +@@ -17028,7 +17076,7 @@ EOF echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6 -echo "configure:17032: checking for broken getcwd" >&5 -+echo "configure:17078: checking for broken getcwd" >&5 ++echo "configure:17080: checking for broken getcwd" >&5 os=`uname -sr 2>/dev/null` case $os in SunOS*) -@@ -17043,14 +17089,14 @@ EOF +@@ -17043,14 +17091,14 @@ EOF echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6 -echo "configure:17047: checking for broken libc stdio" >&5 -+echo "configure:17093: checking for broken libc stdio" >&5 ++echo "configure:17095: checking for broken libc stdio" >&5 if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2966,118 +2975,118 @@ if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < -@@ -17063,7 +17109,7 @@ choke me +@@ -17063,7 +17111,7 @@ choke me ; return 0; } EOF -if { (eval echo configure:17067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _cv_have_broken_glibc_fopen_append=yes else -@@ -17076,7 +17122,7 @@ rm -f conftest* +@@ -17076,7 +17124,7 @@ rm -f conftest* else cat > conftest.$ac_ext < -@@ -17104,7 +17150,7 @@ int main(int argc, char *argv[]) +@@ -17104,7 +17152,7 @@ int main(int argc, char *argv[]) } EOF -if { (eval echo configure:17108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then _cv_have_broken_glibc_fopen_append=no else -@@ -17132,12 +17178,12 @@ EOF +@@ -17132,12 +17180,12 @@ EOF echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:17136: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:17182: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:17184: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -17145,7 +17191,7 @@ int main() { +@@ -17145,7 +17193,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:17149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else -@@ -17166,12 +17212,12 @@ EOF +@@ -17166,12 +17214,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:17170: checking for tm_zone in struct tm" >&5 -+echo "configure:17216: checking for tm_zone in struct tm" >&5 ++echo "configure:17218: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> -@@ -17179,7 +17225,7 @@ int main() { +@@ -17179,7 +17227,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:17183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else -@@ -17199,12 +17245,12 @@ EOF +@@ -17199,12 +17247,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:17203: checking for tzname" >&5 -+echo "configure:17249: checking for tzname" >&5 ++echo "configure:17251: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ -@@ -17214,7 +17260,7 @@ int main() { +@@ -17214,7 +17262,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:17218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else -@@ -17238,16 +17284,16 @@ fi +@@ -17238,16 +17286,16 @@ fi echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6 -echo "configure:17242: checking for missing declarations of reentrant functions" >&5 -+echo "configure:17288: checking for missing declarations of reentrant functions" >&5 ++echo "configure:17290: checking for missing declarations of reentrant functions" >&5 cat > conftest.$ac_ext < int main() { @@ -3085,16 +3094,16 @@ ; return 0; } EOF -if { (eval echo configure:17251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17265,14 +17311,14 @@ EOF +@@ -17265,14 +17313,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { @@ -3102,16 +3111,16 @@ ; return 0; } EOF -if { (eval echo configure:17276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17290,14 +17336,14 @@ EOF +@@ -17290,14 +17338,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { @@ -3119,16 +3128,16 @@ ; return 0; } EOF -if { (eval echo configure:17301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17315,14 +17361,14 @@ EOF +@@ -17315,14 +17363,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { @@ -3136,16 +3145,16 @@ ; return 0; } EOF -if { (eval echo configure:17326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17340,14 +17386,14 @@ EOF +@@ -17340,14 +17388,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { @@ -3153,19 +3162,19 @@ ; return 0; } EOF -if { (eval echo configure:17351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17368,16 +17414,16 @@ rm -f conftest* +@@ -17368,16 +17416,16 @@ rm -f conftest* echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6 -echo "configure:17372: checking for fclose declaration" >&5 -+echo "configure:17418: checking for fclose declaration" >&5 ++echo "configure:17420: checking for fclose declaration" >&5 cat > conftest.$ac_ext < int main() { @@ -3173,625 +3182,625 @@ ; return 0; } EOF -if { (eval echo configure:17381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -17403,12 +17449,12 @@ rm -f conftest* +@@ -17403,12 +17451,12 @@ rm -f conftest* echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:17407: checking for tm_gmtoff in struct tm" >&5 -+echo "configure:17453: checking for tm_gmtoff in struct tm" >&5 ++echo "configure:17455: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> -@@ -17416,7 +17462,7 @@ int main() { +@@ -17416,7 +17464,7 @@ int main() { struct tm tm; tm.tm_gmtoff; ; return 0; } EOF -if { (eval echo configure:17420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_gmtoff=yes else -@@ -17439,12 +17485,12 @@ fi +@@ -17439,12 +17487,12 @@ fi echo $ac_n "checking for struct flock""... $ac_c" 1>&6 -echo "configure:17443: checking for struct flock" >&5 -+echo "configure:17489: checking for struct flock" >&5 ++echo "configure:17491: checking for struct flock" >&5 if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -17454,7 +17500,7 @@ int main() { +@@ -17454,7 +17502,7 @@ int main() { struct flock x; ; return 0; } EOF -if { (eval echo configure:17458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_flock=yes -@@ -17481,12 +17527,12 @@ fi +@@ -17481,12 +17529,12 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:17485: checking for socklen_t" >&5 -+echo "configure:17531: checking for socklen_t" >&5 ++echo "configure:17533: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -17498,7 +17544,7 @@ socklen_t x; +@@ -17498,7 +17546,7 @@ socklen_t x; ; return 0; } EOF -if { (eval echo configure:17502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_socklen_t=yes -@@ -17524,7 +17570,7 @@ fi +@@ -17524,7 +17572,7 @@ fi echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:17528: checking size of size_t" >&5 -+echo "configure:17574: checking size of size_t" >&5 ++echo "configure:17576: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -17532,7 +17578,7 @@ else +@@ -17532,7 +17580,7 @@ else ac_cv_sizeof_size_t=8 else cat > conftest.$ac_ext < #include -@@ -17544,7 +17590,7 @@ main() +@@ -17544,7 +17592,7 @@ main() exit(0); } EOF -if { (eval echo configure:17548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else -@@ -17564,7 +17610,7 @@ EOF +@@ -17564,7 +17612,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:17568: checking size of long long" >&5 -+echo "configure:17614: checking size of long long" >&5 ++echo "configure:17616: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -17572,7 +17618,7 @@ else +@@ -17572,7 +17620,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < #include -@@ -17584,7 +17630,7 @@ main() +@@ -17584,7 +17632,7 @@ main() exit(0); } EOF -if { (eval echo configure:17588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else -@@ -17604,7 +17650,7 @@ EOF +@@ -17604,7 +17652,7 @@ EOF echo $ac_n "checking size of long long int""... $ac_c" 1>&6 -echo "configure:17608: checking size of long long int" >&5 -+echo "configure:17654: checking size of long long int" >&5 ++echo "configure:17656: checking size of long long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -17612,7 +17658,7 @@ else +@@ -17612,7 +17660,7 @@ else ac_cv_sizeof_long_long_int=8 else cat > conftest.$ac_ext < #include -@@ -17624,7 +17670,7 @@ main() +@@ -17624,7 +17672,7 @@ main() exit(0); } EOF -if { (eval echo configure:17628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long_int=`cat conftestval` else -@@ -17644,7 +17690,7 @@ EOF +@@ -17644,7 +17692,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:17648: checking size of long" >&5 -+echo "configure:17694: checking size of long" >&5 ++echo "configure:17696: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -17652,7 +17698,7 @@ else +@@ -17652,7 +17700,7 @@ else ac_cv_sizeof_long=8 else cat > conftest.$ac_ext < #include -@@ -17664,7 +17710,7 @@ main() +@@ -17664,7 +17712,7 @@ main() exit(0); } EOF -if { (eval echo configure:17668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else -@@ -17684,7 +17730,7 @@ EOF +@@ -17684,7 +17732,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:17688: checking size of int" >&5 -+echo "configure:17734: checking size of int" >&5 ++echo "configure:17736: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -17692,7 +17738,7 @@ else +@@ -17692,7 +17740,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < #include -@@ -17704,7 +17750,7 @@ main() +@@ -17704,7 +17752,7 @@ main() exit(0); } EOF -if { (eval echo configure:17708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else -@@ -17726,7 +17772,7 @@ EOF +@@ -17726,7 +17774,7 @@ EOF echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6 -echo "configure:17730: checking size of intmax_t" >&5 -+echo "configure:17776: checking size of intmax_t" >&5 ++echo "configure:17778: checking size of intmax_t" >&5 php_cache_value=php_cv_sizeof_intmax_t if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then -@@ -17743,7 +17789,7 @@ else +@@ -17743,7 +17791,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -17767,7 +17813,7 @@ int main() +@@ -17767,7 +17815,7 @@ int main() } EOF -if { (eval echo configure:17771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -17806,7 +17852,7 @@ EOF +@@ -17806,7 +17854,7 @@ EOF echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6 -echo "configure:17810: checking size of ssize_t" >&5 -+echo "configure:17856: checking size of ssize_t" >&5 ++echo "configure:17858: checking size of ssize_t" >&5 php_cache_value=php_cv_sizeof_ssize_t if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then -@@ -17823,7 +17869,7 @@ else +@@ -17823,7 +17871,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -17847,7 +17893,7 @@ int main() +@@ -17847,7 +17895,7 @@ int main() } EOF -if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -17886,7 +17932,7 @@ EOF +@@ -17886,7 +17934,7 @@ EOF echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6 -echo "configure:17890: checking size of ptrdiff_t" >&5 -+echo "configure:17936: checking size of ptrdiff_t" >&5 ++echo "configure:17938: checking size of ptrdiff_t" >&5 php_cache_value=php_cv_sizeof_ptrdiff_t if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then -@@ -17903,7 +17949,7 @@ else +@@ -17903,7 +17951,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -17927,7 +17973,7 @@ int main() +@@ -17927,7 +17975,7 @@ int main() } EOF -if { (eval echo configure:17931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -17966,12 +18012,12 @@ EOF +@@ -17966,12 +18014,12 @@ EOF echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:17970: checking for st_blksize in struct stat" >&5 -+echo "configure:18016: checking for st_blksize in struct stat" >&5 ++echo "configure:18018: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -17979,7 +18025,7 @@ int main() { +@@ -17979,7 +18027,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else -@@ -18001,12 +18047,12 @@ fi +@@ -18001,12 +18049,12 @@ fi if test "`uname -s 2>/dev/null`" != "QNX"; then echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:18005: checking for st_blocks in struct stat" >&5 -+echo "configure:18051: checking for st_blocks in struct stat" >&5 ++echo "configure:18053: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -18014,7 +18060,7 @@ int main() { +@@ -18014,7 +18062,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:18018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else -@@ -18041,12 +18087,12 @@ else +@@ -18041,12 +18089,12 @@ else WARNING_LEVEL=0 fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:18045: checking for st_rdev in struct stat" >&5 -+echo "configure:18091: checking for st_rdev in struct stat" >&5 ++echo "configure:18093: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -18054,7 +18100,7 @@ int main() { +@@ -18054,7 +18102,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:18058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else -@@ -18076,12 +18122,12 @@ fi +@@ -18076,12 +18124,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:18080: checking for size_t" >&5 -+echo "configure:18126: checking for size_t" >&5 ++echo "configure:18128: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -18109,12 +18155,12 @@ EOF +@@ -18109,12 +18157,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:18113: checking for uid_t in sys/types.h" >&5 -+echo "configure:18159: checking for uid_t in sys/types.h" >&5 ++echo "configure:18161: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF -@@ -18145,12 +18191,12 @@ fi +@@ -18145,12 +18193,12 @@ fi echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6 -echo "configure:18149: checking for struct sockaddr_storage" >&5 -+echo "configure:18195: checking for struct sockaddr_storage" >&5 ++echo "configure:18197: checking for struct sockaddr_storage" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -18158,7 +18204,7 @@ int main() { +@@ -18158,7 +18206,7 @@ int main() { struct sockaddr_storage s; s ; return 0; } EOF -if { (eval echo configure:18162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_storage=yes else -@@ -18179,13 +18225,13 @@ EOF +@@ -18179,13 +18227,13 @@ EOF fi echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6 -echo "configure:18183: checking for field sa_len in struct sockaddr" >&5 -+echo "configure:18229: checking for field sa_len in struct sockaddr" >&5 ++echo "configure:18231: checking for field sa_len in struct sockaddr" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -18193,7 +18239,7 @@ int main() { +@@ -18193,7 +18241,7 @@ int main() { static struct sockaddr sa; int n = (int) sa.sa_len; return n; ; return 0; } EOF -if { (eval echo configure:18197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_sa_len=yes else -@@ -18216,12 +18262,12 @@ EOF +@@ -18216,12 +18264,12 @@ EOF echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6 -echo "configure:18220: checking for IPv6 support" >&5 -+echo "configure:18266: checking for IPv6 support" >&5 ++echo "configure:18268: checking for IPv6 support" >&5 if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -18230,7 +18276,7 @@ int main() { +@@ -18230,7 +18278,7 @@ int main() { struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; ; return 0; } EOF -if { (eval echo configure:18234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ipv6_support=yes else -@@ -18246,12 +18292,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6 +@@ -18246,12 +18294,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6 echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:18250: checking for vprintf" >&5 -+echo "configure:18296: checking for vprintf" >&5 ++echo "configure:18298: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else -@@ -18298,12 +18344,12 @@ fi +@@ -18298,12 +18346,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:18302: checking for _doprnt" >&5 -+echo "configure:18348: checking for _doprnt" >&5 ++echo "configure:18350: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else -@@ -18434,12 +18480,12 @@ asprintf \ +@@ -18434,12 +18482,12 @@ asprintf \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18438: checking for $ac_func" >&5 -+echo "configure:18484: checking for $ac_func" >&5 ++echo "configure:18486: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -18493,7 +18539,7 @@ done +@@ -18493,7 +18541,7 @@ done unset ac_cv_lib_rt___nanosleep unset found echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:18497: checking for nanosleep in -lrt" >&5 -+echo "configure:18543: checking for nanosleep in -lrt" >&5 ++echo "configure:18545: checking for nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -18501,7 +18547,7 @@ else +@@ -18501,7 +18549,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -18532,7 +18578,7 @@ else +@@ -18532,7 +18580,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:18536: checking for __nanosleep in -lrt" >&5 -+echo "configure:18582: checking for __nanosleep in -lrt" >&5 ++echo "configure:18584: checking for __nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -18540,7 +18586,7 @@ else +@@ -18540,7 +18588,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -18583,11 +18629,11 @@ fi +@@ -18583,11 +18631,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -18631,25 +18677,25 @@ EOF +@@ -18631,25 +18679,25 @@ EOF echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:18635: checking for getaddrinfo" >&5 -+echo "configure:18681: checking for getaddrinfo" >&5 ++echo "configure:18683: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3799,89 +3808,89 @@ ; return 0; } EOF -if { (eval echo configure:18647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test "$cross_compiling" = yes; then ac_cv_func_getaddrinfo=no else cat > conftest.$ac_ext < -@@ -18689,7 +18735,7 @@ int main(void) { +@@ -18689,7 +18737,7 @@ int main(void) { } EOF -if { (eval echo configure:18693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getaddrinfo=yes else -@@ -18721,12 +18767,12 @@ fi +@@ -18721,12 +18769,12 @@ fi for ac_func in strlcat strlcpy getopt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18725: checking for $ac_func" >&5 -+echo "configure:18771: checking for $ac_func" >&5 ++echo "configure:18773: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -18776,7 +18822,7 @@ done +@@ -18776,7 +18824,7 @@ done echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:18780: checking whether utime accepts a null argument" >&5 -+echo "configure:18826: checking whether utime accepts a null argument" >&5 ++echo "configure:18828: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -18786,7 +18832,7 @@ if test "$cross_compiling" = yes; then +@@ -18786,7 +18834,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include -@@ -18797,7 +18843,7 @@ exit(!(stat ("conftestdata", &s) == 0 && +@@ -18797,7 +18845,7 @@ exit(!(stat ("conftestdata", &s) == 0 && && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:18801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else -@@ -18823,19 +18869,19 @@ fi +@@ -18823,19 +18871,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:18827: checking for working alloca.h" >&5 -+echo "configure:18873: checking for working alloca.h" >&5 ++echo "configure:18875: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3889,284 +3898,284 @@ ; return 0; } EOF -if { (eval echo configure:18839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else -@@ -18856,12 +18902,12 @@ EOF +@@ -18856,12 +18904,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:18860: checking for alloca" >&5 -+echo "configure:18906: checking for alloca" >&5 ++echo "configure:18908: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else -@@ -18921,12 +18967,12 @@ EOF +@@ -18921,12 +18969,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:18925: checking whether alloca needs Cray hooks" >&5 -+echo "configure:18971: checking whether alloca needs Cray hooks" >&5 ++echo "configure:18973: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 +@@ -18951,12 +18999,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18955: checking for $ac_func" >&5 -+echo "configure:19001: checking for $ac_func" >&5 ++echo "configure:19003: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -19006,7 +19052,7 @@ done +@@ -19006,7 +19054,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:19010: checking stack direction for C alloca" >&5 -+echo "configure:19056: checking stack direction for C alloca" >&5 ++echo "configure:19058: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19014,7 +19060,7 @@ else +@@ -19014,7 +19062,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else -@@ -19056,13 +19102,13 @@ fi +@@ -19056,13 +19104,13 @@ fi echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 -echo "configure:19060: checking for declared timezone" >&5 -+echo "configure:19106: checking for declared timezone" >&5 ++echo "configure:19108: checking for declared timezone" >&5 if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -19077,7 +19123,7 @@ int main() { +@@ -19077,7 +19125,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_timezone=yes -@@ -19103,7 +19149,7 @@ EOF +@@ -19103,7 +19151,7 @@ EOF echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6 -echo "configure:19107: checking for type of reentrant time-related functions" >&5 -+echo "configure:19153: checking for type of reentrant time-related functions" >&5 ++echo "configure:19155: checking for type of reentrant time-related functions" >&5 if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19114,7 +19160,7 @@ if test "$cross_compiling" = yes; then +@@ -19114,7 +19162,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -19132,7 +19178,7 @@ return (1); +@@ -19132,7 +19180,7 @@ return (1); } EOF -if { (eval echo configure:19136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_time_r_type=hpux -@@ -19148,7 +19194,7 @@ else +@@ -19148,7 +19196,7 @@ else else cat > conftest.$ac_ext < -@@ -19164,7 +19210,7 @@ main() { +@@ -19164,7 +19212,7 @@ main() { } EOF -if { (eval echo configure:19168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_time_r_type=irix -@@ -19202,12 +19248,12 @@ EOF +@@ -19202,12 +19250,12 @@ EOF echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 -echo "configure:19206: checking for readdir_r" >&5 -+echo "configure:19252: checking for readdir_r" >&5 ++echo "configure:19254: checking for readdir_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_readdir_r=yes" else -@@ -19252,7 +19298,7 @@ fi +@@ -19252,7 +19300,7 @@ fi if test "$ac_cv_func_readdir_r" = "yes"; then echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6 -echo "configure:19256: checking for type of readdir_r" >&5 -+echo "configure:19302: checking for type of readdir_r" >&5 ++echo "configure:19304: checking for type of readdir_r" >&5 if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19263,7 +19309,7 @@ else +@@ -19263,7 +19311,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_what_readdir_r=POSIX -@@ -19299,7 +19345,7 @@ else +@@ -19299,7 +19347,7 @@ else rm -fr conftest* cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -19351,12 +19397,12 @@ EOF +@@ -19351,12 +19399,12 @@ EOF echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:19355: checking for in_addr_t" >&5 -+echo "configure:19401: checking for in_addr_t" >&5 ++echo "configure:19403: checking for in_addr_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -19390,12 +19436,12 @@ fi +@@ -19390,12 +19438,12 @@ fi for ac_func in crypt_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19394: checking for $ac_func" >&5 -+echo "configure:19440: checking for $ac_func" >&5 ++echo "configure:19442: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -19446,14 +19492,14 @@ done +@@ -19446,14 +19494,14 @@ done if test "x$php_crypt_r" = "x1"; then echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6 -echo "configure:19450: checking which data struct is used by crypt_r" >&5 -+echo "configure:19496: checking which data struct is used by crypt_r" >&5 ++echo "configure:19498: checking which data struct is used by crypt_r" >&5 if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4174,818 +4183,863 @@ php_cv_crypt_r_style=none cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=cryptd else -@@ -19477,7 +19523,7 @@ rm -f conftest* +@@ -19477,7 +19525,7 @@ rm -f conftest* if test "$php_cv_crypt_r_style" = "none"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=struct_crypt_data else -@@ -19502,7 +19548,7 @@ rm -f conftest* +@@ -19502,7 +19550,7 @@ rm -f conftest* if test "$php_cv_crypt_r_style" = "none"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=struct_crypt_data_gnu_source else -@@ -19575,7 +19621,7 @@ fi +@@ -19575,7 +19623,7 @@ fi php_enable_gcov=no echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6 -echo "configure:19579: checking whether to include gcov symbols" >&5 -+echo "configure:19625: checking whether to include gcov symbols" >&5 ++echo "configure:19627: checking whether to include gcov symbols" >&5 # Check whether --enable-gcov or --disable-gcov was given. if test "${enable_gcov+set}" = set; then enableval="$enable_gcov" -@@ -19614,7 +19660,7 @@ if test "$PHP_GCOV" = "yes"; then +@@ -19614,7 +19662,7 @@ if test "$PHP_GCOV" = "yes"; then # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19618: checking for $ac_word" >&5 -+echo "configure:19664: checking for $ac_word" >&5 ++echo "configure:19666: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19643,7 +19689,7 @@ fi +@@ -19643,7 +19691,7 @@ fi # Extract the first word of "genhtml", so it can be a program name with args. set dummy genhtml; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19647: checking for $ac_word" >&5 -+echo "configure:19693: checking for $ac_word" >&5 ++echo "configure:19695: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19678,7 +19724,7 @@ fi +@@ -19678,7 +19726,7 @@ fi if test "$LTP"; then echo $ac_n "checking for ltp version""... $ac_c" 1>&6 -echo "configure:19682: checking for ltp version" >&5 -+echo "configure:19728: checking for ltp version" >&5 ++echo "configure:19730: checking for ltp version" >&5 if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19735,7 +19781,7 @@ fi +@@ -19735,7 +19783,7 @@ fi php_enable_debug=no echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6 -echo "configure:19739: checking whether to include debugging symbols" >&5 -+echo "configure:19785: checking whether to include debugging symbols" >&5 ++echo "configure:19787: checking whether to include debugging symbols" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" -@@ -19783,7 +19829,7 @@ fi +@@ -19783,7 +19831,7 @@ fi php_with_layout=PHP echo $ac_n "checking layout of installed files""... $ac_c" 1>&6 -echo "configure:19787: checking layout of installed files" >&5 -+echo "configure:19833: checking layout of installed files" >&5 ++echo "configure:19835: checking layout of installed files" >&5 # Check whether --with-layout or --without-layout was given. if test "${with_layout+set}" = set; then withval="$with_layout" -@@ -19815,7 +19861,7 @@ esac +@@ -19815,7 +19863,7 @@ esac php_with_config_file_path=DEFAULT echo $ac_n "checking path to configuration file""... $ac_c" 1>&6 -echo "configure:19819: checking path to configuration file" >&5 -+echo "configure:19865: checking path to configuration file" >&5 ++echo "configure:19867: checking path to configuration file" >&5 # Check whether --with-config-file-path or --without-config-file-path was given. if test "${with_config_file_path+set}" = set; then withval="$with_config_file_path" -@@ -19846,7 +19892,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU +@@ -19846,7 +19894,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU fi echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6 -echo "configure:19850: checking where to scan for configuration files" >&5 -+echo "configure:19896: checking where to scan for configuration files" >&5 ++echo "configure:19898: checking where to scan for configuration files" >&5 php_with_config_file_scan_dir=DEFAULT -@@ -19879,7 +19925,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA +@@ -19879,7 +19927,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA php_enable_safe_mode=no echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6 -echo "configure:19883: checking whether to enable safe mode by default" >&5 -+echo "configure:19929: checking whether to enable safe mode by default" >&5 ++echo "configure:19931: checking whether to enable safe mode by default" >&5 # Check whether --enable-safe-mode or --disable-safe-mode was given. if test "${enable_safe_mode+set}" = set; then enableval="$enable_safe_mode" -@@ -19911,7 +19957,7 @@ EOF +@@ -19911,7 +19959,7 @@ EOF fi echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6 -echo "configure:19915: checking for safe mode exec dir" >&5 -+echo "configure:19961: checking for safe mode exec dir" >&5 ++echo "configure:19963: checking for safe mode exec dir" >&5 php_with_exec_dir=no -@@ -19952,7 +19998,7 @@ fi +@@ -19952,7 +20000,7 @@ fi php_enable_sigchild=no echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6 -echo "configure:19956: checking whether to enable PHP's own SIGCHLD handler" >&5 -+echo "configure:20002: checking whether to enable PHP's own SIGCHLD handler" >&5 ++echo "configure:20004: checking whether to enable PHP's own SIGCHLD handler" >&5 # Check whether --enable-sigchild or --disable-sigchild was given. if test "${enable_sigchild+set}" = set; then enableval="$enable_sigchild" -@@ -19987,7 +20033,7 @@ fi +@@ -19987,7 +20035,7 @@ fi php_enable_magic_quotes=no echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6 -echo "configure:19991: checking whether to enable magic quotes by default" >&5 -+echo "configure:20037: checking whether to enable magic quotes by default" >&5 ++echo "configure:20039: checking whether to enable magic quotes by default" >&5 # Check whether --enable-magic-quotes or --disable-magic-quotes was given. if test "${enable_magic_quotes+set}" = set; then enableval="$enable_magic_quotes" -@@ -20022,7 +20068,7 @@ fi +@@ -20022,7 +20070,7 @@ fi php_enable_libgcc=no echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6 -echo "configure:20026: checking whether to explicitly link against libgcc" >&5 -+echo "configure:20072: checking whether to explicitly link against libgcc" >&5 ++echo "configure:20074: checking whether to explicitly link against libgcc" >&5 # Check whether --enable-libgcc or --disable-libgcc was given. if test "${enable_libgcc+set}" = set; then enableval="$enable_libgcc" -@@ -20099,7 +20145,7 @@ fi +@@ -20099,7 +20147,7 @@ fi php_enable_short_tags=yes echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6 -echo "configure:20103: checking whether to enable short tags by default" >&5 -+echo "configure:20149: checking whether to enable short tags by default" >&5 ++echo "configure:20151: checking whether to enable short tags by default" >&5 # Check whether --enable-short-tags or --disable-short-tags was given. if test "${enable_short_tags+set}" = set; then enableval="$enable_short_tags" -@@ -20134,7 +20180,7 @@ fi +@@ -20134,7 +20182,7 @@ fi php_enable_dmalloc=no echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6 -echo "configure:20138: checking whether to enable dmalloc" >&5 -+echo "configure:20184: checking whether to enable dmalloc" >&5 ++echo "configure:20186: checking whether to enable dmalloc" >&5 # Check whether --enable-dmalloc or --disable-dmalloc was given. if test "${enable_dmalloc+set}" = set; then enableval="$enable_dmalloc" -@@ -20155,7 +20201,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -20155,7 +20203,7 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_DMALLOC" = "yes"; then echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6 -echo "configure:20159: checking for dmalloc_error in -ldmalloc" >&5 -+echo "configure:20205: checking for dmalloc_error in -ldmalloc" >&5 ++echo "configure:20207: checking for dmalloc_error in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -20163,7 +20209,7 @@ else +@@ -20163,7 +20211,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:20224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:20226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -20219,7 +20265,7 @@ fi +@@ -20219,7 +20267,7 @@ fi php_enable_ipv6=yes echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 -echo "configure:20223: checking whether to enable IPv6 support" >&5 -+echo "configure:20269: checking whether to enable IPv6 support" >&5 ++echo "configure:20271: checking whether to enable IPv6 support" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" -@@ -20246,7 +20292,7 @@ EOF +@@ -20246,7 +20294,7 @@ EOF fi echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6 -echo "configure:20250: checking how big to make fd sets" >&5 -+echo "configure:20296: checking how big to make fd sets" >&5 ++echo "configure:20298: checking how big to make fd sets" >&5 php_enable_fd_setsize=no -@@ -20314,7 +20360,7 @@ fi +@@ -20314,7 +20362,7 @@ fi echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:20318: checking size of long" >&5 -+echo "configure:20364: checking size of long" >&5 ++echo "configure:20366: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -20322,7 +20368,7 @@ else +@@ -20322,7 +20370,7 @@ else ac_cv_sizeof_long=8 else cat > conftest.$ac_ext < #include -@@ -20334,7 +20380,7 @@ main() +@@ -20334,7 +20382,7 @@ main() exit(0); } EOF -if { (eval echo configure:20338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:20384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:20386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else -@@ -20354,7 +20400,7 @@ EOF +@@ -20354,7 +20402,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:20358: checking size of int" >&5 -+echo "configure:20404: checking size of int" >&5 ++echo "configure:20406: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -20362,7 +20408,7 @@ else +@@ -20362,7 +20410,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < #include -@@ -20374,7 +20420,7 @@ main() +@@ -20374,7 +20422,7 @@ main() exit(0); } EOF -if { (eval echo configure:20378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:20424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:20426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else -@@ -20395,13 +20441,13 @@ EOF +@@ -20395,13 +20443,13 @@ EOF echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:20399: checking for int32_t" >&5 -+echo "configure:20445: checking for int32_t" >&5 ++echo "configure:20447: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_int32_t=yes else -@@ -20443,13 +20489,13 @@ fi +@@ -20443,13 +20491,13 @@ fi echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:20447: checking for uint32_t" >&5 -+echo "configure:20493: checking for uint32_t" >&5 ++echo "configure:20495: checking for uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_uint32_t=yes else -@@ -20500,17 +20546,17 @@ stdlib.h +@@ -20500,17 +20548,17 @@ stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20504: checking for $ac_hdr" >&5 -+echo "configure:20550: checking for $ac_hdr" >&5 ++echo "configure:20552: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:20514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:20560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:20562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -20540,12 +20586,12 @@ done +@@ -20540,12 +20588,12 @@ done for ac_func in strtoll atoll strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20544: checking for $ac_func" >&5 -+echo "configure:20590: checking for $ac_func" >&5 ++echo "configure:20592: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:20618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:20620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -21030,7 +21076,7 @@ case $PHP_REGEX in +@@ -20594,6 +20642,44 @@ done + + + ++php_with_system_tzdata=no ++ ++echo $ac_n "checking for use of system timezone data""... $ac_c" 1>&6 ++echo "configure:20649: checking for use of system timezone data" >&5 ++# Check whether --with-system-tzdata or --without-system-tzdata was given. ++if test "${with_system_tzdata+set}" = set; then ++ withval="$with_system_tzdata" ++ PHP_SYSTEM_TZDATA=$withval ++else ++ ++ PHP_SYSTEM_TZDATA=no ++ ++ ++fi ++ ++ ++ext_output=$PHP_SYSTEM_TZDATA ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++if test "$PHP_SYSTEM_TZDATA" != "no"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_SYSTEM_TZDATA 1 ++EOF ++ ++ ++ if test "$PHP_SYSTEM_TZDATA" != "yes"; then ++ cat >> confdefs.h <&6 -echo "configure:21034: checking which regex library to use" >&5 -+echo "configure:21080: checking which regex library to use" >&5 ++echo "configure:21120: checking which regex library to use" >&5 echo "$ac_t""$REGEX_TYPE" 1>&6 if test "$REGEX_TYPE" = "php"; then -@@ -21407,13 +21453,13 @@ elif test "$REGEX_TYPE" = "system"; then +@@ -21407,13 +21493,13 @@ elif test "$REGEX_TYPE" = "system"; then EOF echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6 -echo "configure:21411: checking whether field re_magic exists in struct regex_t" >&5 -+echo "configure:21457: checking whether field re_magic exists in struct regex_t" >&5 ++echo "configure:21497: checking whether field re_magic exists in struct regex_t" >&5 if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -21421,7 +21467,7 @@ int main() { +@@ -21421,7 +21507,7 @@ int main() { regex_t rt; rt.re_magic; ; return 0; } EOF -if { (eval echo configure:21425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:21471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:21511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_regex_t_re_magic=yes else -@@ -21447,7 +21493,7 @@ fi +@@ -21447,7 +21533,7 @@ fi php_enable_libxml=yes echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6 -echo "configure:21451: checking whether to enable LIBXML support" >&5 -+echo "configure:21497: checking whether to enable LIBXML support" >&5 ++echo "configure:21537: checking whether to enable LIBXML support" >&5 # Check whether --enable-libxml or --disable-libxml was given. if test "${enable_libxml+set}" = set; then enableval="$enable_libxml" -@@ -21492,7 +21538,7 @@ if test -z "$PHP_LIBXML_DIR"; then +@@ -21492,7 +21578,7 @@ if test -z "$PHP_LIBXML_DIR"; then php_with_libxml_dir=no echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:21496: checking libxml2 install dir" >&5 -+echo "configure:21542: checking libxml2 install dir" >&5 ++echo "configure:21582: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" -@@ -21518,7 +21564,7 @@ if test "$PHP_LIBXML" != "no"; then +@@ -21518,7 +21604,7 @@ if test "$PHP_LIBXML" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:21522: checking for xml2-config path" >&5 -+echo "configure:21568: checking for xml2-config path" >&5 ++echo "configure:21608: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -21676,7 +21722,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -21676,7 +21762,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:21680: checking whether libxml build works" >&5 -+echo "configure:21726: checking whether libxml build works" >&5 ++echo "configure:21766: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -21692,7 +21738,7 @@ else +@@ -21692,7 +21778,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:21753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:21793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -22068,7 +22114,7 @@ fi +@@ -22068,7 +22154,7 @@ fi php_with_openssl=no echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6 -echo "configure:22072: checking for OpenSSL support" >&5 -+echo "configure:22118: checking for OpenSSL support" >&5 ++echo "configure:22158: checking for OpenSSL support" >&5 # Check whether --with-openssl or --without-openssl was given. if test "${with_openssl+set}" = set; then withval="$with_openssl" -@@ -22112,7 +22158,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -22112,7 +22198,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_kerberos=no echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6 -echo "configure:22116: checking for Kerberos support" >&5 -+echo "configure:22162: checking for Kerberos support" >&5 ++echo "configure:22202: checking for Kerberos support" >&5 # Check whether --with-kerberos or --without-kerberos was given. if test "${with_kerberos+set}" = set; then withval="$with_kerberos" -@@ -22438,7 +22484,7 @@ EOF +@@ -22438,7 +22524,7 @@ EOF # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:22442: checking for $ac_word" >&5 -+echo "configure:22488: checking for $ac_word" >&5 ++echo "configure:22528: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -22798,7 +22844,7 @@ fi +@@ -22798,7 +22884,7 @@ fi fi echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6 -echo "configure:22802: checking for DSA_get_default_method in -lssl" >&5 -+echo "configure:22848: checking for DSA_get_default_method in -lssl" >&5 ++echo "configure:22888: checking for DSA_get_default_method in -lssl" >&5 ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -22806,7 +22852,7 @@ else +@@ -22806,7 +22892,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:22867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:22907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -22841,7 +22887,7 @@ else +@@ -22841,7 +22927,7 @@ else fi echo $ac_n "checking for X509_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:22845: checking for X509_free in -lcrypto" >&5 -+echo "configure:22891: checking for X509_free in -lcrypto" >&5 ++echo "configure:22931: checking for X509_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'X509_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -22849,7 +22895,7 @@ else +@@ -22849,7 +22935,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:22910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:22950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -22902,7 +22948,7 @@ fi +@@ -22902,7 +22988,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:22906: checking for $ac_word" >&5 -+echo "configure:22952: checking for $ac_word" >&5 ++echo "configure:22992: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -23107,9 +23153,9 @@ fi +@@ -23107,9 +23193,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:23111: checking for OpenSSL version" >&5 -+echo "configure:23157: checking for OpenSSL version" >&5 ++echo "configure:23197: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < -@@ -23264,7 +23310,7 @@ rm -f conftest* +@@ -23264,7 +23350,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:23268: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:23314: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:23354: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -23272,7 +23318,7 @@ else +@@ -23272,7 +23358,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:23333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -23440,7 +23486,7 @@ fi +@@ -23440,7 +23526,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:23444: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:23490: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:23530: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -23448,7 +23494,7 @@ else +@@ -23448,7 +23534,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:23509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -23624,7 +23670,7 @@ ext_output=$PHP_PCRE_REGEX +@@ -23624,7 +23710,7 @@ ext_output=$PHP_PCRE_REGEX if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6 -echo "configure:23628: checking for PCRE headers location" >&5 -+echo "configure:23674: checking for PCRE headers location" >&5 ++echo "configure:23714: checking for PCRE headers location" >&5 for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do test -f $i/pcre.h && PCRE_INCDIR=$i done -@@ -23635,7 +23681,7 @@ echo "configure:23628: checking for PCRE +@@ -23635,7 +23721,7 @@ echo "configure:23628: checking for PCRE echo "$ac_t""$PCRE_INCDIR" 1>&6 echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6 -echo "configure:23639: checking for PCRE library location" >&5 -+echo "configure:23685: checking for PCRE library location" >&5 ++echo "configure:23725: checking for PCRE library location" >&5 for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done -@@ -24057,7 +24103,7 @@ EOF +@@ -24057,7 +24143,7 @@ EOF else echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6 -echo "configure:24061: checking for PCRE library to use" >&5 -+echo "configure:24107: checking for PCRE library to use" >&5 ++echo "configure:24147: checking for PCRE library to use" >&5 echo "$ac_t""bundled" 1>&6 pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \ pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \ -@@ -24394,7 +24440,7 @@ EOF +@@ -24394,7 +24480,7 @@ EOF php_with_sqlite3=yes echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6 -echo "configure:24398: checking whether to enable the SQLite3 extension" >&5 -+echo "configure:24444: checking whether to enable the SQLite3 extension" >&5 ++echo "configure:24484: checking whether to enable the SQLite3 extension" >&5 # Check whether --with-sqlite3 or --without-sqlite3 was given. if test "${with_sqlite3+set}" = set; then withval="$with_sqlite3" -@@ -24449,7 +24495,7 @@ if test $PHP_SQLITE3 != "no"; then +@@ -24449,7 +24535,7 @@ if test $PHP_SQLITE3 != "no"; then if test $PHP_SQLITE3 != "yes"; then echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 -echo "configure:24453: checking for sqlite3 files in default path" >&5 -+echo "configure:24499: checking for sqlite3 files in default path" >&5 ++echo "configure:24539: checking for sqlite3 files in default path" >&5 for i in $PHP_SQLITE3 /usr/local /usr; do if test -r $i/include/sqlite3.h; then SQLITE3_DIR=$i -@@ -24464,7 +24510,7 @@ echo "configure:24453: checking for sqli +@@ -24464,7 +24550,7 @@ echo "configure:24453: checking for sqli fi echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6 -echo "configure:24468: checking for SQLite 3.3.9+" >&5 -+echo "configure:24514: checking for SQLite 3.3.9+" >&5 ++echo "configure:24554: checking for SQLite 3.3.9+" >&5 save_old_LDFLAGS=$LDFLAGS ac_stuff=" -@@ -24563,7 +24609,7 @@ echo "configure:24468: checking for SQLi +@@ -24563,7 +24649,7 @@ echo "configure:24468: checking for SQLi done echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6 -echo "configure:24567: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 -+echo "configure:24613: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 ++echo "configure:24653: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -24571,7 +24617,7 @@ else +@@ -24571,7 +24657,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:24632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:24672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -24842,7 +24888,7 @@ fi +@@ -24842,7 +24928,7 @@ fi done echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 -echo "configure:24846: checking for sqlite3_key in -lsqlite3" >&5 -+echo "configure:24892: checking for sqlite3_key in -lsqlite3" >&5 ++echo "configure:24932: checking for sqlite3_key in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -24850,7 +24896,7 @@ else +@@ -24850,7 +24936,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:24911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:24951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -24993,7 +25039,7 @@ fi +@@ -24993,7 +25079,7 @@ fi done echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6 -echo "configure:24997: checking for sqlite3_load_extension in -lsqlite3" >&5 -+echo "configure:25043: checking for sqlite3_load_extension in -lsqlite3" >&5 ++echo "configure:25083: checking for sqlite3_load_extension in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -25001,7 +25047,7 @@ else +@@ -25001,7 +25087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:25062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:25102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -25049,7 +25095,7 @@ fi +@@ -25049,7 +25135,7 @@ fi else echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6 -echo "configure:25053: checking bundled sqlite3 library" >&5 -+echo "configure:25099: checking bundled sqlite3 library" >&5 ++echo "configure:25139: checking bundled sqlite3 library" >&5 echo "$ac_t""yes" 1>&6 sqlite3_extra_sources="libsqlite/sqlite3.c" -@@ -25405,7 +25451,7 @@ fi +@@ -25405,7 +25491,7 @@ fi php_with_zlib=no echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6 -echo "configure:25409: checking for ZLIB support" >&5 -+echo "configure:25455: checking for ZLIB support" >&5 ++echo "configure:25495: checking for ZLIB support" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" -@@ -25449,7 +25495,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -25449,7 +25535,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_zlib_dir=no echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6 -echo "configure:25453: checking if the location of ZLIB install directory is defined" >&5 -+echo "configure:25499: checking if the location of ZLIB install directory is defined" >&5 ++echo "configure:25539: checking if the location of ZLIB install directory is defined" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" -@@ -25892,7 +25938,7 @@ EOF +@@ -25892,7 +25978,7 @@ EOF done echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6 -echo "configure:25896: checking for gzgets in -lz" >&5 -+echo "configure:25942: checking for gzgets in -lz" >&5 ++echo "configure:25982: checking for gzgets in -lz" >&5 ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -25900,7 +25946,7 @@ else +@@ -25900,7 +25986,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:25961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:26001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -26048,18 +26094,18 @@ fi +@@ -26048,18 +26134,18 @@ fi @@ -4999,7 +5053,7 @@ - enableval="$enable_bcmath" - PHP_BCMATH=$enableval +echo $ac_n "checking whether to enable APC support""... $ac_c" 1>&6 -+echo "configure:26101: checking whether to enable APC support" >&5 ++echo "configure:26141: checking whether to enable APC support" >&5 +# Check whether --enable-apc or --disable-apc was given. +if test "${enable_apc+set}" = set; then + enableval="$enable_apc" @@ -5013,7 +5067,7 @@ fi -@@ -26067,12 +26113,12 @@ fi +@@ -26067,12 +26153,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -5029,7 +5083,7 @@ ;; no) ext_output=no -@@ -26091,396 +26137,481 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -26091,396 +26177,481 @@ echo "$ac_t""$ext_output" 1>&6 @@ -5060,7 +5114,7 @@ + + +echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6 -+echo "configure:26155: checking whether we should enable cache request file info" >&5 ++echo "configure:26195: checking whether we should enable cache request file info" >&5 +# Check whether --enable-apc-filehits or --disable-apc-filehits was given. +if test "${enable_apc_filehits+set}" = set; then + enableval="$enable_apc_filehits" @@ -5090,7 +5144,7 @@ -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do +echo $ac_n "checking whether we should use mmap""... $ac_c" 1>&6 -+echo "configure:26172: checking whether we should use mmap" >&5 ++echo "configure:26212: checking whether we should use mmap" >&5 +# Check whether --enable-apc-mmap or --disable-apc-mmap was given. +if test "${enable_apc_mmap+set}" = set; then + enableval="$enable_apc_mmap" @@ -5137,7 +5191,7 @@ - *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac +echo $ac_n "checking whether we should use semaphore locking instead of fcntl""... $ac_c" 1>&6 -+echo "configure:26189: checking whether we should use semaphore locking instead of fcntl" >&5 ++echo "configure:26229: checking whether we should use semaphore locking instead of fcntl" >&5 +# Check whether --enable-apc-sem or --disable-apc-sem was given. +if test "${enable_apc_sem+set}" = set; then + enableval="$enable_apc_sem" @@ -5167,7 +5221,7 @@ -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do +echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6 -+echo "configure:26206: checking whether we should use pthread mutex locking" >&5 ++echo "configure:26246: checking whether we should use pthread mutex locking" >&5 +# Check whether --enable-apc-pthreadmutex or --disable-apc-pthreadmutex was given. +if test "${enable_apc_pthreadmutex+set}" = set; then + enableval="$enable_apc_pthreadmutex" @@ -5241,7 +5295,7 @@ + +else + cat > conftest.$ac_ext < @@ -5276,7 +5330,7 @@ + } + +EOF -+if { (eval echo configure:26276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:26316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + @@ -5315,7 +5369,7 @@ - - install_modules="install-modules" +echo $ac_n "checking whether we should use spin locks""... $ac_c" 1>&6 -+echo "configure:26304: checking whether we should use spin locks" >&5 ++echo "configure:26344: checking whether we should use spin locks" >&5 +# Check whether --enable-apc-spinlocks or --disable-apc-spinlocks was given. +if test "${enable_apc_spinlocks+set}" = set; then + enableval="$enable_apc_spinlocks" @@ -5351,7 +5405,7 @@ + + +echo $ac_n "checking whether we should enable memory protection""... $ac_c" 1>&6 -+echo "configure:26321: checking whether we should enable memory protection" >&5 ++echo "configure:26361: checking whether we should enable memory protection" >&5 +# Check whether --enable-apc-memprotect or --disable-apc-memprotect was given. +if test "${enable_apc_memprotect+set}" = set; then + enableval="$enable_apc_memprotect" @@ -5473,7 +5527,7 @@ - *) - + echo $ac_n "checking for zend_set_lookup_function_hook""... $ac_c" 1>&6 -+echo "configure:26384: checking for zend_set_lookup_function_hook" >&5 ++echo "configure:26424: checking for zend_set_lookup_function_hook" >&5 +if eval "test \"`echo '$''{'php_cv_zend_set_lookup_function_hook'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -5486,7 +5540,7 @@ + orig_cflags=$CFLAGS + CFLAGS="$INCLUDES $EXTRA_INCLUDES" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:26444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + php_cv_zend_set_lookup_function_hook=yes @@ -5558,12 +5612,12 @@ + for ac_func in sigaction +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:26438: checking for $ac_func" >&5 ++echo "configure:26478: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:26506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else @@ -5619,13 +5673,13 @@ - EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" - fi + echo $ac_n "checking for union semun""... $ac_c" 1>&6 -+echo "configure:26491: checking for union semun" >&5 ++echo "configure:26531: checking for union semun" >&5 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else - ++ + cat > conftest.$ac_ext < @@ -5636,17 +5690,17 @@ +union semun x; x.val=1 +; return 0; } +EOF -+if { (eval echo configure:26508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:26548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* -- BUILD_DIR="$BUILD_DIR $ext_builddir" + php_cv_semun=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ + +- BUILD_DIR="$BUILD_DIR $ext_builddir" + php_cv_semun=no + +fi @@ -5672,7 +5726,7 @@ fi + echo $ac_n "checking whether we should enable valgrind support""... $ac_c" 1>&6 -+echo "configure:26539: checking whether we should enable valgrind support" >&5 ++echo "configure:26579: checking whether we should enable valgrind support" >&5 + # Check whether --enable-valgrind-checks or --disable-valgrind-checks was given. +if test "${enable_valgrind_checks+set}" = set; then + enableval="$enable_valgrind_checks" @@ -5688,17 +5742,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "valgrind/memcheck.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for valgrind/memcheck.h""... $ac_c" 1>&6 -+echo "configure:26553: checking for valgrind/memcheck.h" >&5 ++echo "configure:26593: checking for valgrind/memcheck.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:26563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:26603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* @@ -5723,8 +5777,10 @@ + echo "$ac_t""no" 1>&6 fi -- -- ++ ++fi + + -php_with_bz2=no - -echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 @@ -5734,13 +5790,13 @@ - withval="$with_bz2" - PHP_BZ2=$withval -else - +- - PHP_BZ2=no - test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL - - fi - - +-fi +- +- - -ext_output="yes, shared" -ext_shared=yes @@ -5818,7 +5874,7 @@ save_ext_shared=$ext_shared ext_shared=yes -@@ -26573,27 +26704,27 @@ echo "configure:26465: checking for BZip +@@ -26573,27 +26744,27 @@ echo "configure:26465: checking for BZip esac done @@ -5826,7 +5882,7 @@ -echo "configure:26578: checking for BZ2_bzerror in -lbz2" >&5 -ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` + echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6 -+echo "configure:26709: checking for shm_open in -lrt" >&5 ++echo "configure:26749: checking for shm_open in -lrt" >&5 +ac_lib_var=`echo rt'_'shm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5836,7 +5892,7 @@ +LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:26728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:26768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -26612,167 +26743,53 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -26612,167 +26783,53 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -6041,7 +6097,7 @@ esac -@@ -26787,7 +26804,7 @@ fi +@@ -26787,7 +26844,7 @@ fi old_IFS=$IFS @@ -6050,7 +6106,7 @@ IFS=. set $ac_src -@@ -26810,18 +26827,18 @@ EOF +@@ -26810,18 +26867,18 @@ EOF done @@ -6075,7 +6131,7 @@ esac -@@ -26836,14 +26853,14 @@ EOF +@@ -26836,14 +26893,14 @@ EOF old_IFS=$IFS @@ -6092,7 +6148,7 @@ case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -26866,31 +26883,31 @@ EOF +@@ -26866,31 +26923,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6133,7 +6189,7 @@ $link_cmd EOF -@@ -26903,31 +26920,31 @@ EOF +@@ -26903,31 +26960,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6174,7 +6230,7 @@ $link_cmd EOF -@@ -26935,22 +26952,22 @@ EOF +@@ -26935,22 +26992,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:27090: checking whether to enable bc style precision math functions" >&5 ++echo "configure:27130: checking whether to enable bc style precision math functions" >&5 +# Check whether --enable-bcmath or --disable-bcmath was given. +if test "${enable_bcmath+set}" = set; then + enableval="$enable_bcmath" @@ -6300,7 +6356,7 @@ fi -@@ -27077,12 +27102,12 @@ fi +@@ -27077,12 +27142,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -6316,7 +6372,7 @@ ;; no) ext_output=no -@@ -27101,25 +27126,21 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -27101,25 +27166,21 @@ echo "$ac_t""$ext_output" 1>&6 @@ -6350,7 +6406,7 @@ esac -@@ -27134,7 +27155,11 @@ EOF +@@ -27134,7 +27195,11 @@ EOF old_IFS=$IFS @@ -6363,7 +6419,7 @@ IFS=. set $ac_src -@@ -27157,18 +27182,18 @@ EOF +@@ -27157,18 +27222,18 @@ EOF done @@ -6388,7 +6444,7 @@ esac -@@ -27183,14 +27208,18 @@ EOF +@@ -27183,14 +27248,18 @@ EOF old_IFS=$IFS @@ -6409,7 +6465,7 @@ case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -27213,31 +27242,31 @@ EOF +@@ -27213,31 +27282,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6450,7 +6506,7 @@ $link_cmd EOF -@@ -27250,31 +27279,31 @@ EOF +@@ -27250,31 +27319,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6491,7 +6547,7 @@ $link_cmd EOF -@@ -27282,22 +27311,22 @@ EOF +@@ -27282,22 +27351,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:27455: checking for BZip2 support" >&5 ++echo "configure:27495: checking for BZip2 support" >&5 +# Check whether --with-bz2 or --without-bz2 was given. +if test "${with_bz2+set}" = set; then + withval="$with_bz2" @@ -6622,7 +6678,7 @@ fi -@@ -27421,12 +27467,12 @@ fi +@@ -27421,12 +27507,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -6638,7 +6694,7 @@ ;; no) ext_output=no -@@ -27445,48 +27491,346 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -27445,48 +27531,346 @@ echo "$ac_t""$ext_output" 1>&6 @@ -6655,7 +6711,7 @@ + BZIP_DIR=$PHP_BZ2 + else + echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 -+echo "configure:27500: checking for BZip2 in default path" >&5 ++echo "configure:27540: checking for BZip2 in default path" >&5 + for i in /usr/local /usr; do + if test -r $i/include/bzlib.h; then + BZIP_DIR=$i @@ -6794,7 +6850,7 @@ + done + + echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 -+echo "configure:27613: checking for BZ2_bzerror in -lbz2" >&5 ++echo "configure:27653: checking for BZ2_bzerror in -lbz2" >&5 +ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -6802,7 +6858,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lbz2 $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:27672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -7019,7 +7075,7 @@ case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -27501,18 +27845,18 @@ EOF +@@ -27501,18 +27885,18 @@ EOF done @@ -7044,7 +7100,7 @@ esac -@@ -27527,14 +27871,14 @@ EOF +@@ -27527,14 +27911,14 @@ EOF old_IFS=$IFS @@ -7061,7 +7117,7 @@ case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -27557,31 +27901,31 @@ EOF +@@ -27557,31 +27941,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -7102,7 +7158,7 @@ $link_cmd EOF -@@ -27594,31 +27938,31 @@ EOF +@@ -27594,31 +27978,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -7143,7 +7199,7 @@ $link_cmd EOF -@@ -27626,22 +27970,22 @@ EOF +@@ -27626,22 +28010,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:28100: checking whether to enable calendar conversion support" >&5 ++echo "configure:28140: checking whether to enable calendar conversion support" >&5 +# Check whether --enable-calendar or --disable-calendar was given. +if test "${enable_calendar+set}" = set; then + enableval="$enable_calendar" @@ -7260,7 +7316,7 @@ fi -@@ -27765,12 +28112,12 @@ fi +@@ -27765,12 +28152,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -7276,7 +7332,7 @@ ;; no) ext_output=no -@@ -27789,572 +28136,796 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -27789,572 +28176,796 @@ echo "$ac_t""$ext_output" 1>&6 @@ -7803,7 +7859,7 @@ +php_enable_ctype=yes +echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6 -+echo "configure:28444: checking whether to enable ctype functions" >&5 ++echo "configure:28484: checking whether to enable ctype functions" >&5 +# Check whether --enable-ctype or --disable-ctype was given. +if test "${enable_ctype+set}" = set; then + enableval="$enable_ctype" @@ -8370,7 +8426,7 @@ +php_with_curl=no + +echo $ac_n "checking for cURL support""... $ac_c" 1>&6 -+echo "configure:28788: checking for cURL support" >&5 ++echo "configure:28828: checking for cURL support" >&5 +# Check whether --with-curl or --without-curl was given. +if test "${with_curl+set}" = set; then + withval="$with_curl" @@ -8420,7 +8476,7 @@ +php_with_curlwrappers=no + +echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 -+echo "configure:28832: checking if we should use cURL for url streams" >&5 ++echo "configure:28872: checking if we should use cURL for url streams" >&5 +# Check whether --with-curlwrappers or --without-curlwrappers was given. +if test "${with_curlwrappers+set}" = set; then + withval="$with_curlwrappers" @@ -8447,7 +8503,7 @@ else - echo "$ac_t""no" 1>&6 + echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 -+echo "configure:28856: checking for cURL in default path" >&5 ++echo "configure:28896: checking for cURL in default path" >&5 + for i in /usr/local /usr; do + if test -r $i/include/curl/easy.h; then + CURL_DIR=$i @@ -8465,7 +8521,7 @@ + + CURL_CONFIG="curl-config" + echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 -+echo "configure:28874: checking for cURL 7.10.5 or greater" >&5 ++echo "configure:28914: checking for cURL 7.10.5 or greater" >&5 + + if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then + CURL_CONFIG=${CURL_DIR}/bin/curl-config @@ -8532,7 +8588,7 @@ else -@@ -28376,7 +28947,7 @@ fi +@@ -28376,7 +28987,7 @@ fi c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then @@ -8541,7 +8597,7 @@ else -@@ -28411,8 +28982,8 @@ fi +@@ -28411,8 +29022,8 @@ fi if test "$ext_shared" = "yes"; then @@ -8552,7 +8608,7 @@ else -@@ -28438,44 +29009,508 @@ fi +@@ -28438,44 +29049,508 @@ fi esac done @@ -8692,7 +8748,7 @@ + + + echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -+echo "configure:29112: checking for SSL support in libcurl" >&5 ++echo "configure:29152: checking for SSL support in libcurl" >&5 + CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` + if test "$CURL_SSL" = "SSL"; then + echo "$ac_t""yes" 1>&6 @@ -8705,7 +8761,7 @@ + CFLAGS="`$CURL_CONFIG --cflags`" + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:29125: checking how to run the C preprocessor" >&5 ++echo "configure:29165: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= @@ -8720,13 +8776,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : @@ -8737,13 +8793,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : @@ -8754,13 +8810,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : @@ -8785,14 +8841,14 @@ +echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 -+echo "configure:29205: checking for openssl support in libcurl" >&5 ++echo "configure:29245: checking for openssl support in libcurl" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no" 1>&6 + +else + cat > conftest.$ac_ext < @@ -8811,7 +8867,7 @@ +} + +EOF -+if { (eval echo configure:29231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:29271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + echo "$ac_t""yes" 1>&6 @@ -8819,17 +8875,17 @@ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:29239: checking for $ac_hdr" >&5 ++echo "configure:29279: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* @@ -8874,14 +8930,14 @@ + + + echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 -+echo "configure:29294: checking for gnutls support in libcurl" >&5 ++echo "configure:29334: checking for gnutls support in libcurl" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no" 1>&6 + +else + cat > conftest.$ac_ext < @@ -8900,23 +8956,23 @@ +} + +EOF -+if { (eval echo configure:29320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:29360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 -+echo "configure:29326: checking for gcrypt.h" >&5 ++echo "configure:29366: checking for gcrypt.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* @@ -9058,7 +9114,7 @@ + done + + echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 -+echo "configure:29478: checking for curl_easy_perform in -lcurl" >&5 ++echo "configure:29518: checking for curl_easy_perform in -lcurl" >&5 +ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -9066,7 +9122,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:29537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -9098,571 +9154,571 @@ cat >> confdefs.h <<\EOF #define HAVE_CURL 1 -@@ -28594,7 +29629,7 @@ fi +@@ -28594,7 +29669,7 @@ fi done echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6 -echo "configure:28598: checking for curl_version_info in -lcurl" >&5 -+echo "configure:29633: checking for curl_version_info in -lcurl" >&5 ++echo "configure:29673: checking for curl_version_info in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -28602,7 +29637,7 @@ else +@@ -28602,7 +29677,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:29652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:29692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -28747,7 +29782,7 @@ fi +@@ -28747,7 +29822,7 @@ fi done echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 -echo "configure:28751: checking for curl_easy_strerror in -lcurl" >&5 -+echo "configure:29786: checking for curl_easy_strerror in -lcurl" >&5 ++echo "configure:29826: checking for curl_easy_strerror in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -28755,7 +29790,7 @@ else +@@ -28755,7 +29830,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:29805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:29845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -28900,7 +29935,7 @@ fi +@@ -28900,7 +29975,7 @@ fi done echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 -echo "configure:28904: checking for curl_multi_strerror in -lcurl" >&5 -+echo "configure:29939: checking for curl_multi_strerror in -lcurl" >&5 ++echo "configure:29979: checking for curl_multi_strerror in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -28908,7 +29943,7 @@ else +@@ -28908,7 +29983,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:29958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:29998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -29605,7 +30640,7 @@ if test "$PHP_QDBM" != "no"; then +@@ -29605,7 +30680,7 @@ if test "$PHP_QDBM" != "no"; then done echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6 -echo "configure:29609: checking for dpopen in -l$LIB" >&5 -+echo "configure:30644: checking for dpopen in -l$LIB" >&5 ++echo "configure:30684: checking for dpopen in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -29613,7 +30648,7 @@ else +@@ -29613,7 +30688,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:30663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:30703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -29793,7 +30828,7 @@ fi +@@ -29793,7 +30868,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29797: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:30832: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:30872: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -29821,7 +30856,7 @@ if test "$PHP_GDBM" != "no"; then +@@ -29821,7 +30896,7 @@ if test "$PHP_GDBM" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29825: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:30860: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:30900: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-gdbm with --with-qdbm"; then { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; } fi -@@ -29940,7 +30975,7 @@ echo "configure:29825: checking for $THI +@@ -29940,7 +31015,7 @@ echo "configure:29825: checking for $THI done echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:29944: checking for gdbm_open in -lgdbm" >&5 -+echo "configure:30979: checking for gdbm_open in -lgdbm" >&5 ++echo "configure:31019: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -29948,7 +30983,7 @@ else +@@ -29948,7 +31023,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:30998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -30124,7 +31159,7 @@ fi +@@ -30124,7 +31199,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30128: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31163: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31203: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -30253,7 +31288,7 @@ if test "$PHP_NDBM" != "no"; then +@@ -30253,7 +31328,7 @@ if test "$PHP_NDBM" != "no"; then done echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 -echo "configure:30257: checking for dbm_open in -l$LIB" >&5 -+echo "configure:31292: checking for dbm_open in -l$LIB" >&5 ++echo "configure:31332: checking for dbm_open in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -30261,7 +31296,7 @@ else +@@ -30261,7 +31336,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -30441,7 +31476,7 @@ fi +@@ -30441,7 +31516,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30445: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31480: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31520: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -30529,7 +31564,7 @@ if test "$PHP_DB4" != "no"; then +@@ -30529,7 +31604,7 @@ if test "$PHP_DB4" != "no"; then LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&6 -echo "configure:30585: checking for DB4 major version" >&5 -+echo "configure:31620: checking for DB4 major version" >&5 ++echo "configure:31660: checking for DB4 major version" >&5 { echo "configure: error: Header contains different version" 1>&2; exit 1; } fi if test "4" = "4"; then echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:30590: checking for DB4 minor version and patch level" >&5 -+echo "configure:31625: checking for DB4 minor version and patch level" >&5 ++echo "configure:31665: checking for DB4 minor version and patch level" >&5 cat > conftest.$ac_ext <&6 -echo "configure:30618: checking if dba can be used as shared extension" >&5 -+echo "configure:31653: checking if dba can be used as shared extension" >&5 ++echo "configure:31693: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <&6 -echo "configure:30777: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31812: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31852: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -30801,7 +31836,7 @@ if test "$PHP_DB3" != "no"; then +@@ -30801,7 +31876,7 @@ if test "$PHP_DB3" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30805: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31840: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31880: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-db3 with --with-db4"; then { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; } fi -@@ -30852,7 +31887,7 @@ echo "configure:30805: checking for $THI +@@ -30852,7 +31927,7 @@ echo "configure:30805: checking for $THI LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&6 -echo "configure:30908: checking for DB3 major version" >&5 -+echo "configure:31943: checking for DB3 major version" >&5 ++echo "configure:31983: checking for DB3 major version" >&5 { echo "configure: error: Header contains different version" 1>&2; exit 1; } fi if test "3" = "4"; then echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:30913: checking for DB4 minor version and patch level" >&5 -+echo "configure:31948: checking for DB4 minor version and patch level" >&5 ++echo "configure:31988: checking for DB4 minor version and patch level" >&5 cat > conftest.$ac_ext <&6 -echo "configure:30941: checking if dba can be used as shared extension" >&5 -+echo "configure:31976: checking if dba can be used as shared extension" >&5 ++echo "configure:32016: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <&6 -echo "configure:31100: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32135: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32175: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -31124,7 +32159,7 @@ if test "$PHP_DB2" != "no"; then +@@ -31124,7 +32199,7 @@ if test "$PHP_DB2" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:31128: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32163: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32203: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; } fi -@@ -31175,7 +32210,7 @@ echo "configure:31128: checking for $THI +@@ -31175,7 +32250,7 @@ echo "configure:31128: checking for $THI LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:32225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&6 -echo "configure:31231: checking for DB2 major version" >&5 -+echo "configure:32266: checking for DB2 major version" >&5 ++echo "configure:32306: checking for DB2 major version" >&5 { echo "configure: error: Header contains different version" 1>&2; exit 1; } fi if test "2" = "4"; then echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:31236: checking for DB4 minor version and patch level" >&5 -+echo "configure:32271: checking for DB4 minor version and patch level" >&5 ++echo "configure:32311: checking for DB4 minor version and patch level" >&5 cat > conftest.$ac_ext <&6 -echo "configure:31264: checking if dba can be used as shared extension" >&5 -+echo "configure:32299: checking if dba can be used as shared extension" >&5 ++echo "configure:32339: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <&6 -echo "configure:31423: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32458: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32498: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -31439,7 +32474,7 @@ if test "$PHP_DB1" != "no"; then +@@ -31439,7 +32514,7 @@ if test "$PHP_DB1" != "no"; then unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6 -echo "configure:31443: checking for DB1 in library" >&5 -+echo "configure:32478: checking for DB1 in library" >&5 ++echo "configure:32518: checking for DB1 in library" >&5 if test "$HAVE_DB4" = "1"; then THIS_VERSION=4 THIS_LIBS=$DB4_LIBS -@@ -31487,7 +32522,7 @@ EOF +@@ -31487,7 +32562,7 @@ EOF fi echo "$ac_t""$THIS_LIBS" 1>&6 echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6 -echo "configure:31491: checking for DB1 in header" >&5 -+echo "configure:32526: checking for DB1 in header" >&5 ++echo "configure:32566: checking for DB1 in header" >&5 echo "$ac_t""$THIS_INCLUDE" 1>&6 if test -n "$THIS_INCLUDE"; then -@@ -31497,7 +32532,7 @@ echo "configure:31491: checking for DB1 +@@ -31497,7 +32572,7 @@ echo "configure:31491: checking for DB1 LIBS="-l$THIS_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:32547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <&6 -echo "configure:31662: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32697: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32737: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -31686,7 +32721,7 @@ if test "$PHP_DBM" != "no"; then +@@ -31686,7 +32761,7 @@ if test "$PHP_DBM" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:31690: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32725: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32765: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-dbm with --with-qdbm"; then { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; } fi -@@ -31810,7 +32845,7 @@ echo "configure:31690: checking for $THI +@@ -31810,7 +32885,7 @@ echo "configure:31690: checking for $THI done echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 -echo "configure:31814: checking for dbminit in -l$LIB" >&5 -+echo "configure:32849: checking for dbminit in -l$LIB" >&5 ++echo "configure:32889: checking for dbminit in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -31818,7 +32853,7 @@ else +@@ -31818,7 +32893,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:32868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -31849,7 +32884,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -31849,7 +32924,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l ext_shared=$save_ext_shared echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6 -echo "configure:31853: checking for DBM using GDBM" >&5 -+echo "configure:32888: checking for DBM using GDBM" >&5 ++echo "configure:32928: checking for DBM using GDBM" >&5 cat >> confdefs.h <&6 -echo "configure:32017: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33052: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33092: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32225,7 +33260,7 @@ elif test "$PHP_CDB" != "no"; then +@@ -32225,7 +33300,7 @@ elif test "$PHP_CDB" != "no"; then done echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6 -echo "configure:32229: checking for cdb_read in -l$LIB" >&5 -+echo "configure:33264: checking for cdb_read in -l$LIB" >&5 ++echo "configure:33304: checking for cdb_read in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -32233,7 +33268,7 @@ else +@@ -32233,7 +33308,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:33283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:33323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -32413,7 +33448,7 @@ fi +@@ -32413,7 +33488,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:32417: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33452: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33492: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32444,7 +33479,7 @@ fi +@@ -32444,7 +33519,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:32448: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33483: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33523: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32475,7 +33510,7 @@ fi +@@ -32475,7 +33550,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:32479: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33514: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33554: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32490,7 +33525,7 @@ echo "configure:32479: checking for $THI +@@ -32490,7 +33565,7 @@ echo "configure:32479: checking for $THI echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 -echo "configure:32494: checking whether to enable DBA interface" >&5 -+echo "configure:33529: checking whether to enable DBA interface" >&5 ++echo "configure:33569: checking whether to enable DBA interface" >&5 if test "$HAVE_DBA" = "1"; then if test "$ext_shared" = "yes"; then echo "$ac_t""yes, shared" 1>&6 -@@ -32817,18 +33852,18 @@ fi +@@ -32817,18 +33892,18 @@ fi @@ -9676,7 +9732,7 @@ - enableval="$enable_dom" - PHP_DOM=$enableval +echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6 -+echo "configure:33859: checking whether to enable direct I/O support" >&5 ++echo "configure:33899: checking whether to enable direct I/O support" >&5 +# Check whether --enable-dio or --disable-dio was given. +if test "${enable_dio+set}" = set; then + enableval="$enable_dio" @@ -9690,7 +9746,7 @@ fi -@@ -32836,12 +33871,12 @@ fi +@@ -32836,12 +33911,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -9706,7 +9762,7 @@ ;; no) ext_output=no -@@ -32860,28 +33895,368 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -32860,28 +33935,368 @@ echo "$ac_t""$ext_output" 1>&6 @@ -10027,7 +10083,7 @@ +php_enable_dom=yes + +echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 -+echo "configure:34199: checking whether to enable DOM support" >&5 ++echo "configure:34239: checking whether to enable DOM support" >&5 +# Check whether --enable-dom or --disable-dom was given. +if test "${enable_dom+set}" = set; then + enableval="$enable_dom" @@ -10072,7 +10128,7 @@ +php_with_libxml_dir=no + +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:34244: checking libxml2 install dir" >&5 ++echo "configure:34284: checking libxml2 install dir" >&5 +# Check whether --with-libxml-dir or --without-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" @@ -10092,1723 +10148,1723 @@ fi -@@ -32893,7 +34268,7 @@ if test "$PHP_DOM" != "no"; then +@@ -32893,7 +34308,7 @@ if test "$PHP_DOM" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:32897: checking for xml2-config path" >&5 -+echo "configure:34272: checking for xml2-config path" >&5 ++echo "configure:34312: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -33051,7 +34426,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -33051,7 +34466,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:33055: checking whether libxml build works" >&5 -+echo "configure:34430: checking whether libxml build works" >&5 ++echo "configure:34470: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -33067,7 +34442,7 @@ else +@@ -33067,7 +34482,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:34457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:34497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -33501,7 +34876,7 @@ fi +@@ -33501,7 +34916,7 @@ fi php_with_enchant=no echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6 -echo "configure:33505: checking for ENCHANT support" >&5 -+echo "configure:34880: checking for ENCHANT support" >&5 ++echo "configure:34920: checking for ENCHANT support" >&5 # Check whether --with-enchant or --without-enchant was given. if test "${with_enchant+set}" = set; then withval="$with_enchant" -@@ -34086,7 +35461,7 @@ EOF +@@ -34086,7 +35501,7 @@ EOF done echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6 -echo "configure:34090: checking for enchant_broker_set_param in -lenchant" >&5 -+echo "configure:35465: checking for enchant_broker_set_param in -lenchant" >&5 ++echo "configure:35505: checking for enchant_broker_set_param in -lenchant" >&5 ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -34094,7 +35469,7 @@ else +@@ -34094,7 +35509,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lenchant $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:35484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:35524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -34152,7 +35527,7 @@ fi +@@ -34152,7 +35567,7 @@ fi php_enable_exif=no echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6 -echo "configure:34156: checking whether to enable EXIF (metadata from images) support" >&5 -+echo "configure:35531: checking whether to enable EXIF (metadata from images) support" >&5 ++echo "configure:35571: checking whether to enable EXIF (metadata from images) support" >&5 # Check whether --enable-exif or --disable-exif was given. if test "${enable_exif+set}" = set; then enableval="$enable_exif" -@@ -34496,7 +35871,7 @@ fi +@@ -34496,7 +35911,7 @@ fi php_enable_fileinfo=yes echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6 -echo "configure:34500: checking for fileinfo support" >&5 -+echo "configure:35875: checking for fileinfo support" >&5 ++echo "configure:35915: checking for fileinfo support" >&5 # Check whether --enable-fileinfo or --disable-fileinfo was given. if test "${enable_fileinfo+set}" = set; then enableval="$enable_fileinfo" -@@ -34846,12 +36221,12 @@ EOF +@@ -34846,12 +36261,12 @@ EOF for ac_func in utimes strndup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:34850: checking for $ac_func" >&5 -+echo "configure:36225: checking for $ac_func" >&5 ++echo "configure:36265: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:36253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:36293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -34912,7 +36287,7 @@ fi +@@ -34912,7 +36327,7 @@ fi php_enable_filter=yes echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6 -echo "configure:34916: checking whether to enable input filter support" >&5 -+echo "configure:36291: checking whether to enable input filter support" >&5 ++echo "configure:36331: checking whether to enable input filter support" >&5 # Check whether --enable-filter or --disable-filter was given. if test "${enable_filter+set}" = set; then enableval="$enable_filter" -@@ -34956,7 +36331,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -34956,7 +36371,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_pcre_dir=no echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 -echo "configure:34960: checking pcre install prefix" >&5 -+echo "configure:36335: checking pcre install prefix" >&5 ++echo "configure:36375: checking pcre install prefix" >&5 # Check whether --with-pcre-dir or --without-pcre-dir was given. if test "${with_pcre_dir+set}" = set; then withval="$with_pcre_dir" -@@ -34983,7 +36358,7 @@ if test "$PHP_FILTER" != "no"; then +@@ -34983,7 +36398,7 @@ if test "$PHP_FILTER" != "no"; then old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$INCLUDES cat > conftest.$ac_ext < -@@ -35002,7 +36377,7 @@ else +@@ -35002,7 +36417,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < -@@ -35372,7 +36747,7 @@ fi +@@ -35372,7 +36787,7 @@ fi php_enable_ftp=no echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6 -echo "configure:35376: checking whether to enable FTP support" >&5 -+echo "configure:36751: checking whether to enable FTP support" >&5 ++echo "configure:36791: checking whether to enable FTP support" >&5 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then enableval="$enable_ftp" -@@ -35416,7 +36791,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -35416,7 +36831,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_openssl_dir=no echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6 -echo "configure:35420: checking OpenSSL dir for FTP" >&5 -+echo "configure:36795: checking OpenSSL dir for FTP" >&5 ++echo "configure:36835: checking OpenSSL dir for FTP" >&5 # Check whether --with-openssl-dir or --without-openssl-dir was given. if test "${with_openssl_dir+set}" = set; then withval="$with_openssl_dir" -@@ -35754,7 +37129,7 @@ EOF +@@ -35754,7 +37169,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:35758: checking for $ac_word" >&5 -+echo "configure:37133: checking for $ac_word" >&5 ++echo "configure:37173: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -35959,9 +37334,9 @@ fi +@@ -35959,9 +37374,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:35963: checking for OpenSSL version" >&5 -+echo "configure:37338: checking for OpenSSL version" >&5 ++echo "configure:37378: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < -@@ -36116,7 +37491,7 @@ rm -f conftest* +@@ -36116,7 +37531,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:36120: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:37495: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:37535: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -36124,7 +37499,7 @@ else +@@ -36124,7 +37539,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:37514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:37554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -36292,7 +37667,7 @@ fi +@@ -36292,7 +37707,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:36296: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:37671: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:37711: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -36300,7 +37675,7 @@ else +@@ -36300,7 +37715,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:37690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:37730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -36453,7 +37828,7 @@ fi +@@ -36453,7 +37868,7 @@ fi php_with_gd=no echo $ac_n "checking for GD support""... $ac_c" 1>&6 -echo "configure:36457: checking for GD support" >&5 -+echo "configure:37832: checking for GD support" >&5 ++echo "configure:37872: checking for GD support" >&5 # Check whether --with-gd or --without-gd was given. if test "${with_gd+set}" = set; then withval="$with_gd" -@@ -36498,7 +37873,7 @@ if test -z "$PHP_JPEG_DIR"; then +@@ -36498,7 +37913,7 @@ if test -z "$PHP_JPEG_DIR"; then php_with_jpeg_dir=no echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6 -echo "configure:36502: checking for the location of libjpeg" >&5 -+echo "configure:37877: checking for the location of libjpeg" >&5 ++echo "configure:37917: checking for the location of libjpeg" >&5 # Check whether --with-jpeg-dir or --without-jpeg-dir was given. if test "${with_jpeg_dir+set}" = set; then withval="$with_jpeg_dir" -@@ -36523,7 +37898,7 @@ if test -z "$PHP_PNG_DIR"; then +@@ -36523,7 +37938,7 @@ if test -z "$PHP_PNG_DIR"; then php_with_png_dir=no echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6 -echo "configure:36527: checking for the location of libpng" >&5 -+echo "configure:37902: checking for the location of libpng" >&5 ++echo "configure:37942: checking for the location of libpng" >&5 # Check whether --with-png-dir or --without-png-dir was given. if test "${with_png_dir+set}" = set; then withval="$with_png_dir" -@@ -36548,7 +37923,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -36548,7 +37963,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:36552: checking for the location of libz" >&5 -+echo "configure:37927: checking for the location of libz" >&5 ++echo "configure:37967: checking for the location of libz" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" -@@ -36572,7 +37947,7 @@ fi +@@ -36572,7 +37987,7 @@ fi php_with_xpm_dir=no echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6 -echo "configure:36576: checking for the location of libXpm" >&5 -+echo "configure:37951: checking for the location of libXpm" >&5 ++echo "configure:37991: checking for the location of libXpm" >&5 # Check whether --with-xpm-dir or --without-xpm-dir was given. if test "${with_xpm_dir+set}" = set; then withval="$with_xpm_dir" -@@ -36595,7 +37970,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36595,7 +38010,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_freetype_dir=no echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6 -echo "configure:36599: checking for FreeType 2" >&5 -+echo "configure:37974: checking for FreeType 2" >&5 ++echo "configure:38014: checking for FreeType 2" >&5 # Check whether --with-freetype-dir or --without-freetype-dir was given. if test "${with_freetype_dir+set}" = set; then withval="$with_freetype_dir" -@@ -36618,7 +37993,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36618,7 +38033,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_t1lib=no echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 -echo "configure:36622: checking for T1lib support" >&5 -+echo "configure:37997: checking for T1lib support" >&5 ++echo "configure:38037: checking for T1lib support" >&5 # Check whether --with-t1lib or --without-t1lib was given. if test "${with_t1lib+set}" = set; then withval="$with_t1lib" -@@ -36641,7 +38016,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36641,7 +38056,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_gd_native_ttf=no echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6 -echo "configure:36645: checking whether to enable truetype string function in GD" >&5 -+echo "configure:38020: checking whether to enable truetype string function in GD" >&5 ++echo "configure:38060: checking whether to enable truetype string function in GD" >&5 # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given. if test "${enable_gd_native_ttf+set}" = set; then enableval="$enable_gd_native_ttf" -@@ -36664,7 +38039,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36664,7 +38079,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_gd_jis_conv=no echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6 -echo "configure:36668: checking whether to enable JIS-mapped Japanese font support in GD" >&5 -+echo "configure:38043: checking whether to enable JIS-mapped Japanese font support in GD" >&5 ++echo "configure:38083: checking whether to enable JIS-mapped Japanese font support in GD" >&5 # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given. if test "${enable_gd_jis_conv+set}" = set; then enableval="$enable_gd_jis_conv" -@@ -36716,12 +38091,12 @@ if test "$PHP_GD" = "yes"; then +@@ -36716,12 +38131,12 @@ if test "$PHP_GD" = "yes"; then for ac_func in fabsf floorf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:36720: checking for $ac_func" >&5 -+echo "configure:38095: checking for $ac_func" >&5 ++echo "configure:38135: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:38123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -36916,7 +38291,7 @@ EOF +@@ -36916,7 +38331,7 @@ EOF done echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:36920: checking for jpeg_read_header in -ljpeg" >&5 -+echo "configure:38295: checking for jpeg_read_header in -ljpeg" >&5 ++echo "configure:38335: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -36924,7 +38299,7 @@ else +@@ -36924,7 +38339,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:38314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -37213,7 +38588,7 @@ fi +@@ -37213,7 +38628,7 @@ fi done echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 -echo "configure:37217: checking for png_write_image in -lpng" >&5 -+echo "configure:38592: checking for png_write_image in -lpng" >&5 ++echo "configure:38632: checking for png_write_image in -lpng" >&5 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -37221,7 +38596,7 @@ else +@@ -37221,7 +38636,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:38611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -37612,7 +38987,7 @@ fi +@@ -37612,7 +39027,7 @@ fi done echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:37616: checking for XpmFreeXpmImage in -lXpm" >&5 -+echo "configure:38991: checking for XpmFreeXpmImage in -lXpm" >&5 ++echo "configure:39031: checking for XpmFreeXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -37620,7 +38995,7 @@ else +@@ -37620,7 +39035,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:39010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:39050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -38006,7 +39381,7 @@ fi +@@ -38006,7 +39421,7 @@ fi done echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 -echo "configure:38010: checking for FT_New_Face in -lfreetype" >&5 -+echo "configure:39385: checking for FT_New_Face in -lfreetype" >&5 ++echo "configure:39425: checking for FT_New_Face in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -38014,7 +39389,7 @@ else +@@ -38014,7 +39429,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:39404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:39444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -38342,7 +39717,7 @@ fi +@@ -38342,7 +39757,7 @@ fi done echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 -echo "configure:38346: checking for T1_StrError in -lt1" >&5 -+echo "configure:39721: checking for T1_StrError in -lt1" >&5 ++echo "configure:39761: checking for T1_StrError in -lt1" >&5 ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -38350,7 +39725,7 @@ else +@@ -38350,7 +39765,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:39740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:39780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -38804,7 +40179,7 @@ EOF +@@ -38804,7 +40219,7 @@ EOF done echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:38808: checking for jpeg_read_header in -ljpeg" >&5 -+echo "configure:40183: checking for jpeg_read_header in -ljpeg" >&5 ++echo "configure:40223: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -38812,7 +40187,7 @@ else +@@ -38812,7 +40227,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:40202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:40242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -39101,7 +40476,7 @@ fi +@@ -39101,7 +40516,7 @@ fi done echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 -echo "configure:39105: checking for png_write_image in -lpng" >&5 -+echo "configure:40480: checking for png_write_image in -lpng" >&5 ++echo "configure:40520: checking for png_write_image in -lpng" >&5 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -39109,7 +40484,7 @@ else +@@ -39109,7 +40524,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:40499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:40539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -39500,7 +40875,7 @@ fi +@@ -39500,7 +40915,7 @@ fi done echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:39504: checking for XpmFreeXpmImage in -lXpm" >&5 -+echo "configure:40879: checking for XpmFreeXpmImage in -lXpm" >&5 ++echo "configure:40919: checking for XpmFreeXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -39508,7 +40883,7 @@ else +@@ -39508,7 +40923,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:40898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:40938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -39894,7 +41269,7 @@ fi +@@ -39894,7 +41309,7 @@ fi done echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 -echo "configure:39898: checking for FT_New_Face in -lfreetype" >&5 -+echo "configure:41273: checking for FT_New_Face in -lfreetype" >&5 ++echo "configure:41313: checking for FT_New_Face in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -39902,7 +41277,7 @@ else +@@ -39902,7 +41317,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:41292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:41332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40230,7 +41605,7 @@ fi +@@ -40230,7 +41645,7 @@ fi done echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 -echo "configure:40234: checking for T1_StrError in -lt1" >&5 -+echo "configure:41609: checking for T1_StrError in -lt1" >&5 ++echo "configure:41649: checking for T1_StrError in -lt1" >&5 ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -40238,7 +41613,7 @@ else +@@ -40238,7 +41653,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:41628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:41668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40624,7 +41999,7 @@ EOF +@@ -40624,7 +42039,7 @@ EOF done echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 -echo "configure:40628: checking for gdImageString16 in -lgd" >&5 -+echo "configure:42003: checking for gdImageString16 in -lgd" >&5 ++echo "configure:42043: checking for gdImageString16 in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -40632,7 +42007,7 @@ else +@@ -40632,7 +42047,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40772,7 +42147,7 @@ fi +@@ -40772,7 +42187,7 @@ fi done echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 -echo "configure:40776: checking for gdImagePaletteCopy in -lgd" >&5 -+echo "configure:42151: checking for gdImagePaletteCopy in -lgd" >&5 ++echo "configure:42191: checking for gdImagePaletteCopy in -lgd" >&5 ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -40780,7 +42155,7 @@ else +@@ -40780,7 +42195,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40920,7 +42295,7 @@ fi +@@ -40920,7 +42335,7 @@ fi done echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 -echo "configure:40924: checking for gdImageCreateFromPng in -lgd" >&5 -+echo "configure:42299: checking for gdImageCreateFromPng in -lgd" >&5 ++echo "configure:42339: checking for gdImageCreateFromPng in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -40928,7 +42303,7 @@ else +@@ -40928,7 +42343,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41068,7 +42443,7 @@ fi +@@ -41068,7 +42483,7 @@ fi done echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 -echo "configure:41072: checking for gdImageCreateFromGif in -lgd" >&5 -+echo "configure:42447: checking for gdImageCreateFromGif in -lgd" >&5 ++echo "configure:42487: checking for gdImageCreateFromGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41076,7 +42451,7 @@ else +@@ -41076,7 +42491,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41216,7 +42591,7 @@ fi +@@ -41216,7 +42631,7 @@ fi done echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 -echo "configure:41220: checking for gdImageGif in -lgd" >&5 -+echo "configure:42595: checking for gdImageGif in -lgd" >&5 ++echo "configure:42635: checking for gdImageGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41224,7 +42599,7 @@ else +@@ -41224,7 +42639,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41364,7 +42739,7 @@ fi +@@ -41364,7 +42779,7 @@ fi done echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 -echo "configure:41368: checking for gdImageWBMP in -lgd" >&5 -+echo "configure:42743: checking for gdImageWBMP in -lgd" >&5 ++echo "configure:42783: checking for gdImageWBMP in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41372,7 +42747,7 @@ else +@@ -41372,7 +42787,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41512,7 +42887,7 @@ fi +@@ -41512,7 +42927,7 @@ fi done echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 -echo "configure:41516: checking for gdImageCreateFromJpeg in -lgd" >&5 -+echo "configure:42891: checking for gdImageCreateFromJpeg in -lgd" >&5 ++echo "configure:42931: checking for gdImageCreateFromJpeg in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41520,7 +42895,7 @@ else +@@ -41520,7 +42935,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41660,7 +43035,7 @@ fi +@@ -41660,7 +43075,7 @@ fi done echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 -echo "configure:41664: checking for gdImageCreateFromXpm in -lgd" >&5 -+echo "configure:43039: checking for gdImageCreateFromXpm in -lgd" >&5 ++echo "configure:43079: checking for gdImageCreateFromXpm in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41668,7 +43043,7 @@ else +@@ -41668,7 +43083,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41808,7 +43183,7 @@ fi +@@ -41808,7 +43223,7 @@ fi done echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6 -echo "configure:41812: checking for gdImageCreateFromGd2 in -lgd" >&5 -+echo "configure:43187: checking for gdImageCreateFromGd2 in -lgd" >&5 ++echo "configure:43227: checking for gdImageCreateFromGd2 in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41816,7 +43191,7 @@ else +@@ -41816,7 +43231,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41956,7 +43331,7 @@ fi +@@ -41956,7 +43371,7 @@ fi done echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6 -echo "configure:41960: checking for gdImageCreateTrueColor in -lgd" >&5 -+echo "configure:43335: checking for gdImageCreateTrueColor in -lgd" >&5 ++echo "configure:43375: checking for gdImageCreateTrueColor in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41964,7 +43339,7 @@ else +@@ -41964,7 +43379,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42104,7 +43479,7 @@ fi +@@ -42104,7 +43519,7 @@ fi done echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6 -echo "configure:42108: checking for gdImageSetTile in -lgd" >&5 -+echo "configure:43483: checking for gdImageSetTile in -lgd" >&5 ++echo "configure:43523: checking for gdImageSetTile in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42112,7 +43487,7 @@ else +@@ -42112,7 +43527,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42252,7 +43627,7 @@ fi +@@ -42252,7 +43667,7 @@ fi done echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6 -echo "configure:42256: checking for gdImageEllipse in -lgd" >&5 -+echo "configure:43631: checking for gdImageEllipse in -lgd" >&5 ++echo "configure:43671: checking for gdImageEllipse in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42260,7 +43635,7 @@ else +@@ -42260,7 +43675,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42400,7 +43775,7 @@ fi +@@ -42400,7 +43815,7 @@ fi done echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6 -echo "configure:42404: checking for gdImageSetBrush in -lgd" >&5 -+echo "configure:43779: checking for gdImageSetBrush in -lgd" >&5 ++echo "configure:43819: checking for gdImageSetBrush in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42408,7 +43783,7 @@ else +@@ -42408,7 +43823,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42548,7 +43923,7 @@ fi +@@ -42548,7 +43963,7 @@ fi done echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6 -echo "configure:42552: checking for gdImageStringTTF in -lgd" >&5 -+echo "configure:43927: checking for gdImageStringTTF in -lgd" >&5 ++echo "configure:43967: checking for gdImageStringTTF in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42556,7 +43931,7 @@ else +@@ -42556,7 +43971,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42696,7 +44071,7 @@ fi +@@ -42696,7 +44111,7 @@ fi done echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6 -echo "configure:42700: checking for gdImageStringFT in -lgd" >&5 -+echo "configure:44075: checking for gdImageStringFT in -lgd" >&5 ++echo "configure:44115: checking for gdImageStringFT in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42704,7 +44079,7 @@ else +@@ -42704,7 +44119,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42844,7 +44219,7 @@ fi +@@ -42844,7 +44259,7 @@ fi done echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6 -echo "configure:42848: checking for gdImageStringFTEx in -lgd" >&5 -+echo "configure:44223: checking for gdImageStringFTEx in -lgd" >&5 ++echo "configure:44263: checking for gdImageStringFTEx in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42852,7 +44227,7 @@ else +@@ -42852,7 +44267,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42992,7 +44367,7 @@ fi +@@ -42992,7 +44407,7 @@ fi done echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 -echo "configure:42996: checking for gdImageColorClosestHWB in -lgd" >&5 -+echo "configure:44371: checking for gdImageColorClosestHWB in -lgd" >&5 ++echo "configure:44411: checking for gdImageColorClosestHWB in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43000,7 +44375,7 @@ else +@@ -43000,7 +44415,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43140,7 +44515,7 @@ fi +@@ -43140,7 +44555,7 @@ fi done echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 -echo "configure:43144: checking for gdImageColorResolve in -lgd" >&5 -+echo "configure:44519: checking for gdImageColorResolve in -lgd" >&5 ++echo "configure:44559: checking for gdImageColorResolve in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43148,7 +44523,7 @@ else +@@ -43148,7 +44563,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43288,7 +44663,7 @@ fi +@@ -43288,7 +44703,7 @@ fi done echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6 -echo "configure:43292: checking for gdImageGifCtx in -lgd" >&5 -+echo "configure:44667: checking for gdImageGifCtx in -lgd" >&5 ++echo "configure:44707: checking for gdImageGifCtx in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43296,7 +44671,7 @@ else +@@ -43296,7 +44711,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43436,7 +44811,7 @@ fi +@@ -43436,7 +44851,7 @@ fi done echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 -echo "configure:43440: checking for gdCacheCreate in -lgd" >&5 -+echo "configure:44815: checking for gdCacheCreate in -lgd" >&5 ++echo "configure:44855: checking for gdCacheCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43444,7 +44819,7 @@ else +@@ -43444,7 +44859,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43584,7 +44959,7 @@ fi +@@ -43584,7 +44999,7 @@ fi done echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6 -echo "configure:43588: checking for gdFontCacheShutdown in -lgd" >&5 -+echo "configure:44963: checking for gdFontCacheShutdown in -lgd" >&5 ++echo "configure:45003: checking for gdFontCacheShutdown in -lgd" >&5 ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43592,7 +44967,7 @@ else +@@ -43592,7 +45007,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43732,7 +45107,7 @@ fi +@@ -43732,7 +45147,7 @@ fi done echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6 -echo "configure:43736: checking for gdFreeFontCache in -lgd" >&5 -+echo "configure:45111: checking for gdFreeFontCache in -lgd" >&5 ++echo "configure:45151: checking for gdFreeFontCache in -lgd" >&5 ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43740,7 +45115,7 @@ else +@@ -43740,7 +45155,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:45130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43880,7 +45255,7 @@ fi +@@ -43880,7 +45295,7 @@ fi done echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6 -echo "configure:43884: checking for gdFontCacheMutexSetup in -lgd" >&5 -+echo "configure:45259: checking for gdFontCacheMutexSetup in -lgd" >&5 ++echo "configure:45299: checking for gdFontCacheMutexSetup in -lgd" >&5 ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43888,7 +45263,7 @@ else +@@ -43888,7 +45303,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:45278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44028,7 +45403,7 @@ fi +@@ -44028,7 +45443,7 @@ fi done echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6 -echo "configure:44032: checking for gdNewDynamicCtxEx in -lgd" >&5 -+echo "configure:45407: checking for gdNewDynamicCtxEx in -lgd" >&5 ++echo "configure:45447: checking for gdNewDynamicCtxEx in -lgd" >&5 ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44036,7 +45411,7 @@ else +@@ -44036,7 +45451,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:45426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44102,7 +45477,7 @@ fi +@@ -44102,7 +45517,7 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$GD_INCLUDE cat > conftest.$ac_ext < -@@ -44116,7 +45491,7 @@ ctx->gd_free = 1; +@@ -44116,7 +45531,7 @@ ctx->gd_free = 1; ; return 0; } EOF -if { (eval echo configure:44120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:45495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:45535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -44447,7 +45822,7 @@ EOF +@@ -44447,7 +45862,7 @@ EOF else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:45837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:45877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -44609,7 +45984,7 @@ fi +@@ -44609,7 +46024,7 @@ fi done echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 -echo "configure:44613: checking for gdImageCreate in -lgd" >&5 -+echo "configure:45988: checking for gdImageCreate in -lgd" >&5 ++echo "configure:46028: checking for gdImageCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44617,7 +45992,7 @@ else +@@ -44617,7 +46032,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44693,7 +46068,7 @@ fi +@@ -44693,7 +46108,7 @@ fi php_with_gettext=no echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6 -echo "configure:44697: checking for GNU gettext support" >&5 -+echo "configure:46072: checking for GNU gettext support" >&5 ++echo "configure:46112: checking for GNU gettext support" >&5 # Check whether --with-gettext or --without-gettext was given. if test "${with_gettext+set}" = set; then withval="$with_gettext" -@@ -44748,7 +46123,7 @@ if test "$PHP_GETTEXT" != "no"; then +@@ -44748,7 +46163,7 @@ if test "$PHP_GETTEXT" != "no"; then O_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:44752: checking for bindtextdomain in -lintl" >&5 -+echo "configure:46127: checking for bindtextdomain in -lintl" >&5 ++echo "configure:46167: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44756,7 +46131,7 @@ else +@@ -44756,7 +46171,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44789,7 +46164,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -44789,7 +46204,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 -echo "configure:44793: checking for bindtextdomain in -lc" >&5 -+echo "configure:46168: checking for bindtextdomain in -lc" >&5 ++echo "configure:46208: checking for bindtextdomain in -lc" >&5 ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44797,7 +46172,7 @@ else +@@ -44797,7 +46212,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45272,7 +46647,7 @@ EOF +@@ -45272,7 +46687,7 @@ EOF echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45276: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46651: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46691: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45280,7 +46655,7 @@ else +@@ -45280,7 +46695,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45315,7 +46690,7 @@ else +@@ -45315,7 +46730,7 @@ else fi echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45319: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46694: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46734: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45323,7 +46698,7 @@ else +@@ -45323,7 +46738,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45358,7 +46733,7 @@ else +@@ -45358,7 +46773,7 @@ else fi echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45362: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46737: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46777: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45366,7 +46741,7 @@ else +@@ -45366,7 +46781,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45401,7 +46776,7 @@ else +@@ -45401,7 +46816,7 @@ else fi echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45405: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46780: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46820: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45409,7 +46784,7 @@ else +@@ -45409,7 +46824,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45451,7 +46826,7 @@ fi +@@ -45451,7 +46866,7 @@ fi php_with_gmp=no echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6 -echo "configure:45455: checking for GNU MP support" >&5 -+echo "configure:46830: checking for GNU MP support" >&5 ++echo "configure:46870: checking for GNU MP support" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" -@@ -45599,7 +46974,7 @@ if test "$PHP_GMP" != "no"; then +@@ -45599,7 +47014,7 @@ if test "$PHP_GMP" != "no"; then done echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 -echo "configure:45603: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 -+echo "configure:46978: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 ++echo "configure:47018: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45607,7 +46982,7 @@ else +@@ -45607,7 +47022,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45743,7 +47118,7 @@ else +@@ -45743,7 +47158,7 @@ else done echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 -echo "configure:45747: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 -+echo "configure:47122: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 ++echo "configure:47162: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45751,7 +47126,7 @@ else +@@ -45751,7 +47166,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -46234,7 +47609,7 @@ fi +@@ -46234,7 +47649,7 @@ fi php_with_mhash=no echo $ac_n "checking for mhash support""... $ac_c" 1>&6 -echo "configure:46238: checking for mhash support" >&5 -+echo "configure:47613: checking for mhash support" >&5 ++echo "configure:47653: checking for mhash support" >&5 # Check whether --with-mhash or --without-mhash was given. if test "${with_mhash+set}" = set; then withval="$with_mhash" -@@ -46278,7 +47653,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -46278,7 +47693,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_hash=yes echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6 -echo "configure:46282: checking whether to enable hash support" >&5 -+echo "configure:47657: checking whether to enable hash support" >&5 ++echo "configure:47697: checking whether to enable hash support" >&5 # Check whether --enable-hash or --disable-hash was given. if test "${enable_hash+set}" = set; then enableval="$enable_hash" -@@ -46336,7 +47711,7 @@ EOF +@@ -46336,7 +47751,7 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:46340: checking whether byte ordering is bigendian" >&5 -+echo "configure:47715: checking whether byte ordering is bigendian" >&5 ++echo "configure:47755: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -46346,7 +47721,7 @@ else +@@ -46346,7 +47761,7 @@ else ac_cv_c_bigendian_php=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian_php=yes else -@@ -46387,7 +47762,7 @@ EOF +@@ -46387,7 +47802,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:46391: checking size of short" >&5 -+echo "configure:47766: checking size of short" >&5 ++echo "configure:47806: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -46395,7 +47770,7 @@ else +@@ -46395,7 +47810,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < #include -@@ -46407,7 +47782,7 @@ main() +@@ -46407,7 +47822,7 @@ main() exit(0); } EOF -if { (eval echo configure:46411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else -@@ -46427,7 +47802,7 @@ EOF +@@ -46427,7 +47842,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:46431: checking size of int" >&5 -+echo "configure:47806: checking size of int" >&5 ++echo "configure:47846: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -46435,7 +47810,7 @@ else +@@ -46435,7 +47850,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < #include -@@ -46447,7 +47822,7 @@ main() +@@ -46447,7 +47862,7 @@ main() exit(0); } EOF -if { (eval echo configure:46451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else -@@ -46467,7 +47842,7 @@ EOF +@@ -46467,7 +47882,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:46471: checking size of long" >&5 -+echo "configure:47846: checking size of long" >&5 ++echo "configure:47886: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -46475,7 +47850,7 @@ else +@@ -46475,7 +47890,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < #include -@@ -46487,7 +47862,7 @@ main() +@@ -46487,7 +47902,7 @@ main() exit(0); } EOF -if { (eval echo configure:46491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else -@@ -46507,7 +47882,7 @@ EOF +@@ -46507,7 +47922,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:46511: checking size of long long" >&5 -+echo "configure:47886: checking size of long long" >&5 ++echo "configure:47926: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -46515,7 +47890,7 @@ else +@@ -46515,7 +47930,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < #include -@@ -46527,7 +47902,7 @@ main() +@@ -46527,7 +47942,7 @@ main() exit(0); } EOF -if { (eval echo configure:46531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else -@@ -46873,10 +48248,13 @@ fi +@@ -46873,10 +48288,13 @@ fi @@ -11819,121 +11875,121 @@ echo $ac_n "checking for iconv support""... $ac_c" 1>&6 -echo "configure:46880: checking for iconv support" >&5 -+echo "configure:48258: checking for iconv support" >&5 ++echo "configure:48298: checking for iconv support" >&5 # Check whether --with-iconv or --without-iconv was given. if test "${with_iconv+set}" = set; then withval="$with_iconv" -@@ -46937,12 +48315,12 @@ if test "$PHP_ICONV" != "no"; then +@@ -46937,12 +48355,12 @@ if test "$PHP_ICONV" != "no"; then if test "$PHP_ICONV" = "yes"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:46941: checking for iconv" >&5 -+echo "configure:48319: checking for iconv" >&5 ++echo "configure:48359: checking for iconv" >&5 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_iconv=yes" else -@@ -46986,12 +48364,12 @@ else +@@ -46986,12 +48404,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -echo "configure:46990: checking for libiconv" >&5 -+echo "configure:48368: checking for libiconv" >&5 ++echo "configure:48408: checking for libiconv" >&5 if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_libiconv=yes" else -@@ -47170,7 +48548,7 @@ EOF +@@ -47170,7 +48588,7 @@ EOF done echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:47174: checking for libiconv in -l$iconv_lib_name" >&5 -+echo "configure:48552: checking for libiconv in -l$iconv_lib_name" >&5 ++echo "configure:48592: checking for libiconv in -l$iconv_lib_name" >&5 ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -47178,7 +48556,7 @@ else +@@ -47178,7 +48596,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -47330,7 +48708,7 @@ else +@@ -47330,7 +48748,7 @@ else done echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:47334: checking for iconv in -l$iconv_lib_name" >&5 -+echo "configure:48712: checking for iconv in -l$iconv_lib_name" >&5 ++echo "configure:48752: checking for iconv in -l$iconv_lib_name" >&5 ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -47338,7 +48716,7 @@ else +@@ -47338,7 +48756,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -47560,16 +48938,16 @@ else +@@ -47560,16 +48978,16 @@ else fi echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6 -echo "configure:47564: checking if iconv is glibc's" >&5 -+echo "configure:48942: checking if iconv is glibc's" >&5 ++echo "configure:48982: checking if iconv is glibc's" >&5 cat > conftest.$ac_ext < int main() { @@ -11941,46 +11997,46 @@ ; return 0; } EOF -if { (eval echo configure:47573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -47587,7 +48965,7 @@ rm -f conftest* +@@ -47587,7 +49005,7 @@ rm -f conftest* if test -z "$iconv_impl_name"; then echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6 -echo "configure:47591: checking if using GNU libiconv" >&5 -+echo "configure:48969: checking if using GNU libiconv" >&5 ++echo "configure:49009: checking if using GNU libiconv" >&5 php_iconv_old_ld="$LDFLAGS" LDFLAGS="-liconv $LDFLAGS" if test "$cross_compiling" = yes; then -@@ -47597,7 +48975,7 @@ echo "configure:47591: checking if using +@@ -47597,7 +49015,7 @@ echo "configure:47591: checking if using else cat > conftest.$ac_ext < -@@ -47607,7 +48985,7 @@ int main() { +@@ -47607,7 +49025,7 @@ int main() { } EOF -if { (eval echo configure:47611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:48989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:49029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 -@@ -47629,16 +49007,16 @@ fi +@@ -47629,16 +49047,16 @@ fi if test -z "$iconv_impl_name"; then echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6 -echo "configure:47633: checking if iconv is Konstantin Chuguev's" >&5 -+echo "configure:49011: checking if iconv is Konstantin Chuguev's" >&5 ++echo "configure:49051: checking if iconv is Konstantin Chuguev's" >&5 cat > conftest.$ac_ext < int main() { @@ -11988,21 +12044,21 @@ ; return 0; } EOF -if { (eval echo configure:47642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:49060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -47657,18 +49035,18 @@ rm -f conftest* +@@ -47657,18 +49075,18 @@ rm -f conftest* if test -z "$iconv_impl_name"; then echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6 -echo "configure:47661: checking if using IBM iconv" >&5 -+echo "configure:49039: checking if using IBM iconv" >&5 ++echo "configure:49079: checking if using IBM iconv" >&5 php_iconv_old_ld="$LDFLAGS" LDFLAGS="-liconv $LDFLAGS" cat > conftest.$ac_ext < int main() { @@ -12010,712 +12066,712 @@ ; return 0; } EOF -if { (eval echo configure:47672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:49090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -47854,7 +49232,7 @@ EOF +@@ -47854,7 +49272,7 @@ EOF esac echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6 -echo "configure:47858: checking if iconv supports errno" >&5 -+echo "configure:49236: checking if iconv supports errno" >&5 ++echo "configure:49276: checking if iconv supports errno" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 -@@ -47868,7 +49246,7 @@ EOF +@@ -47868,7 +49286,7 @@ EOF else cat > conftest.$ac_ext < -@@ -47889,7 +49267,7 @@ int main() { +@@ -47889,7 +49307,7 @@ int main() { } EOF -if { (eval echo configure:47893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:49271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:49311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 -@@ -47921,9 +49299,9 @@ fi +@@ -47921,9 +49339,9 @@ fi echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6 -echo "configure:47925: checking if your cpp allows macro usage in include lines" >&5 -+echo "configure:49303: checking if your cpp allows macro usage in include lines" >&5 ++echo "configure:49343: checking if your cpp allows macro usage in include lines" >&5 cat > conftest.$ac_ext < -@@ -47933,7 +49311,7 @@ int main() { +@@ -47933,7 +49351,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:47937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:49315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:49355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -48289,7 +49667,7 @@ fi +@@ -48289,7 +49707,7 @@ fi php_with_imap=no echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 -echo "configure:48293: checking for IMAP support" >&5 -+echo "configure:49671: checking for IMAP support" >&5 ++echo "configure:49711: checking for IMAP support" >&5 # Check whether --with-imap or --without-imap was given. if test "${with_imap+set}" = set; then withval="$with_imap" -@@ -48333,7 +49711,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -48333,7 +49751,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_kerberos=no echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6 -echo "configure:48337: checking for IMAP Kerberos support" >&5 -+echo "configure:49715: checking for IMAP Kerberos support" >&5 ++echo "configure:49755: checking for IMAP Kerberos support" >&5 # Check whether --with-kerberos or --without-kerberos was given. if test "${with_kerberos+set}" = set; then withval="$with_kerberos" -@@ -48356,7 +49734,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -48356,7 +49774,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_imap_ssl=no echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6 -echo "configure:48360: checking for IMAP SSL support" >&5 -+echo "configure:49738: checking for IMAP SSL support" >&5 ++echo "configure:49778: checking for IMAP SSL support" >&5 # Check whether --with-imap-ssl or --without-imap-ssl was given. if test "${with_imap_ssl+set}" = set; then withval="$with_imap_ssl" -@@ -48760,7 +50138,7 @@ EOF +@@ -48760,7 +50178,7 @@ EOF done cat > conftest.$ac_ext < EOF -@@ -48780,12 +50158,12 @@ rm -f conftest* +@@ -48780,12 +50198,12 @@ rm -f conftest* old_CFLAGS=$CFLAGS CFLAGS="-I$IMAP_INC_DIR" echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6 -echo "configure:48784: checking for utf8_mime2text signature" >&5 -+echo "configure:50162: checking for utf8_mime2text signature" >&5 ++echo "configure:50202: checking for utf8_mime2text signature" >&5 if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -48798,7 +50176,7 @@ int main() { +@@ -48798,7 +50216,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:48802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:50180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:50220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_utf8_mime2text=old -@@ -48827,12 +50205,12 @@ EOF +@@ -48827,12 +50245,12 @@ EOF old_CFLAGS=$CFLAGS CFLAGS="-I$IMAP_INC_DIR" echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6 -echo "configure:48831: checking for U8T_DECOMPOSE" >&5 -+echo "configure:50209: checking for U8T_DECOMPOSE" >&5 ++echo "configure:50249: checking for U8T_DECOMPOSE" >&5 if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -48843,7 +50221,7 @@ int main() { +@@ -48843,7 +50261,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:48847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:50225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:50265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_u8t_decompose=yes -@@ -48873,7 +50251,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 +@@ -48873,7 +50291,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$IMAP_INC_DIR cat > conftest.$ac_ext <&6 -echo "configure:48996: checking for pam_start in -lpam" >&5 -+echo "configure:50374: checking for pam_start in -lpam" >&5 ++echo "configure:50414: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -49000,7 +50378,7 @@ else +@@ -49000,7 +50418,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpam $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:50393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:50433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -49166,7 +50544,7 @@ fi +@@ -49166,7 +50584,7 @@ fi done echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:49170: checking for crypt in -lcrypt" >&5 -+echo "configure:50548: checking for crypt in -lcrypt" >&5 ++echo "configure:50588: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -49174,7 +50552,7 @@ else +@@ -49174,7 +50592,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:50567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:50607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -49389,7 +50767,7 @@ fi +@@ -49389,7 +50807,7 @@ fi # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:49393: checking for $ac_word" >&5 -+echo "configure:50771: checking for $ac_word" >&5 ++echo "configure:50811: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -49758,7 +51136,7 @@ else +@@ -49758,7 +51176,7 @@ else else cat > conftest.$ac_ext < EOF -@@ -49799,7 +51177,7 @@ rm -f conftest* +@@ -49799,7 +51217,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:49803: checking for $ac_word" >&5 -+echo "configure:51181: checking for $ac_word" >&5 ++echo "configure:51221: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -50004,9 +51382,9 @@ fi +@@ -50004,9 +51422,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:50008: checking for OpenSSL version" >&5 -+echo "configure:51386: checking for OpenSSL version" >&5 ++echo "configure:51426: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < -@@ -50161,7 +51539,7 @@ rm -f conftest* +@@ -50161,7 +51579,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:50165: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:51543: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:51583: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -50169,7 +51547,7 @@ else +@@ -50169,7 +51587,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:51562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:51602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -50337,7 +51715,7 @@ fi +@@ -50337,7 +51755,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:50341: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:51719: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:51759: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -50345,7 +51723,7 @@ else +@@ -50345,7 +51763,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:51738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:51778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -50498,7 +51876,7 @@ else +@@ -50498,7 +51916,7 @@ else elif test -f "$IMAP_INC_DIR/linkage.c"; then cat > conftest.$ac_ext < EOF -@@ -50529,7 +51907,7 @@ rm -f conftest* +@@ -50529,7 +51947,7 @@ rm -f conftest* else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:51944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:51984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50598,7 +51976,7 @@ fi +@@ -50598,7 +52016,7 @@ fi else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:52013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:52053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50658,7 +52036,7 @@ fi +@@ -50658,7 +52076,7 @@ fi echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6 -echo "configure:50662: checking whether rfc822_output_address_list function present" >&5 -+echo "configure:52040: checking whether rfc822_output_address_list function present" >&5 ++echo "configure:52080: checking whether rfc822_output_address_list function present" >&5 old_LIBS=$LIBS LIBS=" -@@ -50670,7 +52048,7 @@ echo "configure:50662: checking whether +@@ -50670,7 +52088,7 @@ echo "configure:50662: checking whether else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:52088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:52128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50735,7 +52113,7 @@ fi +@@ -50735,7 +52153,7 @@ fi echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6 -echo "configure:50739: checking whether build with IMAP works" >&5 -+echo "configure:52117: checking whether build with IMAP works" >&5 ++echo "configure:52157: checking whether build with IMAP works" >&5 old_LIBS=$LIBS -@@ -50746,7 +52124,7 @@ echo "configure:50739: checking whether +@@ -50746,7 +52164,7 @@ echo "configure:50739: checking whether else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:52161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:52201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50811,7 +52189,7 @@ fi +@@ -50811,7 +52229,7 @@ fi php_with_interbase=no echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 -echo "configure:50815: checking for InterBase support" >&5 -+echo "configure:52193: checking for InterBase support" >&5 ++echo "configure:52233: checking for InterBase support" >&5 # Check whether --with-interbase or --without-interbase was given. if test "${with_interbase+set}" = set; then withval="$with_interbase" -@@ -50958,7 +52336,7 @@ if test "$PHP_INTERBASE" != "no"; then +@@ -50958,7 +52376,7 @@ if test "$PHP_INTERBASE" != "no"; then done echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 -echo "configure:50962: checking for isc_detach_database in -lfbclient" >&5 -+echo "configure:52340: checking for isc_detach_database in -lfbclient" >&5 ++echo "configure:52380: checking for isc_detach_database in -lfbclient" >&5 ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -50966,7 +52344,7 @@ else +@@ -50966,7 +52384,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfbclient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -51104,7 +52482,7 @@ else +@@ -51104,7 +52522,7 @@ else done echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 -echo "configure:51108: checking for isc_detach_database in -lgds" >&5 -+echo "configure:52486: checking for isc_detach_database in -lgds" >&5 ++echo "configure:52526: checking for isc_detach_database in -lgds" >&5 ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -51112,7 +52490,7 @@ else +@@ -51112,7 +52530,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgds $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -51250,7 +52628,7 @@ else +@@ -51250,7 +52668,7 @@ else done echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 -echo "configure:51254: checking for isc_detach_database in -lib_util" >&5 -+echo "configure:52632: checking for isc_detach_database in -lib_util" >&5 ++echo "configure:52672: checking for isc_detach_database in -lib_util" >&5 ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -51258,7 +52636,7 @@ else +@@ -51258,7 +52676,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lib_util $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -51746,7 +53124,7 @@ fi +@@ -51746,7 +53164,7 @@ fi php_enable_intl=no echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6 -echo "configure:51750: checking whether to enable internationalization support" >&5 -+echo "configure:53128: checking whether to enable internationalization support" >&5 ++echo "configure:53168: checking whether to enable internationalization support" >&5 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then enableval="$enable_intl" -@@ -51818,7 +53196,7 @@ ext_output=$PHP_ICU_DIR +@@ -51818,7 +53236,7 @@ ext_output=$PHP_ICU_DIR # Extract the first word of "icu-config", so it can be a program name with args. set dummy icu-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:51822: checking for $ac_word" >&5 -+echo "configure:53200: checking for $ac_word" >&5 ++echo "configure:53240: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -51856,7 +53234,7 @@ fi +@@ -51856,7 +53274,7 @@ fi fi echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6 -echo "configure:51860: checking for location of ICU headers and libraries" >&5 -+echo "configure:53238: checking for location of ICU headers and libraries" >&5 ++echo "configure:53278: checking for location of ICU headers and libraries" >&5 icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` if test "$?" != "0" || test -z "$icu_install_prefix"; then -@@ -51866,7 +53244,7 @@ echo "configure:51860: checking for loca +@@ -51866,7 +53284,7 @@ echo "configure:51860: checking for loca echo "$ac_t""$icu_install_prefix" 1>&6 echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6 -echo "configure:51870: checking for ICU 3.4 or greater" >&5 -+echo "configure:53248: checking for ICU 3.4 or greater" >&5 ++echo "configure:53288: checking for ICU 3.4 or greater" >&5 icu_version_full=`$ICU_CONFIG --version` ac_IFS=$IFS IFS="." -@@ -52023,7 +53401,7 @@ do +@@ -52023,7 +53441,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:52027: checking for $ac_word" >&5 -+echo "configure:53405: checking for $ac_word" >&5 ++echo "configure:53445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -52055,7 +53433,7 @@ test -n "$CXX" || CXX="gcc" +@@ -52055,7 +53473,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:52059: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:53437: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:53477: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -52066,12 +53444,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -52066,12 +53484,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 52070 "configure" -+#line 53448 "configure" ++#line 53488 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:52075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:53453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:53493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then -@@ -52097,12 +53475,12 @@ if test $ac_cv_prog_cxx_works = no; then +@@ -52097,12 +53515,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:52101: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:53479: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:53519: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:52106: checking whether we are using GNU C++" >&5 -+echo "configure:53484: checking whether we are using GNU C++" >&5 ++echo "configure:53524: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -52111,7 +53489,7 @@ else +@@ -52111,7 +53529,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:52115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:53493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:53533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no -@@ -52130,7 +53508,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" +@@ -52130,7 +53548,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:52134: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:53512: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:53552: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -52162,7 +53540,7 @@ else +@@ -52162,7 +53580,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:52166: checking how to run the C++ preprocessor" >&5 -+echo "configure:53544: checking how to run the C++ preprocessor" >&5 ++echo "configure:53584: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -52175,12 +53553,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee +@@ -52175,12 +53593,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:52184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:53562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:53602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -52738,7 +54116,7 @@ fi +@@ -52738,7 +54156,7 @@ fi php_enable_json=yes echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6 -echo "configure:52742: checking whether to enable JavaScript Object Serialization support" >&5 -+echo "configure:54120: checking whether to enable JavaScript Object Serialization support" >&5 ++echo "configure:54160: checking whether to enable JavaScript Object Serialization support" >&5 # Check whether --enable-json or --disable-json was given. if test "${enable_json+set}" = set; then enableval="$enable_json" -@@ -52784,12 +54162,12 @@ if test "$PHP_JSON" != "no"; then +@@ -52784,12 +54202,12 @@ if test "$PHP_JSON" != "no"; then EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:52788: checking for ANSI C header files" >&5 -+echo "configure:54166: checking for ANSI C header files" >&5 ++echo "configure:54206: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -52797,7 +54175,7 @@ else +@@ -52797,7 +54215,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:52801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:54179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:54219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -52814,7 +54192,7 @@ rm -f conftest* +@@ -52814,7 +54232,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF -@@ -52832,7 +54210,7 @@ fi +@@ -52832,7 +54250,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF -@@ -52853,7 +54231,7 @@ if test "$cross_compiling" = yes; then +@@ -52853,7 +54271,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -52864,7 +54242,7 @@ if (XOR (islower (i), ISLOWER (i)) || to +@@ -52864,7 +54282,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:52868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:54246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:54286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -53214,7 +54592,7 @@ fi +@@ -53214,7 +54632,7 @@ fi php_with_ldap=no echo $ac_n "checking for LDAP support""... $ac_c" 1>&6 -echo "configure:53218: checking for LDAP support" >&5 -+echo "configure:54596: checking for LDAP support" >&5 ++echo "configure:54636: checking for LDAP support" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" -@@ -53258,7 +54636,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -53258,7 +54676,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_ldap_sasl=no echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6 -echo "configure:53262: checking for LDAP Cyrus SASL support" >&5 -+echo "configure:54640: checking for LDAP Cyrus SASL support" >&5 ++echo "configure:54680: checking for LDAP Cyrus SASL support" >&5 # Check whether --with-ldap-sasl or --without-ldap-sasl was given. if test "${with_ldap_sasl+set}" = set; then withval="$with_ldap_sasl" -@@ -55600,19 +56978,19 @@ EOF +@@ -55600,19 +57018,19 @@ EOF LIBS="$LIBS $LDAP_SHARED_LIBADD" echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 -echo "configure:55604: checking for 3 arg ldap_set_rebind_proc" >&5 -+echo "configure:56982: checking for 3 arg ldap_set_rebind_proc" >&5 ++echo "configure:57022: checking for 3 arg ldap_set_rebind_proc" >&5 if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12723,86 +12779,86 @@ ; return 0; } EOF -if { (eval echo configure:55616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:56994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:57034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3arg_setrebindproc=yes else -@@ -55635,12 +57013,12 @@ EOF +@@ -55635,12 +57053,12 @@ EOF for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:55639: checking for $ac_func" >&5 -+echo "configure:57017: checking for $ac_func" >&5 ++echo "configure:57057: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:57045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -55825,7 +57203,7 @@ EOF +@@ -55825,7 +57243,7 @@ EOF done echo $ac_n "checking for sasl_version in -lsasl2""... $ac_c" 1>&6 -echo "configure:55829: checking for sasl_version in -lsasl2" >&5 -+echo "configure:57207: checking for sasl_version in -lsasl2" >&5 ++echo "configure:57247: checking for sasl_version in -lsasl2" >&5 ac_lib_var=`echo sasl2'_'sasl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -55833,7 +57211,7 @@ else +@@ -55833,7 +57251,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsasl2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:57226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -56013,12 +57391,12 @@ fi +@@ -56013,12 +57431,12 @@ fi fi echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6 -echo "configure:56017: checking for ldap_bind_s" >&5 -+echo "configure:57395: checking for ldap_bind_s" >&5 ++echo "configure:57435: checking for ldap_bind_s" >&5 if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:57423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_ldap_bind_s=yes" else -@@ -56070,39 +57448,18 @@ fi +@@ -56070,39 +57488,18 @@ fi @@ -12837,7 +12893,7 @@ - enableval="$enable_mbstring" - PHP_MBSTRING=$enableval +echo $ac_n "checking for libevent support""... $ac_c" 1>&6 -+echo "configure:57455: checking for libevent support" >&5 ++echo "configure:57495: checking for libevent support" >&5 +# Check whether --with-libevent or --without-libevent was given. +if test "${with_libevent+set}" = set; then + withval="$with_libevent" @@ -12851,7 +12907,7 @@ fi -@@ -56110,12 +57467,12 @@ fi +@@ -56110,12 +57507,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -12867,7 +12923,7 @@ ;; no) ext_output=no -@@ -56134,723 +57491,881 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -56134,723 +57531,881 @@ echo "$ac_t""$ext_output" 1>&6 @@ -12877,7 +12933,7 @@ + + if test "$PHP_LIBEVENT" = "yes"; then + echo $ac_n "checking for libevent headers in default path""... $ac_c" 1>&6 -+echo "configure:57501: checking for libevent headers in default path" >&5 ++echo "configure:57541: checking for libevent headers in default path" >&5 + for i in $SEARCH_PATH ; do + if test -r $i/$SEARCH_FOR; then + LIBEVENT_DIR=$i @@ -12886,7 +12942,7 @@ + done + else + echo $ac_n "checking for libevent headers in $PHP_LIBEVENT""... $ac_c" 1>&6 -+echo "configure:57510: checking for libevent headers in $PHP_LIBEVENT" >&5 ++echo "configure:57550: checking for libevent headers in $PHP_LIBEVENT" >&5 + if test -r $PHP_LIBEVENT/$SEARCH_FOR; then + LIBEVENT_DIR=$PHP_LIBEVENT + echo "$ac_t""found" 1>&6 @@ -13126,7 +13182,7 @@ -echo "configure:56252: checking for variable length prototypes and stdarg.h" >&5 -if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then + echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 -+echo "configure:57659: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ++echo "configure:57699: checking for $LIBSYMBOL in -l$LIBNAME" >&5 +ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13149,7 +13205,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-l$LIBNAME $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then -+if { (eval echo configure:57678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=yes" @@ -14068,7 +14124,7 @@ +php_enable_mbstring=no + +echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 -+echo "configure:58151: checking whether to enable multibyte string support" >&5 ++echo "configure:58191: checking whether to enable multibyte string support" >&5 +# Check whether --enable-mbstring or --disable-mbstring was given. +if test "${enable_mbstring+set}" = set; then + enableval="$enable_mbstring" @@ -14114,7 +14170,7 @@ +php_enable_mbregex=yes + +echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 -+echo "configure:58195: checking whether to enable multibyte regex support" >&5 ++echo "configure:58235: checking whether to enable multibyte regex support" >&5 +# Check whether --enable-mbregex or --disable-mbregex was given. +if test "${enable_mbregex+set}" = set; then + enableval="$enable_mbregex" @@ -14160,7 +14216,7 @@ +php_enable_mbregex_backtrack=yes + +echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 -+echo "configure:58218: checking whether to check multibyte regex backtrack" >&5 ++echo "configure:58258: checking whether to check multibyte regex backtrack" >&5 +# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given. +if test "${enable_mbregex_backtrack+set}" = set; then + enableval="$enable_mbregex_backtrack" @@ -14188,7 +14244,7 @@ +php_with_libmbfl=no + +echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 -+echo "configure:58241: checking for external libmbfl" >&5 ++echo "configure:58281: checking for external libmbfl" >&5 +# Check whether --with-libmbfl or --without-libmbfl was given. +if test "${with_libmbfl+set}" = set; then + withval="$with_libmbfl" @@ -14211,7 +14267,7 @@ +php_with_onig=no + +echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 -+echo "configure:58264: checking for external oniguruma" >&5 ++echo "configure:58304: checking for external oniguruma" >&5 +# Check whether --with-onig or --without-onig was given. +if test "${with_onig+set}" = set; then + withval="$with_onig" @@ -14259,7 +14315,7 @@ + fi + + echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -+echo "configure:58305: checking for variable length prototypes and stdarg.h" >&5 ++echo "configure:58345: checking for variable length prototypes and stdarg.h" >&5 +if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14280,7 +14336,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:58338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - ac_cv_func_memcmp_clean=yes + php_cv_mbstring_stdarg=yes @@ -14329,24 +14385,24 @@ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:58359: checking for $ac_hdr" >&5 ++echo "configure:58399: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:56854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:58369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:58409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -56866,9 +58381,547 @@ rm -f conftest* +@@ -56866,9 +58421,547 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -14364,7 +14420,7 @@ +done + + echo $ac_n "checking size of int""... $ac_c" 1>&6 -+echo "configure:58396: checking size of int" >&5 ++echo "configure:58436: checking size of int" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -14372,7 +14428,7 @@ + ac_cv_sizeof_int=4 +else + cat > conftest.$ac_ext < +#include @@ -14384,7 +14440,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:58416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int=`cat conftestval` +else @@ -14404,7 +14460,7 @@ + + + echo $ac_n "checking size of short""... $ac_c" 1>&6 -+echo "configure:58436: checking size of short" >&5 ++echo "configure:58476: checking size of short" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -14412,7 +14468,7 @@ + ac_cv_sizeof_short=2 +else + cat > conftest.$ac_ext < +#include @@ -14424,7 +14480,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:58456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_short=`cat conftestval` +else @@ -14444,7 +14500,7 @@ + + + echo $ac_n "checking size of long""... $ac_c" 1>&6 -+echo "configure:58476: checking size of long" >&5 ++echo "configure:58516: checking size of long" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -14452,7 +14508,7 @@ + ac_cv_sizeof_long=4 +else + cat > conftest.$ac_ext < +#include @@ -14464,7 +14520,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:58496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_long=`cat conftestval` +else @@ -14484,12 +14540,12 @@ + + + echo $ac_n "checking for working const""... $ac_c" 1>&6 -+echo "configure:58516: checking for working const" >&5 ++echo "configure:58556: checking for working const" >&5 +if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:58610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes +else @@ -14559,12 +14615,12 @@ +fi + + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -+echo "configure:58591: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:58631: checking whether time.h and sys/time.h may both be included" >&5 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#include @@ -14573,7 +14629,7 @@ +struct tm *tp; +; return 0; } +EOF -+if { (eval echo configure:58605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:58645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes +else @@ -14596,19 +14652,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -+echo "configure:58628: checking for working alloca.h" >&5 ++echo "configure:58668: checking for working alloca.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +int main() { +char *p = alloca(2 * sizeof(int)); +; return 0; } +EOF -+if { (eval echo configure:58640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:58680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes +else @@ -14629,12 +14685,12 @@ +fi + +echo $ac_n "checking for alloca""... $ac_c" 1>&6 -+echo "configure:58661: checking for alloca" >&5 ++echo "configure:58701: checking for alloca" >&5 +if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:58734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes +else @@ -14694,12 +14750,12 @@ + + +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -+echo "configure:58726: checking whether alloca needs Cray hooks" >&5 ++echo "configure:58766: checking whether alloca needs Cray hooks" >&5 +if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&6 -+echo "configure:58756: checking for $ac_func" >&5 ++echo "configure:58796: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:58824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else @@ -14779,7 +14835,7 @@ +fi + +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -+echo "configure:58811: checking stack direction for C alloca" >&5 ++echo "configure:58851: checking stack direction for C alloca" >&5 +if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -14787,7 +14843,7 @@ + ac_cv_c_stack_direction=0 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_c_stack_direction=1 +else @@ -14828,7 +14884,7 @@ +fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -+echo "configure:58860: checking for 8-bit clean memcmp" >&5 ++echo "configure:58900: checking for 8-bit clean memcmp" >&5 +if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -14836,7 +14892,7 @@ + ac_cv_func_memcmp_clean=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_func_memcmp_clean=yes +else @@ -14865,17 +14921,17 @@ + + ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 -+echo "configure:58897: checking for stdarg.h" >&5 ++echo "configure:58937: checking for stdarg.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:58907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:58947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* @@ -14897,1001 +14953,1001 @@ EOF -@@ -57080,7 +59133,7 @@ EOF +@@ -57080,7 +59173,7 @@ EOF done echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 -echo "configure:57084: checking for onig_init in -lonig" >&5 -+echo "configure:59137: checking for onig_init in -lonig" >&5 ++echo "configure:59177: checking for onig_init in -lonig" >&5 ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -57088,7 +59141,7 @@ else +@@ -57088,7 +59181,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lonig $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:59196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -57325,9 +59378,9 @@ fi +@@ -57325,9 +59418,9 @@ fi done echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6 -echo "configure:57329: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 -+echo "configure:59382: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 ++echo "configure:59422: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 cat > conftest.$ac_ext < -@@ -57338,7 +59391,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1); +@@ -57338,7 +59431,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1); ; return 0; } EOF -if { (eval echo configure:57342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:59435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""no" 1>&6 -@@ -57636,7 +59689,7 @@ EOF +@@ -57636,7 +59729,7 @@ EOF done echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6 -echo "configure:57640: checking for mbfl_buffer_converter_new in -lmbfl" >&5 -+echo "configure:59693: checking for mbfl_buffer_converter_new in -lmbfl" >&5 ++echo "configure:59733: checking for mbfl_buffer_converter_new in -lmbfl" >&5 ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -57644,7 +59697,7 @@ else +@@ -57644,7 +59737,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmbfl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:59752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -58292,7 +60345,7 @@ fi +@@ -58292,7 +60385,7 @@ fi php_with_mcrypt=no echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6 -echo "configure:58296: checking for mcrypt support" >&5 -+echo "configure:60349: checking for mcrypt support" >&5 ++echo "configure:60389: checking for mcrypt support" >&5 # Check whether --with-mcrypt or --without-mcrypt was given. if test "${with_mcrypt+set}" = set; then withval="$with_mcrypt" -@@ -58345,9 +60398,9 @@ if test "$PHP_MCRYPT" != "no"; then +@@ -58345,9 +60438,9 @@ if test "$PHP_MCRYPT" != "no"; then old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$MCRYPT_DIR/include echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6 -echo "configure:58349: checking for libmcrypt version" >&5 -+echo "configure:60402: checking for libmcrypt version" >&5 ++echo "configure:60442: checking for libmcrypt version" >&5 cat > conftest.$ac_ext < -@@ -58471,7 +60524,7 @@ rm -f conftest* +@@ -58471,7 +60564,7 @@ rm -f conftest* done echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 -echo "configure:58475: checking for mcrypt_module_open in -lmcrypt" >&5 -+echo "configure:60528: checking for mcrypt_module_open in -lmcrypt" >&5 ++echo "configure:60568: checking for mcrypt_module_open in -lmcrypt" >&5 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -58479,7 +60532,7 @@ else +@@ -58479,7 +60572,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:60547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:60587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -58643,7 +60696,7 @@ else +@@ -58643,7 +60736,7 @@ else done echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 -echo "configure:58647: checking for mcrypt_module_open in -lmcrypt" >&5 -+echo "configure:60700: checking for mcrypt_module_open in -lmcrypt" >&5 ++echo "configure:60740: checking for mcrypt_module_open in -lmcrypt" >&5 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -58651,7 +60704,7 @@ else +@@ -58651,7 +60744,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:60719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:60759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -59135,7 +61188,7 @@ fi +@@ -59135,7 +61228,7 @@ fi php_with_mssql=no echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6 -echo "configure:59139: checking for MSSQL support via FreeTDS" >&5 -+echo "configure:61192: checking for MSSQL support via FreeTDS" >&5 ++echo "configure:61232: checking for MSSQL support via FreeTDS" >&5 # Check whether --with-mssql or --without-mssql was given. if test "${with_mssql+set}" = set; then withval="$with_mssql" -@@ -59633,7 +61686,7 @@ EOF +@@ -59633,7 +61726,7 @@ EOF fi echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:59637: checking for dnet_addr in -ldnet_stub" >&5 -+echo "configure:61690: checking for dnet_addr in -ldnet_stub" >&5 ++echo "configure:61730: checking for dnet_addr in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -59641,7 +61694,7 @@ else +@@ -59641,7 +61734,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:61709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:61749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -59796,7 +61849,7 @@ fi +@@ -59796,7 +61889,7 @@ fi php_with_mysql=no echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 -echo "configure:59800: checking for MySQL support" >&5 -+echo "configure:61853: checking for MySQL support" >&5 ++echo "configure:61893: checking for MySQL support" >&5 # Check whether --with-mysql or --without-mysql was given. if test "${with_mysql+set}" = set; then withval="$with_mysql" -@@ -59840,7 +61893,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -59840,7 +61933,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_mysql_sock=no echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6 -echo "configure:59844: checking for specified location of the MySQL UNIX socket" >&5 -+echo "configure:61897: checking for specified location of the MySQL UNIX socket" >&5 ++echo "configure:61937: checking for specified location of the MySQL UNIX socket" >&5 # Check whether --with-mysql-sock or --without-mysql-sock was given. if test "${with_mysql_sock+set}" = set; then withval="$with_mysql_sock" -@@ -59864,7 +61917,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -59864,7 +61957,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:59868: checking for the location of libz" >&5 -+echo "configure:61921: checking for the location of libz" >&5 ++echo "configure:61961: checking for the location of libz" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" -@@ -60038,7 +62091,7 @@ Note that the MySQL client library is no +@@ -60038,7 +62131,7 @@ Note that the MySQL client library is no done echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:60042: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62095: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 ++echo "configure:62135: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -60046,7 +62099,7 @@ else +@@ -60046,7 +62139,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -60280,7 +62333,7 @@ else +@@ -60280,7 +62373,7 @@ else done echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:60284: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62337: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 ++echo "configure:62377: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -60288,7 +62341,7 @@ else +@@ -60288,7 +62381,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -60454,7 +62507,7 @@ fi +@@ -60454,7 +62547,7 @@ fi done echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:60458: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62511: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 ++echo "configure:62551: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -60462,7 +62515,7 @@ else +@@ -60462,7 +62555,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -60667,7 +62720,7 @@ fi +@@ -60667,7 +62760,7 @@ fi if test "$PHP_MYSQL" != "no"; then echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6 -echo "configure:60671: checking for MySQL UNIX socket location" >&5 -+echo "configure:62724: checking for MySQL UNIX socket location" >&5 ++echo "configure:62764: checking for MySQL UNIX socket location" >&5 if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then MYSQL_SOCK=$PHP_MYSQL_SOCK cat >> confdefs.h <&6 -echo "configure:61044: checking for MySQLi support" >&5 -+echo "configure:63097: checking for MySQLi support" >&5 ++echo "configure:63137: checking for MySQLi support" >&5 # Check whether --with-mysqli or --without-mysqli was given. if test "${with_mysqli+set}" = set; then withval="$with_mysqli" -@@ -61084,7 +63137,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -61084,7 +63177,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_embedded_mysqli=no echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6 -echo "configure:61088: checking whether to enable embedded MySQLi support" >&5 -+echo "configure:63141: checking whether to enable embedded MySQLi support" >&5 ++echo "configure:63181: checking whether to enable embedded MySQLi support" >&5 # Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given. if test "${enable_embedded_mysqli+set}" = set; then enableval="$enable_embedded_mysqli" -@@ -61235,7 +63288,7 @@ EOF +@@ -61235,7 +63328,7 @@ EOF done echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:61239: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63292: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:63332: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -61243,7 +63296,7 @@ else +@@ -61243,7 +63336,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:63351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -61502,7 +63555,7 @@ EOF +@@ -61502,7 +63595,7 @@ EOF done echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:61506: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63559: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:63599: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -61510,7 +63563,7 @@ else +@@ -61510,7 +63603,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:63618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -61665,7 +63718,7 @@ fi +@@ -61665,7 +63758,7 @@ fi done echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:61669: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63722: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:63762: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -61673,7 +63726,7 @@ else +@@ -61673,7 +63766,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:63781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -62087,7 +64140,7 @@ fi +@@ -62087,7 +64180,7 @@ fi php_with_oci8=no echo $ac_n "checking for Oracle Database OCI8 support""... $ac_c" 1>&6 -echo "configure:62091: checking for Oracle Database OCI8 support" >&5 -+echo "configure:64144: checking for Oracle Database OCI8 support" >&5 ++echo "configure:64184: checking for Oracle Database OCI8 support" >&5 # Check whether --with-oci8 or --without-oci8 was given. if test "${with_oci8+set}" = set; then withval="$with_oci8" -@@ -62135,7 +64188,7 @@ if test "$PHP_OCI8" != "no"; then +@@ -62135,7 +64228,7 @@ if test "$PHP_OCI8" != "no"; then echo $ac_n "checking PHP version""... $ac_c" 1>&6 -echo "configure:62139: checking PHP version" >&5 -+echo "configure:64192: checking PHP version" >&5 ++echo "configure:64232: checking PHP version" >&5 tmp_version=$PHP_VERSION if test -z "$tmp_version"; then -@@ -62167,7 +64220,7 @@ echo "configure:62139: checking PHP vers +@@ -62167,7 +64260,7 @@ echo "configure:62139: checking PHP vers echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:62171: checking size of long int" >&5 -+echo "configure:64224: checking size of long int" >&5 ++echo "configure:64264: checking size of long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -62175,7 +64228,7 @@ else +@@ -62175,7 +64268,7 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < #include -@@ -62187,7 +64240,7 @@ main() +@@ -62187,7 +64280,7 @@ main() exit(0); } EOF -if { (eval echo configure:62191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:64244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:64284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_int=`cat conftestval` else -@@ -62207,7 +64260,7 @@ EOF +@@ -62207,7 +64300,7 @@ EOF echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 -echo "configure:62211: checking checking if we're on a 64-bit platform" >&5 -+echo "configure:64264: checking checking if we're on a 64-bit platform" >&5 ++echo "configure:64304: checking checking if we're on a 64-bit platform" >&5 if test "$ac_cv_sizeof_long_int" = "4"; then echo "$ac_t""no" 1>&6 PHP_OCI8_OH_LIBDIR=lib32 -@@ -62251,7 +64304,7 @@ echo "configure:62211: checking checking +@@ -62251,7 +64344,7 @@ echo "configure:62211: checking checking if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6 -echo "configure:62255: checking Oracle ORACLE_HOME install directory" >&5 -+echo "configure:64308: checking Oracle ORACLE_HOME install directory" >&5 ++echo "configure:64348: checking Oracle ORACLE_HOME install directory" >&5 if test "$PHP_OCI8" = "yes"; then OCI8_DIR=$ORACLE_HOME -@@ -62262,7 +64315,7 @@ echo "configure:62255: checking Oracle O +@@ -62262,7 +64355,7 @@ echo "configure:62255: checking Oracle O echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6 -echo "configure:62266: checking ORACLE_HOME library validity" >&5 -+echo "configure:64319: checking ORACLE_HOME library validity" >&5 ++echo "configure:64359: checking ORACLE_HOME library validity" >&5 if test ! -d "$OCI8_DIR"; then { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; } fi -@@ -62603,7 +64656,7 @@ echo "configure:62266: checking ORACLE_H +@@ -62603,7 +64696,7 @@ echo "configure:62266: checking ORACLE_H echo $ac_n "checking Oracle library version compatibility""... $ac_c" 1>&6 -echo "configure:62607: checking Oracle library version compatibility" >&5 -+echo "configure:64660: checking Oracle library version compatibility" >&5 ++echo "configure:64700: checking Oracle library version compatibility" >&5 OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc if test -s "$OCI8_DIR/orainst/unix.rgs"; then -@@ -62733,7 +64786,7 @@ echo "configure:62607: checking Oracle l +@@ -62733,7 +64826,7 @@ echo "configure:62607: checking Oracle l done echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:62737: checking for OCIEnvNlsCreate in -lclntsh" >&5 -+echo "configure:64790: checking for OCIEnvNlsCreate in -lclntsh" >&5 ++echo "configure:64830: checking for OCIEnvNlsCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -62741,7 +64794,7 @@ else +@@ -62741,7 +64834,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:64809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:64849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -63185,7 +65238,7 @@ EOF +@@ -63185,7 +65278,7 @@ EOF else echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6 -echo "configure:63189: checking Oracle Instant Client directory" >&5 -+echo "configure:65242: checking Oracle Instant Client directory" >&5 ++echo "configure:65282: checking Oracle Instant Client directory" >&5 if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'` -@@ -63198,7 +65251,7 @@ echo "configure:63189: checking Oracle I +@@ -63198,7 +65291,7 @@ echo "configure:63189: checking Oracle I OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6 -echo "configure:63202: checking Oracle Instant Client SDK header directory" >&5 -+echo "configure:65255: checking Oracle Instant Client SDK header directory" >&5 ++echo "configure:65295: checking Oracle Instant Client SDK header directory" >&5 OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'` -@@ -63407,7 +65460,7 @@ echo "configure:63202: checking Oracle I +@@ -63407,7 +65500,7 @@ echo "configure:63202: checking Oracle I echo $ac_n "checking Oracle Instant Client library version compatibility""... $ac_c" 1>&6 -echo "configure:63411: checking Oracle Instant Client library version compatibility" >&5 -+echo "configure:65464: checking Oracle Instant Client library version compatibility" >&5 ++echo "configure:65504: checking Oracle Instant Client library version compatibility" >&5 OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | tail -1` -@@ -63868,7 +65921,7 @@ esac +@@ -63868,7 +65961,7 @@ esac if test "$PHP_ADABAS" != "no"; then echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 -echo "configure:63872: checking for Adabas support" >&5 -+echo "configure:65925: checking for Adabas support" >&5 ++echo "configure:65965: checking for Adabas support" >&5 if test "$PHP_ADABAS" = "yes"; then PHP_ADABAS=/usr/local fi -@@ -64071,7 +66124,7 @@ esac +@@ -64071,7 +66164,7 @@ esac if test "$PHP_SAPDB" != "no"; then echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 -echo "configure:64075: checking for SAP DB support" >&5 -+echo "configure:66128: checking for SAP DB support" >&5 ++echo "configure:66168: checking for SAP DB support" >&5 if test "$PHP_SAPDB" = "yes"; then PHP_SAPDB=/usr/local fi -@@ -64204,7 +66257,7 @@ esac +@@ -64204,7 +66297,7 @@ esac if test "$PHP_SOLID" != "no"; then echo $ac_n "checking for Solid support""... $ac_c" 1>&6 -echo "configure:64208: checking for Solid support" >&5 -+echo "configure:66261: checking for Solid support" >&5 ++echo "configure:66301: checking for Solid support" >&5 if test "$PHP_SOLID" = "yes"; then PHP_SOLID=/usr/local/solid fi -@@ -64231,7 +66284,7 @@ EOF +@@ -64231,7 +66324,7 @@ EOF echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking Solid library file""... $ac_c" 1>&6 -echo "configure:64235: checking Solid library file" >&5 -+echo "configure:66288: checking Solid library file" >&5 ++echo "configure:66328: checking Solid library file" >&5 ac_solid_uname_r=`uname -r 2>/dev/null` ac_solid_uname_s=`uname -s 2>/dev/null` case $ac_solid_uname_s in -@@ -64352,7 +66405,7 @@ esac +@@ -64352,7 +66445,7 @@ esac if test "$PHP_IBM_DB2" != "no"; then echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 -echo "configure:64356: checking for IBM DB2 support" >&5 -+echo "configure:66409: checking for IBM DB2 support" >&5 ++echo "configure:66449: checking for IBM DB2 support" >&5 if test "$PHP_IBM_DB2" = "yes"; then ODBC_INCDIR=/home/db2inst1/sqllib/include ODBC_LIBDIR=/home/db2inst1/sqllib/lib -@@ -64383,7 +66436,7 @@ fi +@@ -64383,7 +66476,7 @@ fi else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:66451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:66491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -64475,7 +66528,7 @@ esac +@@ -64475,7 +66568,7 @@ esac if test "$PHP_ODBCROUTER" != "no"; then echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6 -echo "configure:64479: checking for ODBCRouter.com support" >&5 -+echo "configure:66532: checking for ODBCRouter.com support" >&5 ++echo "configure:66572: checking for ODBCRouter.com support" >&5 if test "$PHP_ODBCROUTER" = "yes"; then PHP_ODBCROUTER=/usr fi -@@ -64539,7 +66592,7 @@ esac +@@ -64539,7 +66632,7 @@ esac if test "$PHP_EMPRESS" != "no"; then echo $ac_n "checking for Empress support""... $ac_c" 1>&6 -echo "configure:64543: checking for Empress support" >&5 -+echo "configure:66596: checking for Empress support" >&5 ++echo "configure:66636: checking for Empress support" >&5 if test "$PHP_EMPRESS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib -@@ -64557,7 +66610,7 @@ EOF +@@ -64557,7 +66650,7 @@ EOF echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking Empress library file""... $ac_c" 1>&6 -echo "configure:64561: checking Empress library file" >&5 -+echo "configure:66614: checking Empress library file" >&5 ++echo "configure:66654: checking Empress library file" >&5 ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` if test ! -f $ODBC_LIBS; then ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` -@@ -64613,7 +66666,7 @@ esac +@@ -64613,7 +66706,7 @@ esac if test "$PHP_EMPRESS_BCS" != "no"; then echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6 -echo "configure:64617: checking for Empress local access support" >&5 -+echo "configure:66670: checking for Empress local access support" >&5 ++echo "configure:66710: checking for Empress local access support" >&5 if test "$PHP_EMPRESS_BCS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib -@@ -64647,7 +66700,7 @@ EOF +@@ -64647,7 +66740,7 @@ EOF echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6 -echo "configure:64651: checking Empress local access library file" >&5 -+echo "configure:66704: checking Empress local access library file" >&5 ++echo "configure:66744: checking Empress local access library file" >&5 ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` if test ! -f $ODBCBCS_LIBS; then ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` -@@ -64703,7 +66756,7 @@ esac +@@ -64703,7 +66796,7 @@ esac if test "$PHP_BIRDSTEP" != "no"; then echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6 -echo "configure:64707: checking for Birdstep support" >&5 -+echo "configure:66760: checking for Birdstep support" >&5 ++echo "configure:66800: checking for Birdstep support" >&5 if test "$PHP_BIRDSTEP" = "yes"; then ODBC_INCDIR=/usr/local/birdstep/include ODBC_LIBDIR=/usr/local/birdstep/lib -@@ -64815,7 +66868,7 @@ esac +@@ -64815,7 +66908,7 @@ esac if test "$PHP_CUSTOM_ODBC" != "no"; then echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 -echo "configure:64819: checking for a custom ODBC support" >&5 -+echo "configure:66872: checking for a custom ODBC support" >&5 ++echo "configure:66912: checking for a custom ODBC support" >&5 if test "$PHP_CUSTOM_ODBC" = "yes"; then PHP_CUSTOM_ODBC=/usr/local fi -@@ -64879,7 +66932,7 @@ esac +@@ -64879,7 +66972,7 @@ esac if test "$PHP_IODBC" != "no"; then echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 -echo "configure:64883: checking for iODBC support" >&5 -+echo "configure:66936: checking for iODBC support" >&5 ++echo "configure:66976: checking for iODBC support" >&5 if test "$PHP_IODBC" = "yes"; then PHP_IODBC=/usr/local fi -@@ -65025,7 +67078,7 @@ esac +@@ -65025,7 +67118,7 @@ esac if test "$PHP_ESOOB" != "no"; then echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 -echo "configure:65029: checking for Easysoft ODBC-ODBC Bridge support" >&5 -+echo "configure:67082: checking for Easysoft ODBC-ODBC Bridge support" >&5 ++echo "configure:67122: checking for Easysoft ODBC-ODBC Bridge support" >&5 if test "$PHP_ESOOB" = "yes"; then PHP_ESOOB=/usr/local/easysoft/oob/client fi -@@ -65089,7 +67142,7 @@ esac +@@ -65089,7 +67182,7 @@ esac if test "$PHP_UNIXODBC" != "no"; then echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 -echo "configure:65093: checking for unixODBC support" >&5 -+echo "configure:67146: checking for unixODBC support" >&5 ++echo "configure:67186: checking for unixODBC support" >&5 if test "$PHP_UNIXODBC" = "yes"; then PHP_UNIXODBC=/usr/local fi -@@ -65158,7 +67211,7 @@ esac +@@ -65158,7 +67251,7 @@ esac if test "$PHP_DBMAKER" != "no"; then echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 -echo "configure:65162: checking for DBMaker support" >&5 -+echo "configure:67215: checking for DBMaker support" >&5 ++echo "configure:67255: checking for DBMaker support" >&5 if test "$PHP_DBMAKER" = "yes"; then # find dbmaker's home directory DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` -@@ -65720,7 +67773,7 @@ fi +@@ -65720,7 +67813,7 @@ fi php_enable_pcntl=no echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6 -echo "configure:65724: checking whether to enable pcntl support" >&5 -+echo "configure:67777: checking whether to enable pcntl support" >&5 ++echo "configure:67817: checking whether to enable pcntl support" >&5 # Check whether --enable-pcntl or --disable-pcntl was given. if test "${enable_pcntl+set}" = set; then enableval="$enable_pcntl" -@@ -65764,12 +67817,12 @@ if test "$PHP_PCNTL" != "no"; then +@@ -65764,12 +67857,12 @@ if test "$PHP_PCNTL" != "no"; then for ac_func in fork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65768: checking for $ac_func" >&5 -+echo "configure:67821: checking for $ac_func" >&5 ++echo "configure:67861: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:67849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:67889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -65823,12 +67876,12 @@ done +@@ -65823,12 +67916,12 @@ done for ac_func in waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65827: checking for $ac_func" >&5 -+echo "configure:67880: checking for $ac_func" >&5 ++echo "configure:67920: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:67908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:67948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -65882,12 +67935,12 @@ done +@@ -65882,12 +67975,12 @@ done for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65886: checking for $ac_func" >&5 -+echo "configure:67939: checking for $ac_func" >&5 ++echo "configure:67979: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:67967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -65941,12 +67994,12 @@ done +@@ -65941,12 +68034,12 @@ done for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65945: checking for $ac_func" >&5 -+echo "configure:67998: checking for $ac_func" >&5 ++echo "configure:68038: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:68026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -66294,7 +68347,7 @@ fi +@@ -66294,7 +68387,7 @@ fi php_enable_pdo=yes echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6 -echo "configure:66298: checking whether to enable PDO support" >&5 -+echo "configure:68351: checking whether to enable PDO support" >&5 ++echo "configure:68391: checking whether to enable PDO support" >&5 # Check whether --enable-pdo or --disable-pdo was given. if test "${enable_pdo+set}" = set; then enableval="$enable_pdo" -@@ -66728,7 +68781,7 @@ fi +@@ -66728,7 +68821,7 @@ fi php_with_pdo_dblib=no echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6 -echo "configure:66732: checking for PDO_DBLIB support via FreeTDS" >&5 -+echo "configure:68785: checking for PDO_DBLIB support via FreeTDS" >&5 ++echo "configure:68825: checking for PDO_DBLIB support via FreeTDS" >&5 # Check whether --with-pdo-dblib or --without-pdo-dblib was given. if test "${with_pdo_dblib+set}" = set; then withval="$with_pdo_dblib" -@@ -66945,13 +68998,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then +@@ -66945,13 +69038,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:66949: checking for PDO includes" >&5 -+echo "configure:69002: checking for PDO includes" >&5 ++echo "configure:69042: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:66955: checking for PDO includes" >&5 -+echo "configure:69008: checking for PDO includes" >&5 ++echo "configure:69048: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -67265,7 +69318,7 @@ EOF +@@ -67265,7 +69358,7 @@ EOF fi echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:67269: checking for dnet_addr in -ldnet_stub" >&5 -+echo "configure:69322: checking for dnet_addr in -ldnet_stub" >&5 ++echo "configure:69362: checking for dnet_addr in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -67273,7 +69326,7 @@ else +@@ -67273,7 +69366,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:69341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:69381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67445,7 +69498,7 @@ fi +@@ -67445,7 +69538,7 @@ fi php_with_pdo_firebird=no echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6 -echo "configure:67449: checking for Firebird support for PDO" >&5 -+echo "configure:69502: checking for Firebird support for PDO" >&5 ++echo "configure:69542: checking for Firebird support for PDO" >&5 # Check whether --with-pdo-firebird or --without-pdo-firebird was given. if test "${with_pdo_firebird+set}" = set; then withval="$with_pdo_firebird" -@@ -67599,7 +69652,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the +@@ -67599,7 +69692,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the done echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 -echo "configure:67603: checking for isc_detach_database in -lfbclient" >&5 -+echo "configure:69656: checking for isc_detach_database in -lfbclient" >&5 ++echo "configure:69696: checking for isc_detach_database in -lfbclient" >&5 ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -67607,7 +69660,7 @@ else +@@ -67607,7 +69700,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfbclient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:69675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:69715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67745,7 +69798,7 @@ else +@@ -67745,7 +69838,7 @@ else done echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 -echo "configure:67749: checking for isc_detach_database in -lgds" >&5 -+echo "configure:69802: checking for isc_detach_database in -lgds" >&5 ++echo "configure:69842: checking for isc_detach_database in -lgds" >&5 ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -67753,7 +69806,7 @@ else +@@ -67753,7 +69846,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgds $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:69821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:69861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67891,7 +69944,7 @@ else +@@ -67891,7 +69984,7 @@ else done echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 -echo "configure:67895: checking for isc_detach_database in -lib_util" >&5 -+echo "configure:69948: checking for isc_detach_database in -lib_util" >&5 ++echo "configure:69988: checking for isc_detach_database in -lib_util" >&5 ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -67899,7 +69952,7 @@ else +@@ -67899,7 +69992,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lib_util $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:69967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:70007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67955,13 +70008,13 @@ fi +@@ -67955,13 +70048,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:67959: checking for PDO includes" >&5 -+echo "configure:70012: checking for PDO includes" >&5 ++echo "configure:70052: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:67965: checking for PDO includes" >&5 -+echo "configure:70018: checking for PDO includes" >&5 ++echo "configure:70058: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -68433,7 +70486,7 @@ fi +@@ -68433,7 +70526,7 @@ fi php_with_pdo_mysql=no echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6 -echo "configure:68437: checking for MySQL support for PDO" >&5 -+echo "configure:70490: checking for MySQL support for PDO" >&5 ++echo "configure:70530: checking for MySQL support for PDO" >&5 # Check whether --with-pdo-mysql or --without-pdo-mysql was given. if test "${with_pdo_mysql+set}" = set; then withval="$with_pdo_mysql" -@@ -68478,7 +70531,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -68478,7 +70571,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:68482: checking for the location of libz" >&5 -+echo "configure:70535: checking for the location of libz" >&5 ++echo "configure:70575: checking for the location of libz" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" -@@ -68542,14 +70595,14 @@ EOF +@@ -68542,14 +70635,14 @@ EOF echo $ac_n "checking for mysql_config""... $ac_c" 1>&6 -echo "configure:68546: checking for mysql_config" >&5 -+echo "configure:70599: checking for mysql_config" >&5 ++echo "configure:70639: checking for mysql_config" >&5 if test -n "$PDO_MYSQL_CONFIG"; then echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6 if test "x$SED" = "x"; then @@ -15899,709 +15955,709 @@ set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:68553: checking for $ac_word" >&5 -+echo "configure:70606: checking for $ac_word" >&5 ++echo "configure:70646: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -68593,7 +70646,7 @@ fi +@@ -68593,7 +70686,7 @@ fi elif test -n "$PDO_MYSQL_DIR"; then echo "$ac_t""not found" 1>&6 echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6 -echo "configure:68597: checking for mysql install under $PDO_MYSQL_DIR" >&5 -+echo "configure:70650: checking for mysql install under $PDO_MYSQL_DIR" >&5 ++echo "configure:70690: checking for mysql install under $PDO_MYSQL_DIR" >&5 if test -r $PDO_MYSQL_DIR/include/mysql; then PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql else -@@ -68747,7 +70800,7 @@ echo "configure:68597: checking for mysq +@@ -68747,7 +70840,7 @@ echo "configure:68597: checking for mysq done echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:68751: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:70804: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:70844: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -68755,7 +70808,7 @@ else +@@ -68755,7 +70848,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:70823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:70863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -69119,7 +71172,7 @@ else +@@ -69119,7 +71212,7 @@ else done echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:69123: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:71176: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:71216: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -69127,7 +71180,7 @@ else +@@ -69127,7 +71220,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -69293,7 +71346,7 @@ fi +@@ -69293,7 +71386,7 @@ fi done echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:69297: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:71350: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:71390: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -69301,7 +71354,7 @@ else +@@ -69301,7 +71394,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -69486,12 +71539,12 @@ fi +@@ -69486,12 +71579,12 @@ fi for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:69490: checking for $ac_func" >&5 -+echo "configure:71543: checking for $ac_func" >&5 ++echo "configure:71583: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -69544,13 +71597,13 @@ done +@@ -69544,13 +71637,13 @@ done echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:69548: checking for PDO includes" >&5 -+echo "configure:71601: checking for PDO includes" >&5 ++echo "configure:71641: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:69554: checking for PDO includes" >&5 -+echo "configure:71607: checking for PDO includes" >&5 ++echo "configure:71647: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -69935,7 +71988,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1" # Th +@@ -69935,7 +72028,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1" # Th php_with_pdo_oci=no echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6 -echo "configure:69939: checking Oracle OCI support for PDO" >&5 -+echo "configure:71992: checking Oracle OCI support for PDO" >&5 ++echo "configure:72032: checking Oracle OCI support for PDO" >&5 # Check whether --with-pdo-oci or --without-pdo-oci was given. if test "${with_pdo_oci+set}" = set; then withval="$with_pdo_oci" -@@ -69982,7 +72035,7 @@ if test "$PHP_PDO_OCI" != "no"; then +@@ -69982,7 +72075,7 @@ if test "$PHP_PDO_OCI" != "no"; then fi echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 -echo "configure:69986: checking Oracle Install-Dir" >&5 -+echo "configure:72039: checking Oracle Install-Dir" >&5 ++echo "configure:72079: checking Oracle Install-Dir" >&5 if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then PDO_OCI_DIR=$ORACLE_HOME else -@@ -69991,7 +72044,7 @@ echo "configure:69986: checking Oracle I +@@ -69991,7 +72084,7 @@ echo "configure:69986: checking Oracle I echo "$ac_t""$PHP_PDO_OCI" 1>&6 echo $ac_n "checking if that is sane""... $ac_c" 1>&6 -echo "configure:69995: checking if that is sane" >&5 -+echo "configure:72048: checking if that is sane" >&5 ++echo "configure:72088: checking if that is sane" >&5 if test -z "$PDO_OCI_DIR"; then { echo "configure: error: You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME. -@@ -70002,7 +72055,7 @@ You need to tell me where to find your O +@@ -70002,7 +72095,7 @@ You need to tell me where to find your O if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:70006: checking size of long int" >&5 -+echo "configure:72059: checking size of long int" >&5 ++echo "configure:72099: checking size of long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -70010,7 +72063,7 @@ else +@@ -70010,7 +72103,7 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < #include -@@ -70022,7 +72075,7 @@ main() +@@ -70022,7 +72115,7 @@ main() exit(0); } EOF -if { (eval echo configure:70026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:72079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:72119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_int=`cat conftestval` else -@@ -70056,7 +72109,7 @@ EOF +@@ -70056,7 +72149,7 @@ EOF fi fi echo $ac_n "checking for oci.h""... $ac_c" 1>&6 -echo "configure:70060: checking for oci.h" >&5 -+echo "configure:72113: checking for oci.h" >&5 ++echo "configure:72153: checking for oci.h" >&5 if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then -@@ -70205,7 +72258,7 @@ echo "configure:70060: checking for oci. +@@ -70205,7 +72298,7 @@ echo "configure:70060: checking for oci. else echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:70209: checking size of long int" >&5 -+echo "configure:72262: checking size of long int" >&5 ++echo "configure:72302: checking size of long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -70213,7 +72266,7 @@ else +@@ -70213,7 +72306,7 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < #include -@@ -70225,7 +72278,7 @@ main() +@@ -70225,7 +72318,7 @@ main() exit(0); } EOF -if { (eval echo configure:70229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:72282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:72322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_int=`cat conftestval` else -@@ -70245,7 +72298,7 @@ EOF +@@ -70245,7 +72338,7 @@ EOF echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6 -echo "configure:70249: checking if we're on a 64-bit platform" >&5 -+echo "configure:72302: checking if we're on a 64-bit platform" >&5 ++echo "configure:72342: checking if we're on a 64-bit platform" >&5 if test "$ac_cv_sizeof_long_int" = "4" ; then echo "$ac_t""no" 1>&6 TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32" -@@ -70255,7 +72308,7 @@ echo "configure:70249: checking if we're +@@ -70255,7 +72348,7 @@ echo "configure:70249: checking if we're fi echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 -echo "configure:70259: checking OCI8 libraries dir" >&5 -+echo "configure:72312: checking OCI8 libraries dir" >&5 ++echo "configure:72352: checking OCI8 libraries dir" >&5 if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then -@@ -70622,7 +72675,7 @@ echo "configure:70259: checking OCI8 lib +@@ -70622,7 +72715,7 @@ echo "configure:70259: checking OCI8 lib fi echo $ac_n "checking Oracle version""... $ac_c" 1>&6 -echo "configure:70626: checking Oracle version" >&5 -+echo "configure:72679: checking Oracle version" >&5 ++echo "configure:72719: checking Oracle version" >&5 for OCI_VER in $SUPPORTED_LIB_VERS; do if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then PDO_OCI_VERSION="$OCI_VER" -@@ -70804,7 +72857,7 @@ echo "configure:70626: checking Oracle v +@@ -70804,7 +72897,7 @@ echo "configure:70626: checking Oracle v done echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:70808: checking for OCIEnvCreate in -lclntsh" >&5 -+echo "configure:72861: checking for OCIEnvCreate in -lclntsh" >&5 ++echo "configure:72901: checking for OCIEnvCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -70812,7 +72865,7 @@ else +@@ -70812,7 +72905,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:72880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:72920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -70957,7 +73010,7 @@ fi +@@ -70957,7 +73050,7 @@ fi done echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:70961: checking for OCIEnvNlsCreate in -lclntsh" >&5 -+echo "configure:73014: checking for OCIEnvNlsCreate in -lclntsh" >&5 ++echo "configure:73054: checking for OCIEnvNlsCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -70965,7 +73018,7 @@ else +@@ -70965,7 +73058,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71110,7 +73163,7 @@ fi +@@ -71110,7 +73203,7 @@ fi done echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 -echo "configure:71114: checking for OCILobIsTemporary in -lclntsh" >&5 -+echo "configure:73167: checking for OCILobIsTemporary in -lclntsh" >&5 ++echo "configure:73207: checking for OCILobIsTemporary in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71118,7 +73171,7 @@ else +@@ -71118,7 +73211,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71259,7 +73312,7 @@ else +@@ -71259,7 +73352,7 @@ else done echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 -echo "configure:71263: checking for OCILobIsTemporary in -locijdbc8" >&5 -+echo "configure:73316: checking for OCILobIsTemporary in -locijdbc8" >&5 ++echo "configure:73356: checking for OCILobIsTemporary in -locijdbc8" >&5 ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71267,7 +73320,7 @@ else +@@ -71267,7 +73360,7 @@ else ac_save_LIBS="$LIBS" LIBS="-locijdbc8 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71439,7 +73492,7 @@ fi +@@ -71439,7 +73532,7 @@ fi done echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 -echo "configure:71443: checking for OCICollAssign in -lclntsh" >&5 -+echo "configure:73496: checking for OCICollAssign in -lclntsh" >&5 ++echo "configure:73536: checking for OCICollAssign in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71447,7 +73500,7 @@ else +@@ -71447,7 +73540,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71592,7 +73645,7 @@ fi +@@ -71592,7 +73685,7 @@ fi done echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6 -echo "configure:71596: checking for OCIStmtFetch2 in -lclntsh" >&5 -+echo "configure:73649: checking for OCIStmtFetch2 in -lclntsh" >&5 ++echo "configure:73689: checking for OCIStmtFetch2 in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71600,7 +73653,7 @@ else +@@ -71600,7 +73693,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71650,13 +73703,13 @@ fi +@@ -71650,13 +73743,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:71654: checking for PDO includes" >&5 -+echo "configure:73707: checking for PDO includes" >&5 ++echo "configure:73747: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:71660: checking for PDO includes" >&5 -+echo "configure:73713: checking for PDO includes" >&5 ++echo "configure:73753: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -72024,7 +74077,7 @@ fi +@@ -72024,7 +74117,7 @@ fi php_with_pdo_odbc=no echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6 -echo "configure:72028: checking for ODBC v3 support for PDO" >&5 -+echo "configure:74081: checking for ODBC v3 support for PDO" >&5 ++echo "configure:74121: checking for ODBC v3 support for PDO" >&5 # Check whether --with-pdo-odbc or --without-pdo-odbc was given. if test "${with_pdo_odbc+set}" = set; then withval="$with_pdo_odbc" -@@ -72076,13 +74129,13 @@ if test "$PHP_PDO_ODBC" != "no"; then +@@ -72076,13 +74169,13 @@ if test "$PHP_PDO_ODBC" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:72080: checking for PDO includes" >&5 -+echo "configure:74133: checking for PDO includes" >&5 ++echo "configure:74173: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:72086: checking for PDO includes" >&5 -+echo "configure:74139: checking for PDO includes" >&5 ++echo "configure:74179: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -72103,7 +74156,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 +@@ -72103,7 +74196,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6 -echo "configure:72107: checking for selected PDO ODBC flavour" >&5 -+echo "configure:74160: checking for selected PDO ODBC flavour" >&5 ++echo "configure:74200: checking for selected PDO ODBC flavour" >&5 pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`" pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`" -@@ -72182,7 +74235,7 @@ echo "configure:72107: checking for sele +@@ -72182,7 +74275,7 @@ echo "configure:72107: checking for sele echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72186: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74239: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74279: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/odbc.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72196,7 +74249,7 @@ EOF +@@ -72196,7 +74289,7 @@ EOF echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72200: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74253: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74293: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72210,7 +74263,7 @@ EOF +@@ -72210,7 +74303,7 @@ EOF echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72214: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74267: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74307: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72224,7 +74277,7 @@ EOF +@@ -72224,7 +74317,7 @@ EOF echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72228: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74281: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74321: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72238,7 +74291,7 @@ EOF +@@ -72238,7 +74331,7 @@ EOF echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72242: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74295: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74335: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72252,7 +74305,7 @@ EOF +@@ -72252,7 +74345,7 @@ EOF echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72256: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74309: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74349: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72266,7 +74319,7 @@ EOF +@@ -72266,7 +74359,7 @@ EOF echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72270: checking for sql.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74323: checking for sql.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74363: checking for sql.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sql.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72280,7 +74333,7 @@ EOF +@@ -72280,7 +74373,7 @@ EOF echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72284: checking for isql.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74337: checking for isql.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74377: checking for isql.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/isql.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72294,7 +74347,7 @@ EOF +@@ -72294,7 +74387,7 @@ EOF echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72298: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74351: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74391: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72308,7 +74361,7 @@ EOF +@@ -72308,7 +74401,7 @@ EOF echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72312: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74365: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74405: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72322,7 +74375,7 @@ EOF +@@ -72322,7 +74415,7 @@ EOF echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72326: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74379: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74419: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72336,7 +74389,7 @@ EOF +@@ -72336,7 +74429,7 @@ EOF echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72340: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74393: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74433: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72350,7 +74403,7 @@ EOF +@@ -72350,7 +74443,7 @@ EOF echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72354: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74407: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74447: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72364,7 +74417,7 @@ EOF +@@ -72364,7 +74457,7 @@ EOF echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72368: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74421: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74461: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72378,7 +74431,7 @@ EOF +@@ -72378,7 +74471,7 @@ EOF echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72382: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74435: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74475: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72392,7 +74445,7 @@ EOF +@@ -72392,7 +74485,7 @@ EOF echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72396: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74449: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74489: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72406,7 +74459,7 @@ EOF +@@ -72406,7 +74499,7 @@ EOF echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72410: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74463: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74503: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72420,7 +74473,7 @@ EOF +@@ -72420,7 +74513,7 @@ EOF echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72424: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74477: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74517: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF -@@ -72626,7 +74679,7 @@ EOF +@@ -72626,7 +74719,7 @@ EOF done echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 -echo "configure:72630: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 -+echo "configure:74683: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 ++echo "configure:74723: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -72634,7 +74687,7 @@ else +@@ -72634,7 +74727,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$pdo_odbc_def_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:74702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:74742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -72760,7 +74813,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -72760,7 +74853,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l done echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 -echo "configure:72764: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 -+echo "configure:74817: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 ++echo "configure:74857: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -72768,7 +74821,7 @@ else +@@ -72768,7 +74861,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$pdo_odbc_def_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:74836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:74876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73153,7 +75206,7 @@ fi +@@ -73153,7 +75246,7 @@ fi php_with_pdo_pgsql=no echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6 -echo "configure:73157: checking for PostgreSQL support for PDO" >&5 -+echo "configure:75210: checking for PostgreSQL support for PDO" >&5 ++echo "configure:75250: checking for PostgreSQL support for PDO" >&5 # Check whether --with-pdo-pgsql or --without-pdo-pgsql was given. if test "${with_pdo_pgsql+set}" = set; then withval="$with_pdo_pgsql" -@@ -73212,7 +75265,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then +@@ -73212,7 +75305,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then echo $ac_n "checking for pg_config""... $ac_c" 1>&6 -echo "configure:73216: checking for pg_config" >&5 -+echo "configure:75269: checking for pg_config" >&5 ++echo "configure:75309: checking for pg_config" >&5 for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config; then PG_CONFIG="$i/pg_config" -@@ -73276,14 +75329,14 @@ EOF +@@ -73276,14 +75369,14 @@ EOF echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 -echo "configure:73280: checking for openssl dependencies" >&5 -+echo "configure:75333: checking for openssl dependencies" >&5 ++echo "configure:75373: checking for openssl dependencies" >&5 grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1 if test $? -eq 0 ; then echo "$ac_t""yes" 1>&6 @@ -16609,948 +16665,683 @@ set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:73287: checking for $ac_word" >&5 -+echo "configure:75340: checking for $ac_word" >&5 ++echo "configure:75380: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -73327,7 +75380,7 @@ fi +@@ -73327,7 +75420,7 @@ fi old_LDFLAGS=$LDFLAGS LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 -echo "configure:73331: checking for PQparameterStatus in -lpq" >&5 -+echo "configure:75384: checking for PQparameterStatus in -lpq" >&5 ++echo "configure:75424: checking for PQparameterStatus in -lpq" >&5 ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73335,7 +75388,7 @@ else +@@ -73335,7 +75428,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73375,7 +75428,7 @@ fi +@@ -73375,7 +75468,7 @@ fi echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 -echo "configure:73379: checking for PQprepare in -lpq" >&5 -+echo "configure:75432: checking for PQprepare in -lpq" >&5 ++echo "configure:75472: checking for PQprepare in -lpq" >&5 ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73383,7 +75436,7 @@ else +@@ -73383,7 +75476,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73418,7 +75471,7 @@ else +@@ -73418,7 +75511,7 @@ else fi echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -echo "configure:73422: checking for PQescapeStringConn in -lpq" >&5 -+echo "configure:75475: checking for PQescapeStringConn in -lpq" >&5 ++echo "configure:75515: checking for PQescapeStringConn in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73426,7 +75479,7 @@ else +@@ -73426,7 +75519,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73461,7 +75514,7 @@ else +@@ -73461,7 +75554,7 @@ else fi echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -echo "configure:73465: checking for PQescapeByteaConn in -lpq" >&5 -+echo "configure:75518: checking for PQescapeByteaConn in -lpq" >&5 ++echo "configure:75558: checking for PQescapeByteaConn in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73469,7 +75522,7 @@ else +@@ -73469,7 +75562,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73505,7 +75558,7 @@ fi +@@ -73505,7 +75598,7 @@ fi echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -echo "configure:73509: checking for pg_encoding_to_char in -lpq" >&5 -+echo "configure:75562: checking for pg_encoding_to_char in -lpq" >&5 ++echo "configure:75602: checking for pg_encoding_to_char in -lpq" >&5 ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73513,7 +75566,7 @@ else +@@ -73513,7 +75606,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73688,13 +75741,13 @@ fi +@@ -73688,13 +75781,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73692: checking for PDO includes" >&5 -+echo "configure:75745: checking for PDO includes" >&5 ++echo "configure:75785: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73698: checking for PDO includes" >&5 -+echo "configure:75751: checking for PDO includes" >&5 ++echo "configure:75791: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -74034,7 +76087,7 @@ fi +@@ -74034,7 +76127,7 @@ fi php_with_pdo_sqlite=$PHP_PDO echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6 -echo "configure:74038: checking for sqlite 3 support for PDO" >&5 -+echo "configure:76091: checking for sqlite 3 support for PDO" >&5 ++echo "configure:76131: checking for sqlite 3 support for PDO" >&5 # Check whether --with-pdo-sqlite or --without-pdo-sqlite was given. if test "${with_pdo_sqlite+set}" = set; then withval="$with_pdo_sqlite" -@@ -74083,13 +76136,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then +@@ -74083,13 +76176,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:74087: checking for PDO includes" >&5 -+echo "configure:76140: checking for PDO includes" >&5 ++echo "configure:76180: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:74093: checking for PDO includes" >&5 -+echo "configure:76146: checking for PDO includes" >&5 ++echo "configure:76186: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -74118,7 +76171,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 +@@ -74118,7 +76211,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 PDO_SQLITE_DIR=$PHP_PDO_SQLITE else # search default path list echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 -echo "configure:74122: checking for sqlite3 files in default path" >&5 -+echo "configure:76175: checking for sqlite3 files in default path" >&5 ++echo "configure:76215: checking for sqlite3 files in default path" >&5 for i in $SEARCH_PATH ; do if test -r $i/$SEARCH_FOR; then PDO_SQLITE_DIR=$i -@@ -74264,7 +76317,7 @@ echo "configure:74122: checking for sqli +@@ -74264,7 +76357,7 @@ echo "configure:74122: checking for sqli done echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:74268: checking for $LIBSYMBOL in -l$LIBNAME" >&5 -+echo "configure:76321: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ++echo "configure:76361: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -74272,7 +76325,7 @@ else +@@ -74272,7 +76365,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:76340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:76380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -74513,7 +76566,7 @@ fi +@@ -74513,7 +76606,7 @@ fi done echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 -echo "configure:74517: checking for sqlite3_key in -lsqlite3" >&5 -+echo "configure:76570: checking for sqlite3_key in -lsqlite3" >&5 ++echo "configure:76610: checking for sqlite3_key in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -74521,7 +76574,7 @@ else +@@ -74521,7 +76614,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:76589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:76629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75273,12 +77326,12 @@ but you've either not enabled sqlite3, o +@@ -75273,12 +77366,12 @@ but you've either not enabled sqlite3, o for ac_func in usleep nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:75277: checking for $ac_func" >&5 -+echo "configure:77330: checking for $ac_func" >&5 ++echo "configure:77370: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -75329,17 +77382,17 @@ done +@@ -75329,17 +77422,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:75333: checking for $ac_hdr" >&5 -+echo "configure:77386: checking for $ac_hdr" >&5 ++echo "configure:77426: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:75343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:77396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:77436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -75463,7 +77516,7 @@ done +@@ -75463,7 +77556,7 @@ done done echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6 -echo "configure:75467: checking for fdatasync in -lrt" >&5 -+echo "configure:77520: checking for fdatasync in -lrt" >&5 ++echo "configure:77560: checking for fdatasync in -lrt" >&5 ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75471,7 +77524,7 @@ else +@@ -75471,7 +77564,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75563,7 +77616,7 @@ fi +@@ -75563,7 +77656,7 @@ fi php_with_pgsql=no echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 -echo "configure:75567: checking for PostgreSQL support" >&5 -+echo "configure:77620: checking for PostgreSQL support" >&5 ++echo "configure:77660: checking for PostgreSQL support" >&5 # Check whether --with-pgsql or --without-pgsql was given. if test "${with_pgsql+set}" = set; then withval="$with_pgsql" -@@ -75617,7 +77670,7 @@ if test "$PHP_PGSQL" != "no"; then +@@ -75617,7 +77710,7 @@ if test "$PHP_PGSQL" != "no"; then echo $ac_n "checking for pg_config""... $ac_c" 1>&6 -echo "configure:75621: checking for pg_config" >&5 -+echo "configure:77674: checking for pg_config" >&5 ++echo "configure:77714: checking for pg_config" >&5 for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config; then PG_CONFIG="$i/pg_config" -@@ -75685,7 +77738,7 @@ EOF +@@ -75685,7 +77778,7 @@ EOF old_LDFLAGS=$LDFLAGS LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 -echo "configure:75689: checking for PQescapeString in -lpq" >&5 -+echo "configure:77742: checking for PQescapeString in -lpq" >&5 ++echo "configure:77782: checking for PQescapeString in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75693,7 +77746,7 @@ else +@@ -75693,7 +77786,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75728,7 +77781,7 @@ else +@@ -75728,7 +77821,7 @@ else fi echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 -echo "configure:75732: checking for PQunescapeBytea in -lpq" >&5 -+echo "configure:77785: checking for PQunescapeBytea in -lpq" >&5 ++echo "configure:77825: checking for PQunescapeBytea in -lpq" >&5 ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75736,7 +77789,7 @@ else +@@ -75736,7 +77829,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75771,7 +77824,7 @@ else +@@ -75771,7 +77864,7 @@ else fi echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 -echo "configure:75775: checking for PQsetnonblocking in -lpq" >&5 -+echo "configure:77828: checking for PQsetnonblocking in -lpq" >&5 ++echo "configure:77868: checking for PQsetnonblocking in -lpq" >&5 ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75779,7 +77832,7 @@ else +@@ -75779,7 +77872,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75814,7 +77867,7 @@ else +@@ -75814,7 +77907,7 @@ else fi echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 -echo "configure:75818: checking for PQcmdTuples in -lpq" >&5 -+echo "configure:77871: checking for PQcmdTuples in -lpq" >&5 ++echo "configure:77911: checking for PQcmdTuples in -lpq" >&5 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75822,7 +77875,7 @@ else +@@ -75822,7 +77915,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75857,7 +77910,7 @@ else +@@ -75857,7 +77950,7 @@ else fi echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 -echo "configure:75861: checking for PQoidValue in -lpq" >&5 -+echo "configure:77914: checking for PQoidValue in -lpq" >&5 ++echo "configure:77954: checking for PQoidValue in -lpq" >&5 ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75865,7 +77918,7 @@ else +@@ -75865,7 +77958,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75900,7 +77953,7 @@ else +@@ -75900,7 +77993,7 @@ else fi echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 -echo "configure:75904: checking for PQclientEncoding in -lpq" >&5 -+echo "configure:77957: checking for PQclientEncoding in -lpq" >&5 ++echo "configure:77997: checking for PQclientEncoding in -lpq" >&5 ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75908,7 +77961,7 @@ else +@@ -75908,7 +78001,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75943,7 +77996,7 @@ else +@@ -75943,7 +78036,7 @@ else fi echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 -echo "configure:75947: checking for PQparameterStatus in -lpq" >&5 -+echo "configure:78000: checking for PQparameterStatus in -lpq" >&5 ++echo "configure:78040: checking for PQparameterStatus in -lpq" >&5 ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75951,7 +78004,7 @@ else +@@ -75951,7 +78044,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75986,7 +78039,7 @@ else +@@ -75986,7 +78079,7 @@ else fi echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 -echo "configure:75990: checking for PQprotocolVersion in -lpq" >&5 -+echo "configure:78043: checking for PQprotocolVersion in -lpq" >&5 ++echo "configure:78083: checking for PQprotocolVersion in -lpq" >&5 ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75994,7 +78047,7 @@ else +@@ -75994,7 +78087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -76029,7 +78082,7 @@ else +@@ -76029,7 +78122,7 @@ else fi echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 -echo "configure:76033: checking for PQtransactionStatus in -lpq" >&5 -+echo "configure:78086: checking for PQtransactionStatus in -lpq" >&5 ++echo "configure:78126: checking for PQtransactionStatus in -lpq" >&5 ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76037,7 +78090,7 @@ else +@@ -76037,7 +78130,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -76072,7 +78125,7 @@ else +@@ -76072,7 +78165,7 @@ else fi echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6 -echo "configure:76076: checking for PQexecParams in -lpq" >&5 -+echo "configure:78129: checking for PQexecParams in -lpq" >&5 ++echo "configure:78169: checking for PQexecParams in -lpq" >&5 ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76080,7 +78133,7 @@ else +@@ -76080,7 +78173,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76115,7 +78168,7 @@ else - fi - - echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 --echo "configure:76119: checking for PQprepare in -lpq" >&5 -+echo "configure:78172: checking for PQprepare in -lpq" >&5 - ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76123,7 +78176,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76158,7 +78211,7 @@ else - fi - - echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 --echo "configure:76162: checking for PQexecPrepared in -lpq" >&5 -+echo "configure:78215: checking for PQexecPrepared in -lpq" >&5 - ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76166,7 +78219,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76201,7 +78254,7 @@ else - fi - - echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 --echo "configure:76205: checking for PQresultErrorField in -lpq" >&5 -+echo "configure:78258: checking for PQresultErrorField in -lpq" >&5 - ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76209,7 +78262,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76244,7 +78297,7 @@ else - fi - - echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 --echo "configure:76248: checking for PQsendQueryParams in -lpq" >&5 -+echo "configure:78301: checking for PQsendQueryParams in -lpq" >&5 - ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76252,7 +78305,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76287,7 +78340,7 @@ else - fi - - echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 --echo "configure:76291: checking for PQsendPrepare in -lpq" >&5 -+echo "configure:78344: checking for PQsendPrepare in -lpq" >&5 - ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76295,7 +78348,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76330,7 +78383,7 @@ else - fi - - echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 --echo "configure:76334: checking for PQsendQueryPrepared in -lpq" >&5 -+echo "configure:78387: checking for PQsendQueryPrepared in -lpq" >&5 - ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76338,7 +78391,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76373,7 +78426,7 @@ else - fi - - echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 --echo "configure:76377: checking for PQputCopyData in -lpq" >&5 -+echo "configure:78430: checking for PQputCopyData in -lpq" >&5 - ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76381,7 +78434,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76416,7 +78469,7 @@ else - fi - - echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 --echo "configure:76420: checking for PQputCopyEnd in -lpq" >&5 -+echo "configure:78473: checking for PQputCopyEnd in -lpq" >&5 - ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76424,7 +78477,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76459,7 +78512,7 @@ else - fi - - echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 --echo "configure:76463: checking for PQgetCopyData in -lpq" >&5 -+echo "configure:78516: checking for PQgetCopyData in -lpq" >&5 - ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76467,7 +78520,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76502,7 +78555,7 @@ else - fi - - echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 --echo "configure:76506: checking for PQfreemem in -lpq" >&5 -+echo "configure:78559: checking for PQfreemem in -lpq" >&5 - ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76510,7 +78563,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -76545,7 +78598,7 @@ else - fi - - echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 --echo "configure:76549: checking for PQsetErrorVerbosity in -lpq" >&5 -+echo "configure:78602: checking for PQsetErrorVerbosity in -lpq" >&5 - ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76553,7 +78606,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lpq $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -76576,425 +78629,5435 @@ fi - rm -f conftest* - LIBS="$ac_save_LIBS" --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQSETERRORVERBOSITY 1 --EOF +-else +- echo "$ac_t""no" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 ++echo "configure:78212: checking for PQprepare in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF -+#define HAVE_PQSETERRORVERBOSITY 1 ++#define HAVE_PQPREPARE 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + -+ echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 -+echo "configure:78645: checking for PQftable in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 ++echo "configure:78255: checking for PQexecPrepared in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17566,34 +17357,34 @@ +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF -+#define HAVE_PQFTABLE 1 ++#define HAVE_PQEXECPREPARED 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + -+ echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -+echo "configure:78688: checking for PQescapeStringConn in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 ++echo "configure:78298: checking for PQresultErrorField in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17609,34 +17400,34 @@ +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF -+#define HAVE_PQESCAPE_CONN 1 ++#define HAVE_PQRESULTERRORFIELD 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + -+ echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -+echo "configure:78731: checking for PQescapeByteaConn in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 ++echo "configure:78341: checking for PQsendQueryParams in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17652,34 +17443,34 @@ +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF -+#define HAVE_PQESCAPE_BYTEA_CONN 1 ++#define HAVE_PQSENDQUERYPARAMS 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + -+ echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -+echo "configure:78774: checking for pg_encoding_to_char in -lpq" >&5 -+ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 ++echo "configure:78384: checking for PQsendPrepare in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17695,34 +17486,34 @@ +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF -+#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 ++#define HAVE_PQSENDPREPARE 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + -+ echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 -+echo "configure:78817: checking for lo_create in -lpq" >&5 -+ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 ++echo "configure:78427: checking for PQsendQueryPrepared in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17738,34 +17529,34 @@ +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF -+#define HAVE_PG_LO_CREATE 1 ++#define HAVE_PQSENDQUERYPREPARED 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + -+ echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 -+echo "configure:78860: checking for lo_import_with_oid in -lpq" >&5 -+ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 ++echo "configure:78470: checking for PQputCopyData in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17781,102 +17572,532 @@ +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF -+#define HAVE_PG_LO_IMPORT_WITH_OID 1 ++#define HAVE_PQPUTCOPYDATA 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + -+ LIBS=$old_LIBS -+ LDFLAGS=$old_LDFLAGS ++ echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 ++echo "configure:78513: checking for PQputCopyEnd in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + -+ if test "$ext_shared" = "yes"; then -+ PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" -+ if test -n "$PGSQL_LIBDIR"; then -+ -+ if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PGSQL_LIBDIR -+ else -+ -+ ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -+ fi ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PQPUTCOPYEND 1 ++EOF + -+ -+ if test "$ext_shared" = "yes"; then -+ PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi ++else ++ echo "$ac_t""no" 1>&6 ++fi + ++ echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 ++echo "configure:78556: checking for PQgetCopyData in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + -+ fi -+ else -+ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PQGETCOPYDATA 1 ++EOF + -+ if test -n "$PGSQL_LIBDIR"; then -+ -+ if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PGSQL_LIBDIR -+ else -+ -+ ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -+ fi ++else ++ echo "$ac_t""no" 1>&6 ++fi + -+ -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi ++ echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 ++echo "configure:78599: checking for PQfreemem in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + -+ -+ fi ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PQFREEMEM 1 ++EOF + -+ fi -+ -+ -+ case pq in -+ c|c_r|pthread*) ;; ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 ++echo "configure:78642: checking for PQsetErrorVerbosity in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PQSETERRORVERBOSITY 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 ++echo "configure:78685: checking for PQftable in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PQFTABLE 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 ++echo "configure:78728: checking for PQescapeStringConn in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PQESCAPE_CONN 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 ++echo "configure:78771: checking for PQescapeByteaConn in -lpq" >&5 ++ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PQESCAPE_BYTEA_CONN 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 ++echo "configure:78814: checking for pg_encoding_to_char in -lpq" >&5 ++ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 ++echo "configure:78857: checking for lo_create in -lpq" >&5 ++ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PG_LO_CREATE 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 ++echo "configure:78900: checking for lo_import_with_oid in -lpq" >&5 ++ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpq $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PG_LO_IMPORT_WITH_OID 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ LIBS=$old_LIBS ++ LDFLAGS=$old_LDFLAGS ++ ++ ++ ++ if test "$ext_shared" = "yes"; then ++ PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" ++ if test -n "$PGSQL_LIBDIR"; then ++ ++ if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PGSQL_LIBDIR ++ else ++ ++ ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ fi ++ else ++ ++ ++ if test -n "$PGSQL_LIBDIR"; then ++ ++ if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PGSQL_LIBDIR ++ else ++ ++ ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" ++ fi ++ ++ ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ ++ fi ++ ++ fi ++ ++ ++ case pq in ++ c|c_r|pthread*) ;; + *) + LIBS="-lpq $LIBS" + ;; @@ -18225,7 +18446,7 @@ +php_enable_phar=yes + +echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 -+echo "configure:79339: checking for phar archive support" >&5 ++echo "configure:79379: checking for phar archive support" >&5 +# Check whether --enable-phar or --disable-phar was given. +if test "${enable_phar+set}" = set; then + enableval="$enable_phar" @@ -18559,7 +18780,7 @@ + fi + + echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6 -+echo "configure:79673: checking for phar openssl support" >&5 ++echo "configure:79713: checking for phar openssl support" >&5 + if test "$PHP_HASH_SHARED" != "yes"; then + if test "$PHP_HASH" != "no"; then + cat >> confdefs.h <<\EOF @@ -18627,27 +18848,100 @@ + ac_builddir=$ext_builddir + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + -+fi -+ -+ -+ + fi + +- echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 +-echo "configure:76119: checking for PQprepare in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQPREPARE 1 +-EOF +php_enable_posix=yes -+ + +echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 -+echo "configure:79748: checking whether to enable POSIX-like functions" >&5 ++echo "configure:79788: checking whether to enable POSIX-like functions" >&5 +# Check whether --enable-posix or --disable-posix was given. +if test "${enable_posix+set}" = set; then + enableval="$enable_posix" + PHP_POSIX=$enableval -+else + else +- echo "$ac_t""no" 1>&6 + + PHP_POSIX=yes + test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL + -+fi -+ -+ -+ + fi + +- echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 +-echo "configure:76162: checking for PQexecPrepared in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQEXECPREPARED 1 +-EOF +ext_output="yes, shared" +ext_shared=yes +case $PHP_POSIX in @@ -18666,25 +18960,95 @@ + ext_shared=no + ;; +esac -+ -+ -+ + +-else +- echo "$ac_t""no" 1>&6 +-fi + +- echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 +-echo "configure:76205: checking for PQresultErrorField in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +echo "$ac_t""$ext_output" 1>&6 -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 + + + +if test "$PHP_POSIX" = "yes"; then -+ cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF +-#define HAVE_PQRESULTERRORFIELD 1 +#define HAVE_POSIX 1 -+EOF -+ + EOF + +-else +- echo "$ac_t""no" 1>&6 +-fi + + ext_builddir=ext/posix + ext_srcdir=$abs_srcdir/ext/posix -+ + +- echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 +-echo "configure:76248: checking for PQsendQueryParams in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_POSIX_SHARED=no + @@ -18696,7 +19060,13 @@ + esac + + -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQSENDQUERYPARAMS 1 +-EOF + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -18704,8 +19074,26 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -+ -+ + +-else +- echo "$ac_t""no" 1>&6 +-fi + +- echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 +-echo "configure:76291: checking for PQsendPrepare in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQSENDPREPARE 1 + cat >>Makefile.objects<&6 +-fi + +- echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 +-echo "configure:76334: checking for PQsendQueryPrepared in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + b_c_pre=$shared_c_pre + b_cxx_pre=$shared_cxx_pre + b_c_meta=$shared_c_meta @@ -18753,8 +19194,17 @@ + b_c_post=$shared_c_post + b_cxx_post=$shared_cxx_post + b_lo=$shared_lo -+ -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQSENDQUERYPREPARED 1 +-EOF + +-else +- echo "$ac_t""no" 1>&6 +-fi + old_IFS=$IFS + for ac_src in posix.c; do + @@ -18764,25 +19214,63 @@ + IFS=$old_IFS + + shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" -+ + +- echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 +-echo "configure:76377: checking for PQputCopyData in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + done -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQPUTCOPYDATA 1 +-EOF + case $host_alias in + *netware*) + + install_modules="install-modules" -+ + +-else +- echo "$ac_t""no" 1>&6 +-fi + case $host_alias in + *aix*) + suffix=so @@ -18797,7 +19285,22 @@ + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(PHPPOSIX_SHARED_LIBADD)' + ;; + esac -+ + +- echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 +-echo "configure:76420: checking for PQputCopyEnd in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + cat >>Makefile.objects<&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQPUTCOPYEND 1 + EOF + +-else +- echo "$ac_t""no" 1>&6 +-fi + ;; + *) + + install_modules="install-modules" -+ + +- echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 +-echo "configure:76463: checking for PQgetCopyData in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQGETCOPYDATA 1 + ;; + esac + cat >> confdefs.h <&6 +-fi + fi + fi + @@ -18882,8 +19445,38 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -+ -+ + +- echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 +-echo "configure:76506: checking for PQfreemem in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + old_IFS=$IFS + for ac_src in posix.c; do + @@ -18893,7 +19486,12 @@ + IFS=$old_IFS + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQFREEMEM 1 + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -18904,10 +19502,28 @@ + cat >>Makefile.objects<&6 +-fi + +- echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 +-echo "configure:76549: checking for PQsetErrorVerbosity in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -18928,8 +19559,17 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -+ -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQSETERRORVERBOSITY 1 +-EOF + +-else +- echo "$ac_t""no" 1>&6 +-fi + old_IFS=$IFS + for ac_src in posix.c; do + @@ -18939,21 +19579,59 @@ + IFS=$old_IFS + + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ + +- echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 +-echo "configure:76592: checking for PQftable in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + done -+ -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQFTABLE 1 +-EOF + +-else +- echo "$ac_t""no" 1>&6 +-fi + ;; + esac + EXT_CLI_STATIC="$EXT_CLI_STATIC posix" @@ -18962,76 +19640,150 @@ + + BUILD_DIR="$BUILD_DIR $ext_builddir" + -+ -+ + +- echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 +-echo "configure:76635: checking for PQescapeStringConn in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=posix + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQESCAPE_CONN 1 +-EOF + fi -+ -+ + +-else +- echo "$ac_t""no" 1>&6 +-fi + +- echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 +-echo "configure:76678: checking for PQescapeByteaConn in -lpq" >&5 +-ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + for ac_hdr in sys/mkdev.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:80090: checking for $ac_hdr" >&5 ++echo "configure:80130: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext < conftest.$ac_ext < -+EOF + EOF +-if { (eval echo configure:76697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:80100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:80140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then -+ rm -rf conftest* + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_header_$ac_safe=yes" -+else + else + echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi + fi + rm -f conftest* +-LIBS="$ac_save_LIBS" +- + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PQESCAPE_BYTEA_CONN 1 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 -+fi + else + echo "$ac_t""no" 1>&6 + fi +done -+ + +- echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 +-echo "configure:76721: checking for pg_encoding_to_char in -lpq" >&5 +-ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + + for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:80130: checking for $ac_func" >&5 ++echo "configure:80170: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext < conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char pg_encoding_to_char(); +char $ac_func(); -+ -+int main() { + + int main() { +-pg_encoding_to_char() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -19042,44 +19794,69 @@ +$ac_func(); +#endif + -+; return 0; } -+EOF -+if { (eval echo configure:80158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* + ; return 0; } + EOF +-if { (eval echo configure:76740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_$ac_func=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi + fi + rm -f conftest* +-LIBS="$ac_save_LIBS" +- + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 -+fi + else + echo "$ac_t""no" 1>&6 + fi +done -+ + +- echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 +-echo "configure:76764: checking for lo_create in -lpq" >&5 +-ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 + + echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 -+echo "configure:80184: checking for working ttyname_r() implementation" >&5 ++echo "configure:80224: checking for working ttyname_r() implementation" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 + -+else + else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext < conftest.$ac_ext < + +int main(int argc, char *argv[]) @@ -19089,8 +19866,11 @@ + return ttyname_r(0, buf, 64) ? 1 : 0; +} + -+EOF -+if { (eval echo configure:80204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + EOF +-if { (eval echo configure:76783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++if { (eval echo configure:80244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + echo "$ac_t""yes" 1>&6 @@ -19099,69 +19879,197 @@ +EOF + + -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" + rm -fr conftest* + + echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 + -+fi + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +rm -fr conftest* -+fi -+ -+ + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PG_LO_CREATE 1 +-EOF + +-else +- echo "$ac_t""no" 1>&6 +-fi + +- echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 +-echo "configure:76807: checking for lo_import_with_oid in -lpq" >&5 +-ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 -+echo "configure:80226: checking for utsname.domainname" >&5 ++echo "configure:80266: checking for utsname.domainname" >&5 +if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lpq $LIBS" +-cat > conftest.$ac_ext < conftest.$ac_ext < + -+int main() { + int main() { +-lo_import_with_oid() + + return sizeof(((struct utsname *)0)->domainname); + -+; return 0; } -+EOF -+if { (eval echo configure:80244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* + ; return 0; } + EOF +-if { (eval echo configure:76826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" + + ac_cv_have_utsname_domainname=yes + -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_PG_LO_IMPORT_WITH_OID 1 +-EOF +- +-else +- echo "$ac_t""no" 1>&6 +-fi +- +- LIBS=$old_LIBS +- LDFLAGS=$old_LDFLAGS +- +- +- +- if test "$ext_shared" = "yes"; then +- PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" +- if test -n "$PGSQL_LIBDIR"; then +- +- if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then +- +- if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PGSQL_LIBDIR +- else +- +- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" +- fi +- +- +- if test "$ext_shared" = "yes"; then +- PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD" +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" + ac_cv_have_utsname_domainname=no -+ + +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +fi +rm -f conftest* -+ + +- fi +- +- +- fi +- +- fi +- +- fi +- else +- +fi -+ + +- if test -n "$PGSQL_LIBDIR"; then +- +- if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then +- +- if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PGSQL_LIBDIR +- else +- +- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" +- fi +echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6 + if test "$ac_cv_have_utsname_domainname" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_UTSNAME_DOMAINNAME 1 +EOF -+ -+ fi + +- +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +- + fi +fi -+ -+ -+ + + +- +- fi + +- fi +- +- +- case pq in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lpq $LIBS" +- ;; +- esac +php_with_pspell=no -+ + +echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 -+echo "configure:80275: checking for PSPELL support" >&5 ++echo "configure:80315: checking for PSPELL support" >&5 +# Check whether --with-pspell or --without-pspell was given. +if test "${with_pspell+set}" = set; then + withval="$with_pspell" @@ -19170,11 +20078,12 @@ + + PHP_PSPELL=no + test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL -+ + +fi -+ -+ -+ + + +- fi + +ext_output="yes, shared" +ext_shared=yes +case $PHP_PSPELL in @@ -19193,251 +20102,254 @@ + ext_shared=no + ;; +esac -+ -+ -+ + +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD" + + +- +- if test "$PGSQL_INCLUDE" != "/usr/include"; then +- +- if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then +- ai_p=$PGSQL_INCLUDE +- else +- +- ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" +- fi +echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ + +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi + +- fi + + +- +- ext_builddir=ext/pgsql +- ext_srcdir=$abs_srcdir/ext/pgsql +if test "$PHP_PSPELL" != "no"; then + + ext_builddir=ext/pspell + ext_srcdir=$abs_srcdir/ext/pspell -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_PGSQL_SHARED=no + PHP_PSPELL_SHARED=no -+ -+ + + +- case ext/pgsql in + case ext/pspell in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS + esac + + +@@ -77009,7 +80380,7 @@ fi + + + old_IFS=$IFS +- for ac_src in pgsql.c; do + for ac_src in pspell.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects<&6 -+echo "configure:80825: checking for new_aspell_config in -laspell" >&5 ++echo "configure:80865: checking for new_aspell_config in -laspell" >&5 +ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -19719,7 +20631,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-laspell $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -19813,7 +20725,7 @@ + + + -+ + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" @@ -19823,15 +20735,30 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" -+ + + fi -+ -+ + +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo + + + fi -+ + +- old_IFS=$IFS +- for ac_src in pgsql.c; do + fi -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" + + case aspell in + c|c_r|pthread*) ;; @@ -19839,15 +20766,29 @@ + LIBS="-laspell $LIBS" + ;; + esac -+ -+ -+ -+ -+ fi + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + +- cat >>Makefile.objects<&6 + @@ -19855,13 +20796,18 @@ + ext_shared=$save_ext_shared + unset ac_cv_lib_aspell_new_aspell_config + -+ + +- BUILD_DIR="$BUILD_DIR $ext_builddir" +- +fi -+ -+ + + +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=pgsql + + if test "$PSPELL_INCDIR" != "/usr/include"; then -+ + +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then + ai_p=$PSPELL_INCDIR + else @@ -19887,9 +20833,9 @@ + fi + + fi -+ -+ fi -+ + + fi + + + PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD" + @@ -19897,14 +20843,14 @@ +#define HAVE_PSPELL 1 +EOF + -+fi -+ -+ -+ + fi + + + +php_with_libedit=no -+ + +echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 -+echo "configure:81018: checking for libedit readline replacement" >&5 ++echo "configure:81058: checking for libedit readline replacement" >&5 +# Check whether --with-libedit or --without-libedit was given. +if test "${with_libedit+set}" = set; then + withval="$with_libedit" @@ -19913,9 +20859,16 @@ + + PHP_LIBEDIT=no + test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL -+ + +-php_enable_phar=yes +fi -+ + +-echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 +-echo "configure:77286: checking for phar archive support" >&5 +-# Check whether --enable-phar or --disable-phar was given. +-if test "${enable_phar+set}" = set; then +- enableval="$enable_phar" +- PHP_PHAR=$enableval + + +ext_output="yes, shared" @@ -19949,45 +20902,40 @@ +php_with_readline=no + +echo $ac_n "checking for readline support""... $ac_c" 1>&6 -+echo "configure:81063: checking for readline support" >&5 ++echo "configure:81103: checking for readline support" >&5 +# Check whether --with-readline or --without-readline was given. +if test "${with_readline+set}" = set; then + withval="$with_readline" + PHP_READLINE=$withval -+else -+ + else + +- PHP_PHAR=yes +- test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL + PHP_READLINE=no + test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes + + fi + +@@ -77298,12 +81115,12 @@ fi + + ext_output="yes, shared" + ext_shared=yes +-case $PHP_PHAR in +case $PHP_READLINE in -+shared,*) + shared,*) +- PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'` + PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'` -+ ;; -+shared) + ;; + shared) +- PHP_PHAR=yes + PHP_READLINE=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ + ;; + no) + ext_output=no +@@ -77321,764 +81138,1178 @@ echo "$ac_t""$ext_output" 1>&6 + + + +else + php_with_readline=no +fi @@ -20000,8 +20948,11 @@ + if test -z "$READLINE_DIR"; then + { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; } + fi -+ -+ + +-if test "$PHP_PHAR" != "no"; then + +- ext_builddir=ext/phar +- ext_srcdir=$abs_srcdir/ext/phar + if test "$READLINE_DIR/include" != "/usr/include"; then + + if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then @@ -20013,7 +20964,8 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" + fi -+ + +- ac_extra= + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` @@ -20029,13 +20981,15 @@ + fi + + fi -+ + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_PHAR_SHARED=no + fi + + + PHP_READLINE_LIBS="" + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -+echo "configure:81149: checking for tgetent in -lncurses" >&5 ++echo "configure:81189: checking for tgetent in -lncurses" >&5 +ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -20043,7 +20997,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lncurses $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20070,8 +21024,12 @@ +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + -+ -+ + + +- case ext/phar in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + case ncurses in + c|c_r|pthread*) ;; + *) @@ -20090,7 +21048,7 @@ + + fi + ;; -+ esac + esac + + + PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" @@ -20099,7 +21057,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -+echo "configure:81213: checking for tgetent in -ltermcap" >&5 ++echo "configure:81253: checking for tgetent in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -20107,7 +21065,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20143,7 +21101,7 @@ + READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" + else + -+ + + case termcap in + c|c_r|pthread*) ;; + *) @@ -20163,10 +21121,17 @@ + echo "$ac_t""no" 1>&6 +fi + -+ + +fi -+ -+ + +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo + + + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" @@ -20191,20 +21156,27 @@ + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi -+ + +- old_IFS=$IFS +- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else -+ + +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + case $ac_ii in + c|c_r|pthread*) ;; @@ -20212,8 +21184,19 @@ + LIBS="$LIBS -l$ac_ii" + ;; + esac -+ -+ + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + +- cat >>Makefile.objects<&6 -+echo "configure:81379: checking for readline in -lreadline" >&5 ++echo "configure:81419: checking for readline in -lreadline" >&5 +ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -20273,7 +21256,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20341,13 +21324,18 @@ + + fi + -+ + + fi + + fi -+ -+ fi -+ else + +- EXT_STATIC="$EXT_STATIC phar" +- if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC phar" + fi + else +- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_PHAR_SHARED=yes + + + if test -n "$READLINE_DIR/$PHP_LIBDIR"; then @@ -20365,9 +21353,14 @@ + fi + + -+ -+ -+ + +- case ext/phar in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" @@ -20379,13 +21372,35 @@ + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi -+ -+ + +- b_c_pre=$shared_c_pre +- b_cxx_pre=$shared_cxx_pre +- b_c_meta=$shared_c_meta +- b_cxx_meta=$shared_cxx_meta +- b_c_post=$shared_c_post +- b_cxx_post=$shared_cxx_post +- b_lo=$shared_lo + + + fi -+ + +- old_IFS=$IFS +- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do + fi -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + + case readline in + c|c_r|pthread*) ;; @@ -20393,18 +21408,58 @@ + LIBS="-lreadline $LIBS" + ;; + esac -+ -+ -+ -+ -+ fi -+ -+ + +- cat >>Makefile.objects<>Makefile.objects<&6 -+ + +- ;; +- *) +- +- install_modules="install-modules" + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_readline_readline @@ -20413,9 +21468,29 @@ + + +fi -+ -+ -+ + +- case $host_alias in +- *aix*) +- suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phar.so '$ext_builddir'/phar.so' +- ;; +- *netware*) +- suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHAR, 3)_SHARED_LIBADD)' +- ;; +- *) +- suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD)' +- ;; +- esac + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phar.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix" +- fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar" + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS @@ -20439,7 +21514,10 @@ + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi -+ + +- cat >>Makefile.objects<> confdefs.h <&6 -+echo "configure:81627: checking for rl_pending_input in -lreadline" >&5 ++echo "configure:81667: checking for rl_pending_input in -lreadline" >&5 +ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -20521,18 +21639,23 @@ + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +- done +- ++if { (eval echo configure:81686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20543,29 +21666,73 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ + +- EXT_STATIC="$EXT_STATIC phar" +- ;; +- *) +- +- +- case ext/phar in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + -+ + +else + echo "$ac_t""no" 1>&6 -+ + +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- +- +- old_IFS=$IFS +- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_readline_rl_pending_input + + { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; } -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac +- +- cat >>Makefile.objects<&6 +-echo "configure:77620: checking for phar openssl support" >&5 +- if test "$PHP_HASH_SHARED" != "yes"; then +- if test "$PHP_HASH" != "no"; then +- cat >> confdefs.h <<\EOF +-#define PHAR_HASH_OK 1 +-EOF + +- fi + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -20625,24 +21806,79 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii -+ else + else +- echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2 + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ + fi +- if test "$PHP_OPENSSL_SHARED" = "yes"; then +- echo "$ac_t""no (shared openssl)" 1>&6 +- else +- if test "$PHP_OPENSSL" = "yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define PHAR_HAVE_OPENSSL 1 +-EOF + +- else +- echo "$ac_t""no" 1>&6 +- fi +- fi +- +- am_i_shared=$PHP_PHAR_SHARED +- is_it_shared=$PHP_HASH_SHARED +- is_it_enabled=$PHP_HASH +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension phar to build statically, but it +-depends on extension hash, which you've configured to build shared. +-You either need to build phar shared or build hash statically for the +-build to be successful. +-" 1>&2; exit 1; } +- fi +- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then +- { echo "configure: error: +-You've configured extension phar, which depends on extension hash, +-but you've either not enabled hash, or have disabled it. +-" 1>&2; exit 1; } +- fi +- + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + -+ -+ + +- am_i_shared=$PHP_PHAR_SHARED +- is_it_shared=$PHP_SPL_SHARED +- is_it_enabled=$PHP_SPL +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension phar to build statically, but it +-depends on extension spl, which you've configured to build shared. +-You either need to build phar shared or build spl statically for the +-build to be successful. +-" 1>&2; exit 1; } +- fi +- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then +- { echo "configure: error: +-You've configured extension phar, which depends on extension spl, +-but you've either not enabled spl, or have disabled it. +-" 1>&2; exit 1; } +- fi + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + +- src=$ext_srcdir/Makefile.frag +- ac_srcdir=$ext_srcdir +- ac_builddir=$ext_builddir +- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments +- +-fi + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" @@ -20652,37 +21888,47 @@ + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi -+ -+ + + + fi + + fi -+ + +-php_enable_posix=yes + ;; + esac + done -+ + +-echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 +-echo "configure:77695: checking whether to enable POSIX-like functions" >&5 +-# Check whether --enable-posix or --disable-posix was given. +-if test "${enable_posix+set}" = set; then +- enableval="$enable_posix" +- PHP_POSIX=$enableval + echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 -+echo "configure:81777: checking for rl_callback_read_char in -lreadline" >&5 ++echo "configure:81817: checking for rl_callback_read_char in -lreadline" >&5 +ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 -+else + else +- +- PHP_POSIX=yes +- test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20690,10 +21936,10 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -20704,36 +21950,64 @@ + cat >> confdefs.h <<\EOF +#define HAVE_RL_CALLBACK_READ_CHAR 1 +EOF -+ + + + +else + echo "$ac_t""no" 1>&6 -+ + +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_POSIX in +-shared,*) +- PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_POSIX=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac +- + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_readline_rl_callback_read_char + + +fi -+ -+ + + +-echo "$ac_t""$ext_output" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_LIBREADLINE 1 +EOF -+ -+ + + +elif test "$PHP_LIBEDIT" != "no"; then -+ + + for i in $PHP_LIBEDIT /usr/local /usr; do + test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break + done -+ + +-if test "$PHP_POSIX" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_POSIX 1 +-EOF + if test -z "$LIBEDIT_DIR"; then + { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; } + fi -+ -+ + + +- ext_builddir=ext/posix +- ext_srcdir=$abs_srcdir/ext/posix +- +- ac_extra= + if test "$LIBEDIT_DIR/include" != "/usr/include"; then + + if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then @@ -20745,11 +22019,19 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`" + fi -+ -+ -+ + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_POSIX_SHARED=no + + +- case ext/posix in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +- + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" @@ -20761,12 +22043,35 @@ + fi + + fi -+ + +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- + fi -+ -+ + +- old_IFS=$IFS +- for ac_src in posix.c; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -+echo "configure:81880: checking for tgetent in -lncurses" >&5 ++echo "configure:81920: checking for tgetent in -lncurses" >&5 +ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -20774,18 +22079,22 @@ + ac_save_LIBS="$LIBS" +LIBS="-lncurses $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +- done ++if { (eval echo configure:81939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20817,19 +22126,38 @@ + LIBS="-lncurses $LIBS" + ;; + esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -+echo "configure:81943: checking for tgetent in -ltermcap" >&5 + + +- EXT_STATIC="$EXT_STATIC posix" +- if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC posix" + fi +- else +- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_POSIX_SHARED=yes +- +- case ext/posix in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ ;; + esac ++ ++ + +- ++else ++ echo "$ac_t""no" 1>&6 + +- b_c_pre=$shared_c_pre +- b_cxx_pre=$shared_cxx_pre +- b_c_meta=$shared_c_meta +- b_cxx_meta=$shared_cxx_meta +- b_c_post=$shared_c_post +- b_cxx_post=$shared_cxx_post +- b_lo=$shared_lo ++ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 ++echo "configure:81983: checking for tgetent in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -20837,18 +22165,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20859,12 +22187,19 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ + +- old_IFS=$IFS +- for ac_src in posix.c; do +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS + +- shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" + + case termcap in + c|c_r|pthread*) ;; @@ -20880,22 +22215,62 @@ + LIBS="-ltermcap $LIBS" + ;; + esac -+ -+ + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + +- cat >>Makefile.objects<&6 +fi -+ -+ + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpposix.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix" +- fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" +fi -+ -+ + +- cat >>Makefile.objects</dev/null ; then + ai_p=$ac_ii -+ else + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix" + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi + fi + + + if test "$ext_shared" = "yes"; then @@ -20970,7 +22366,8 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + -+ + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + @@ -20983,18 +22380,28 @@ + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi -+ -+ + +- cat >>Makefile.objects<> confdefs.h <&6 -+echo "configure:82108: checking for readline in -ledit" >&5 ++echo "configure:82148: checking for readline in -ledit" >&5 +ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -21002,7 +22409,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-ledit $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF ++if { (eval echo configure:82167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -21024,7 +22431,8 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ + +- fi +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -21048,18 +22456,39 @@ + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" -+ fi -+ + fi + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_POSIX_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) + + if test "$ext_shared" = "yes"; then + READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" + test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" + else -+ -+ -+ + + +- case ext/posix in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + +- +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- +- +- old_IFS=$IFS +- for ac_src in posix.c; do + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" @@ -21067,18 +22496,39 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + fi -+ -+ + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + +- cat >>Makefile.objects<>Makefile.objects<&6 -+ + +- +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=posix + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_edit_readline -+ + +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +- +- fi + { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; } + + +fi -+ -+ + + +- for ac_hdr in sys/mkdev.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:78037: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:78047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_LIBEDIT 1 -+EOF -+ + EOF +- +-else +- echo "$ac_t""no" 1>&6 +-fi +-done + +fi -+ + +- for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r +if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then + for ac_func in rl_completion_matches -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:82268: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:82296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ -+ ext_builddir=ext/readline -+ ext_srcdir=$abs_srcdir/ext/readline -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then -+ PHP_READLINE_SHARED=no -+ -+ -+ case ext/readline in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in readline.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<&6 +-echo "configure:78077: checking for $ac_func" >&5 ++echo "configure:82308: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -78125,154 +82356,20 @@ else + fi + done + +- +- echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 +-echo "configure:78131: checking for working ttyname_r() implementation" >&5 +- if test "$cross_compiling" = yes; then +- +- echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 +- +-else +- cat > conftest.$ac_ext < +- +-int main(int argc, char *argv[]) +-{ +- char buf[64]; +- +- return ttyname_r(0, buf, 64) ? 1 : 0; +-} +- +-EOF +-if { (eval echo configure:78151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_TTYNAME_R 1 +-EOF +- +- +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- +- echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 +- +-fi +-rm -fr conftest* +-fi +- +- +- echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 +-echo "configure:78173: checking for utsname.domainname" >&5 +-if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- +- cat > conftest.$ac_ext < +- +-int main() { +- +- return sizeof(((struct utsname *)0)->domainname); +- +-; return 0; } +-EOF +-if { (eval echo configure:78191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- +- ac_cv_have_utsname_domainname=yes +- +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- +- ac_cv_have_utsname_domainname=no +- +-fi +-rm -f conftest* +- +-fi +- +-echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6 +- if test "$ac_cv_have_utsname_domainname" = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_UTSNAME_DOMAINNAME 1 +-EOF +- +- fi +-fi +- +- +- +-php_with_pspell=no +- +-echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 +-echo "configure:78222: checking for PSPELL support" >&5 +-# Check whether --with-pspell or --without-pspell was given. +-if test "${with_pspell+set}" = set; then +- withval="$with_pspell" +- PHP_PSPELL=$withval +-else + +- PHP_PSPELL=no +- test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL +- +-fi +- +- +- +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_PSPELL in +-shared,*) +- PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_PSPELL=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac +- +- +- +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +-if test "$PHP_PSPELL" != "no"; then +- +- ext_builddir=ext/pspell +- ext_srcdir=$abs_srcdir/ext/pspell ++ ext_builddir=ext/readline ++ ext_srcdir=$abs_srcdir/ext/readline + + ac_extra= + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_PSPELL_SHARED=no ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then ++ PHP_READLINE_SHARED=no + + +- case ext/pspell in ++ case ext/readline in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -78287,7 +82384,7 @@ if test "$PHP_PSPELL" != "no"; then + + + old_IFS=$IFS +- for ac_src in pspell.c; do ++ for ac_src in readline.c; do + + IFS=. + set $ac_src +@@ -78310,18 +82407,18 @@ EOF + done + + +- EXT_STATIC="$EXT_STATIC pspell" ++ EXT_STATIC="$EXT_STATIC readline" + if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC pspell" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC readline" + fi + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_PSPELL_SHARED=yes ++ PHP_READLINE_SHARED=yes + +- case ext/pspell in ++ case ext/readline in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -78336,14 +82433,14 @@ EOF + + + old_IFS=$IFS +- for ac_src in pspell.c; do ++ for ac_src in readline.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + +- shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo" ++ shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +@@ -78366,31 +82463,31 @@ EOF + case $host_alias in + *aix*) + suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppspell.so '$ext_builddir'/phppspell.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreadline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreadline.so '$ext_builddir'/phpreadline.so' + ;; + *netware*) + suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la + ;; + *) + suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD)' -+ ;; -+ esac -+ -+ if test "x" = "xyes"; then + ;; + esac + + if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix" -+ else + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix" -+ fi -+ + fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects<>Makefile.objects<&2; exit 1; } +- fi ++fi + +- PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR + +- + +- if test "$ext_shared" = "yes"; then +- PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD" +- if test -n "$PSPELL_LIBDIR"; then +- +- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then +- +- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PSPELL_LIBDIR +- else +- +- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" +- fi ++php_with_recode=no + +- +- if test "$ext_shared" = "yes"; then +- PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +echo $ac_n "checking for recode support""... $ac_c" 1>&6 -+echo "configure:82622: checking for recode support" >&5 ++echo "configure:82662: checking for recode support" >&5 +# Check whether --with-recode or --without-recode was given. +if test "${with_recode+set}" = set; then + withval="$with_recode" + PHP_RECODE=$withval +else -+ + +- fi +- + PHP_RECODE=no + test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL -+ + +- fi +- +- fi +fi -+ -+ -+ + +- fi +- else +- + +- if test -n "$PSPELL_LIBDIR"; then +- +- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then +- +- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PSPELL_LIBDIR +- else +- +- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" +- fi + +- +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +- +- fi +ext_output="yes, shared" +ext_shared=yes +case $PHP_RECODE in @@ -21540,17 +23215,29 @@ + ext_shared=no + ;; +esac -+ -+ -+ + + +- +- fi + +- fi +- +- +- case pspell in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lpspell $LIBS" +- ;; +- esac +echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ + + + + +- fi +if test "$PHP_RECODE" != "no"; then + RECODE_LIST="$PHP_RECODE /usr/local /usr /opt" -+ + + for i in $RECODE_LIST; do + if test -f $i/include/recode.h; then + RECODE_DIR=$i @@ -21569,3276 +23256,263 @@ + fi + test -n "$RECODE_DIR" && break + done -+ + + if test -z "$RECODE_DIR"; then + { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; } + fi -+ + +- + -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" +- -L$PSPELL_LIBDIR +- " + -L$RECODE_DIR/$RECODE_LIB + " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi -+ -+ -+ fi -+ -+ fi -+ -+ ;; -+ esac -+ done -+ + + save_ext_shared=$ext_shared + ext_shared=yes +@@ -78767,27 +82821,27 @@ EOF + esac + done + +- echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 +-echo "configure:78772: checking for new_aspell_config in -laspell" >&5 +-ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` + echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 -+echo "configure:82786: checking for recode_format_table in -lrecode" >&5 ++echo "configure:82826: checking for recode_format_table in -lrecode" >&5 +ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-laspell $LIBS" +LIBS="-lrecode $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then -+ -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -+ -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB -+ else -+ -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi -+ -+ -+ fi -+ -+ fi -+ -+ fi -+ else -+ -+ -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then -+ -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -+ -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB -+ else -+ -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -+ fi -+ -+ -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi -+ -+ -+ -+ fi -+ -+ fi -+ -+ -+ case recode in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lrecode $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_recode_recode_format_table -+ -+ old_LDFLAGS=$LDFLAGS -+ old_LIBS=$LIBS -+ LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" -+ LIBS="$LIBS -lrecode" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -78806,28 +82860,28 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + +- + -+; return 0; } -+EOF -+if { (eval echo configure:82946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ -+ -+ -+ if test "$ext_shared" = "yes"; then + + if test "$ext_shared" = "yes"; then +- PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD" +- if test -n "$PSPELL_LIBDIR"; then + RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" + if test -n "$RECODE_DIR/$RECODE_LIB"; then -+ + +- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -+ + +- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PSPELL_LIBDIR + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then + ai_p=$RECODE_DIR/$RECODE_LIB -+ else -+ + else + +- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" + ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then + fi + + + if test "$ext_shared" = "yes"; then +- PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" + RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" + test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi -+ -+ -+ fi -+ -+ fi -+ -+ fi -+ else -+ -+ -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then -+ -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -+ -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB -+ else -+ -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -+ fi -+ -+ -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi -+ -+ -+ -+ fi -+ -+ fi -+ -+ -+ case recode in -+ c|c_r|pthread*) ;; -+ *) -+ DLIBS="-lrecode $DLIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_BROKEN_RECODE 1 -+EOF -+ -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+ { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } -+ -+fi -+rm -f conftest* -+ LIBS=$old_LIBS -+ LDFLAGS=$old_LDFLAGS -+ -+ -+fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRECODE 1 -+EOF -+ -+ -+ if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then -+ -+ if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_INC -+ else -+ -+ ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" -+ -+ for ac_hdr in stdbool.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:83109: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:83119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ -+ ext_builddir=ext/recode -+ ext_srcdir=$abs_srcdir/ext/recode -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_RECODE_SHARED=no -+ -+ -+ case ext/recode in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in recode.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_REFLECTION 1 -+EOF -+ -+ -+ ext_builddir=ext/reflection -+ ext_srcdir=$abs_srcdir/ext/reflection -+ -+ ac_extra= -+ -+ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -+ PHP_REFLECTION_SHARED=no -+ -+ -+ case ext/reflection in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in php_reflection.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&6 -+echo "configure:83742: checking whether to enable PHP sessions" >&5 -+# Check whether --enable-session or --disable-session was given. -+if test "${enable_session+set}" = set; then -+ enableval="$enable_session" -+ PHP_SESSION=$enableval - else -- echo "$ac_t""no" 1>&6 -+ -+ PHP_SESSION=yes -+ test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL -+ - fi - -- echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 --echo "configure:76592: checking for PQftable in -lpq" >&5 --ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQFTABLE 1 --EOF -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SESSION in -+shared,*) -+ PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SESSION=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 --echo "configure:76635: checking for PQescapeStringConn in -lpq" >&5 --ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+echo "$ac_t""$ext_output" 1>&6 - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQESCAPE_CONN 1 --EOF - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 --echo "configure:76678: checking for PQescapeByteaConn in -lpq" >&5 --ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQESCAPE_BYTEA_CONN 1 --EOF -+php_with_mm=no - -+echo $ac_n "checking for mm support""... $ac_c" 1>&6 -+echo "configure:83786: checking for mm support" >&5 -+# Check whether --with-mm or --without-mm was given. -+if test "${with_mm+set}" = set; then -+ withval="$with_mm" -+ PHP_MM=$withval - else -- echo "$ac_t""no" 1>&6 -+ -+ PHP_MM=no -+ -+ - fi - -- echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 --echo "configure:76721: checking for pg_encoding_to_char in -lpq" >&5 --ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ext_output=$PHP_MM -+echo "$ac_t""$ext_output" 1>&6 - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 --EOF - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 --echo "configure:76764: checking for lo_create in -lpq" >&5 --ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ -+if test "$PHP_SESSION" != "no"; then -+ -+ echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 -+echo "configure:83808: checking whether pwrite works" >&5 -+if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < -+#include -+#include -+#include -+#include -+ -+ main() { -+ int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); -+ -+ if (fd < 0) exit(1); -+ if (pwrite(fd, "text", 4, 0) != 4) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } -+ -+ - EOF --if { (eval echo configure:76783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" -+if { (eval echo configure:83841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_pwrite=yes -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ rm -fr conftest* -+ -+ ac_cv_pwrite=no -+ - fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- -+rm -fr conftest* - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PG_LO_CREATE 1 --EOF - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 --echo "configure:76807: checking for lo_import_with_oid in -lpq" >&5 --ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ if test "$ac_cv_pwrite" = "no"; then -+ -+ if test "$cross_compiling" = yes; then -+ -+ ac_cv_pwrite=no -+ - else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < -+#include -+#include -+#include -+#include -+ssize_t pwrite(int, void *, size_t, off64_t); -+ main() { -+ int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); -+ -+ if (fd < 0) exit(1); -+ if (pwrite(fd, "text", 4, 0) != 4) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } -+ -+ - EOF --if { (eval echo configure:76826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" -+if { (eval echo configure:83887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_pwrite=yes -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- -+ rm -fr conftest* -+ -+ ac_cv_pwrite=no -+ - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PG_LO_IMPORT_WITH_OID 1 --EOF -- --else -- echo "$ac_t""no" 1>&6 -+rm -fr conftest* - fi - -- LIBS=$old_LIBS -- LDFLAGS=$old_LDFLAGS - -+ if test "$ac_cv_pwrite" = "yes"; then -+ ac_cv_pwrite=64 -+ fi -+ fi - -+fi - -- if test "$ext_shared" = "yes"; then -- PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" -- if test -n "$PGSQL_LIBDIR"; then -- -- if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PGSQL_LIBDIR -- else -- -- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi -+echo "$ac_t""$ac_cv_pwrite" 1>&6 - -+ if test "$ac_cv_pwrite" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_PWRITE 1 -+EOF - -- fi -- -- fi -+ if test "$ac_cv_pwrite" = "64"; then -+ cat >> confdefs.h <<\EOF -+#define PHP_PWRITE_64 1 -+EOF - - fi -- else -- -- -- if test -n "$PGSQL_LIBDIR"; then -- -- if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PGSQL_LIBDIR -- else -- -- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -- fi -+ fi - -- -- -- - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ echo $ac_n "checking whether pread works""... $ac_c" 1>&6 -+echo "configure:83928: checking whether pread works" >&5 -+if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" - -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -+ echo test > conftest_in -+ if test "$cross_compiling" = yes; then - -- fi -- -+ ac_cv_pread=no -+ -+else -+ cat > conftest.$ac_ext < -+#include -+#include -+#include -+#include - -- fi -+ main() { -+ char buf[3]; -+ int fd = open("conftest_in", O_RDONLY); -+ if (fd < 0) exit(1); -+ if (pread(fd, buf, 2, 0) != 2) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } - -+EOF -+if { (eval echo configure:83961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - -- case pq in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lpq $LIBS" -- ;; -- esac -- -- -- -- -- fi -- -- -+ ac_cv_pread=yes - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_pread=no -+ -+fi -+rm -fr conftest* -+fi - -+ rm -f conftest_in - -+ if test "$ac_cv_pread" = "no"; then -+ -+ echo test > conftest_in -+ if test "$cross_compiling" = yes; then - -- if test "$PGSQL_INCLUDE" != "/usr/include"; then -- -- if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then -- ai_p=$PGSQL_INCLUDE -- else -- -- ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" -- fi -+ ac_cv_pread=no -+ -+else -+ cat > conftest.$ac_ext < -+#include -+#include -+#include -+#include -+ssize_t pread(int, void *, size_t, off64_t); -+ main() { -+ char buf[3]; -+ int fd = open("conftest_in", O_RDONLY); -+ if (fd < 0) exit(1); -+ if (pread(fd, buf, 2, 0) != 2) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+EOF -+if { (eval echo configure:84008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -+ ac_cv_pread=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_pread=no -+ -+fi -+rm -fr conftest* -+fi -+ -+ rm -f conftest_in -+ -+ if test "$ac_cv_pread" = "yes"; then -+ ac_cv_pread=64 - fi -- -- fi -+ fi -+ -+fi - -- fi -+echo "$ac_t""$ac_cv_pread" 1>&6 -+ -+ if test "$ac_cv_pread" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_PREAD 1 -+EOF -+ -+ if test "$ac_cv_pread" = "64"; then -+ cat >> confdefs.h <<\EOF -+#define PHP_PREAD_64 1 -+EOF - -+ fi -+ fi - - -- ext_builddir=ext/pgsql -- ext_srcdir=$abs_srcdir/ext/pgsql -+ ext_builddir=ext/session -+ ext_srcdir=$abs_srcdir/ext/session - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_PGSQL_SHARED=no -+ PHP_SESSION_SHARED=no - - -- case ext/pgsql in -+ case ext/session in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -77009,7 +84072,7 @@ fi - - - old_IFS=$IFS -- for ac_src in pgsql.c; do -+ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - - IFS=. - set $ac_src -@@ -77032,18 +84095,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC pgsql" -+ EXT_STATIC="$EXT_STATIC session" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC session" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_PGSQL_SHARED=yes -+ PHP_SESSION_SHARED=yes - -- case ext/pgsql in -+ case ext/session in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -77058,14 +84121,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in pgsql.c; do -+ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo" -+ shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -77088,31 +84151,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PHPPGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppgsql.so '$ext_builddir'/phppgsql.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsession.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsession.so '$ext_builddir'/phpsession.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPGSQL, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PHPPGSQL_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppgsql.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:77286: checking for phar archive support" >&5 --# Check whether --enable-phar or --disable-phar was given. --if test "${enable_phar+set}" = set; then -- enableval="$enable_phar" -- PHP_PHAR=$enableval --else - -- PHP_PHAR=yes -- test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_PHAR in --shared,*) -- PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_PHAR=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_PHAR" != "no"; then -+ am_i_shared=$PHP_SESSION_SHARED -+ is_it_shared=$PHP_HASH_SHARED -+ is_it_enabled=$PHP_HASH -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension session to build statically, but it -+depends on extension hash, which you've configured to build shared. -+You either need to build session shared or build hash statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension session, which depends on extension hash, -+but you've either not enabled hash, or have disabled it. -+" 1>&2; exit 1; } -+ fi - -- ext_builddir=ext/phar -- ext_srcdir=$abs_srcdir/ext/phar -- -- ac_extra= -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_PHAR_SHARED=no -- - -- case ext/phar in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ am_i_shared=$PHP_SESSION_SHARED -+ is_it_shared=$PHP_SPL_SHARED -+ is_it_enabled=$PHP_SPL -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension session to build statically, but it -+depends on extension spl, which you've configured to build shared. -+You either need to build session shared or build spl statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension session, which depends on extension spl, -+but you've either not enabled spl, or have disabled it. -+" 1>&2; exit 1; } -+ fi - - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_PHP_SESSION 1 - EOF - -- ;; -- *) -- -- install_modules="install-modules" -+fi - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phar.so '$ext_builddir'/phar.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHAR, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD)' -- ;; -- esac -+if test "$PHP_MM" != "no"; then -+ for i in $PHP_MM /usr/local /usr; do -+ test -f "$i/include/mm.h" && MM_DIR=$i && break -+ done - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phar.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix" -+ if test -z "$MM_DIR" ; then -+ { echo "configure: error: cannot find mm library" 1>&2; exit 1; } - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar" -- -- cat >>Makefile.objects<> confdefs.h </dev/null ; then -+ ai_p=$MM_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" - fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_PHAR_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -+ -+ if test "$ext_shared" = "yes"; then -+ SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" -+ else - - -- case ext/phar in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$MM_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ - - -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi - -- cat >>Makefile.objects<&6 --echo "configure:77620: checking for phar openssl support" >&5 -- if test "$PHP_HASH_SHARED" != "yes"; then -- if test "$PHP_HASH" != "no"; then -- cat >> confdefs.h <<\EOF --#define PHAR_HASH_OK 1 --EOF - -- fi -+ -+ if test "$MM_DIR/include" != "/usr/include"; then -+ -+ if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$MM_DIR/include - else -- echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2 -+ -+ ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" - fi -- if test "$PHP_OPENSSL_SHARED" = "yes"; then -- echo "$ac_t""no (shared openssl)" 1>&6 -- else -- if test "$PHP_OPENSSL" = "yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define PHAR_HAVE_OPENSSL 1 --EOF - -- else -- echo "$ac_t""no" 1>&6 -- fi -- fi -+ - -- am_i_shared=$PHP_PHAR_SHARED -- is_it_shared=$PHP_HASH_SHARED -- is_it_enabled=$PHP_HASH -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension phar to build statically, but it --depends on extension hash, which you've configured to build shared. --You either need to build phar shared or build hash statically for the --build to be successful. --" 1>&2; exit 1; } -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ - fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension phar, which depends on extension hash, --but you've either not enabled hash, or have disabled it. --" 1>&2; exit 1; } -+ - fi -+ - - -- am_i_shared=$PHP_PHAR_SHARED -- is_it_shared=$PHP_SPL_SHARED -- is_it_enabled=$PHP_SPL -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension phar to build statically, but it --depends on extension spl, which you've configured to build shared. --You either need to build phar shared or build spl statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension phar, which depends on extension spl, --but you've either not enabled spl, or have disabled it. --" 1>&2; exit 1; } -- fi -+ for header_file in ext/session/mod_mm.h; do -+ - -+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -+ -+ fi - --fi -+ done -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBMM 1 -+EOF - -+fi - - --php_enable_posix=yes -+php_enable_shmop=no - --echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 --echo "configure:77695: checking whether to enable POSIX-like functions" >&5 --# Check whether --enable-posix or --disable-posix was given. --if test "${enable_posix+set}" = set; then -- enableval="$enable_posix" -- PHP_POSIX=$enableval -+echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 -+echo "configure:84572: checking whether to enable shmop support" >&5 -+# Check whether --enable-shmop or --disable-shmop was given. -+if test "${enable_shmop+set}" = set; then -+ enableval="$enable_shmop" -+ PHP_SHMOP=$enableval - else - -- PHP_POSIX=yes -- test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL -+ PHP_SHMOP=no -+ test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL - - fi - -@@ -77707,12 +84584,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_POSIX in -+case $PHP_SHMOP in - shared,*) -- PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'` -+ PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'` - ;; - shared) -- PHP_POSIX=yes -+ PHP_SHMOP=yes - ;; - no) - ext_output=no -@@ -77731,25 +84608,25 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test "$PHP_POSIX" = "yes"; then -+if test "$PHP_SHMOP" != "no"; then - cat >> confdefs.h <<\EOF --#define HAVE_POSIX 1 -+#define HAVE_SHMOP 1 - EOF - - -- ext_builddir=ext/posix -- ext_srcdir=$abs_srcdir/ext/posix -+ ext_builddir=ext/shmop -+ ext_srcdir=$abs_srcdir/ext/shmop - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_POSIX_SHARED=no -+ PHP_SHMOP_SHARED=no - - -- case ext/posix in -+ case ext/shmop in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -77764,7 +84641,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in posix.c; do -+ for ac_src in shmop.c; do - - IFS=. - set $ac_src -@@ -77787,18 +84664,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC posix" -+ EXT_STATIC="$EXT_STATIC shmop" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC posix" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_POSIX_SHARED=yes -+ PHP_SHMOP_SHARED=yes - -- case ext/posix in -+ case ext/shmop in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -77813,14 +84690,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in posix.c; do -+ for ac_src in shmop.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" -+ shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -77843,31 +84720,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpposix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(PHPPOSIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpposix.so '$ext_builddir'/phpposix.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPOSIX, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(PHPPOSIX_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpposix.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:78037: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:78047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+ -+ -+php_enable_simplexml=yes -+ -+echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 -+echo "configure:84916: checking whether to enable SimpleXML support" >&5 -+# Check whether --enable-simplexml or --disable-simplexml was given. -+if test "${enable_simplexml+set}" = set; then -+ enableval="$enable_simplexml" -+ PHP_SIMPLEXML=$enableval - else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* -+ -+ PHP_SIMPLEXML=yes -+ test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL -+ - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 -+ -+ -+ -+ -+if test -z "$PHP_LIBXML_DIR"; then -+ -+php_with_libxml_dir=no -+ -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:84961: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval - else -- echo "$ac_t""no" 1>&6 -+ -+ PHP_LIBXML_DIR=no -+ -+ - fi --done - - -- for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:78077: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+fi -+ -+if test "$PHP_SIMPLEXML" != "no"; then -+ -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi -+ -+ -+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:84989: checking for xml2-config path" >&5 -+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -+ -+ for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ if test -x "$i/bin/xml2-config"; then -+ ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ break -+ fi -+ done - --int main() { -+fi - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif -+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ -+ if test -x "$ac_cv_php_xml2_config_path"; then -+ XML2_CONFIG="$ac_cv_php_xml2_config_path" -+ libxml_full_version=`$XML2_CONFIG --version` -+ ac_IFS=$IFS -+ IFS="." -+ set $libxml_full_version -+ IFS=$ac_IFS -+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXML_VERSION" -ge "2006011"; then -+ LIBXML_LIBS=`$XML2_CONFIG --libs` -+ LIBXML_INCS=`$XML2_CONFIG --cflags` -+ -+ for ac_i in $LIBXML_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi -+ -+ -+ fi -+ -+ fi -+ -+ ;; -+ esac -+ done -+ -+ -+ for ac_i in $LIBXML_INCS; do -+ case $ac_i in -+ -I*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/include"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - --; return 0; } --EOF --if { (eval echo configure:78105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" --fi --rm -f conftest* --fi -+ fi - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 --fi --done -+ ;; -+ esac -+ done - - -- echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 --echo "configure:78131: checking for working ttyname_r() implementation" >&5 -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:85147: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ -+ old_LIBS=$LIBS -+ LIBS=" -+ $SIMPLEXML_SHARED_LIBADD -+ $LIBS" - if test "$cross_compiling" = yes; then - -- echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 -+ LIBS=$old_LIBS + else + - else - cat > conftest.$ac_ext < +- if test -n "$PSPELL_LIBDIR"; then +- +- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then +- +- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PSPELL_LIBDIR +- else +- +- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" +- fi - --int main(int argc, char *argv[]) --{ -- char buf[64]; +- +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +- +- fi - -- return ttyname_r(0, buf, 64) ? 1 : 0; --} -+ -+ char xmlInitParser(); -+ int main() { -+ xmlInitParser(); -+ return 0; -+ } - - EOF --if { (eval echo configure:78151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:85174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_TTYNAME_R 1 --EOF - -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ - - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ - - fi - rm -fr conftest* - fi - - -- echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 --echo "configure:78173: checking for utsname.domainname" >&5 --if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 +- +- fi +- +- fi +- +- +- case aspell in +- c|c_r|pthread*) ;; +- *) +- LIBS="-laspell $LIBS" +- ;; +- esac +- +- +- +- +- fi +- +- +- +- -else +- echo "$ac_t""no" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_aspell_new_aspell_config +- - -- cat > conftest.$ac_ext < +- +- +- if test "$PSPELL_INCDIR" != "/usr/include"; then - --int main() { -+ -+fi - -- return sizeof(((struct utsname *)0)->domainname); +- if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then +- ai_p=$PSPELL_INCDIR +- else - --; return 0; } -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 - EOF --if { (eval echo configure:78191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_have_utsname_domainname=yes +- ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`" +- fi +- - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* - -- ac_cv_have_utsname_domainname=no +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi - +- fi +- +- fi +- +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD" +- +- cat >> confdefs.h <<\EOF +-#define HAVE_PSPELL 1 +-EOF +- -fi --rm -f conftest* +- +- +- +-php_with_libedit=no +- +-echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 +-echo "configure:78965: checking for libedit readline replacement" >&5 +-# Check whether --with-libedit or --without-libedit was given. +-if test "${with_libedit+set}" = set; then +- withval="$with_libedit" +- PHP_LIBEDIT=$withval +-else - --fi - --echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6 -- if test "$ac_cv_have_utsname_domainname" = yes; then -+ fi -+ - cat >> confdefs.h <<\EOF --#define HAVE_UTSNAME_DOMAINNAME 1 -+#define HAVE_SIMPLEXML 1 - EOF - -- fi +- PHP_LIBEDIT=no +- test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL +- -fi - - - --php_with_pspell=no +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_LIBEDIT in +-shared,*) +- PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_LIBEDIT=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac - --echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 --echo "configure:78222: checking for PSPELL support" >&5 --# Check whether --with-pspell or --without-pspell was given. --if test "${with_pspell+set}" = set; then -- withval="$with_pspell" -- PHP_PSPELL=$withval +- +- +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +-if test "$PHP_LIBEDIT" = "no"; then +- +-php_with_readline=no +- +-echo $ac_n "checking for readline support""... $ac_c" 1>&6 +-echo "configure:79010: checking for readline support" >&5 +-# Check whether --with-readline or --without-readline was given. +-if test "${with_readline+set}" = set; then +- withval="$with_readline" +- PHP_READLINE=$withval -else - -- PHP_PSPELL=no -- test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL +- PHP_READLINE=no +- test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL - -fi - @@ -24846,12 +23520,12 @@ - -ext_output="yes, shared" -ext_shared=yes --case $PHP_PSPELL in +-case $PHP_READLINE in -shared,*) -- PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'` +- PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'` - ;; -shared) -- PHP_PSPELL=yes +- PHP_READLINE=yes - ;; -no) - ext_output=no @@ -24869,454 +23543,834 @@ - - - +-else +- php_with_readline=no +-fi +- +-if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then +- for i in $PHP_READLINE /usr/local /usr; do +- test -f $i/include/readline/readline.h && READLINE_DIR=$i && break +- done +- +- if test -z "$READLINE_DIR"; then +- { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; } +- fi +- +- +- if test "$READLINE_DIR/include" != "/usr/include"; then +- +- if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then +- ai_p=$READLINE_DIR/include +- else +- +- ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" +- fi +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi +- +- fi +- +- +- PHP_READLINE_LIBS="" +- echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 +-echo "configure:79096: checking for tgetent in -lncurses" >&5 +-ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lncurses $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- +- +- case ncurses in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" +- else +- +- +- case ncurses in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lncurses $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" +- +-else +- echo "$ac_t""no" 1>&6 +- +- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +-echo "configure:79160: checking for tgetent in -ltermcap" >&5 +-ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ltermcap $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- +- +- case termcap in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" +- else +- +- +- case termcap in +- c|c_r|pthread*) ;; +- *) +- LIBS="-ltermcap $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap" ++ if test -n "$RECODE_DIR/$RECODE_LIB"; then + +-else +- echo "$ac_t""no" 1>&6 +-fi +- +- +-fi +- +- +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS +- " +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" +- else +- +- +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi +- +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -l$ac_ii" +- else +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- LIBS="$LIBS -l$ac_ii" +- ;; +- esac +- +- +- fi +- ;; +- esac +- - --if test "$PHP_PSPELL" != "no"; then -- -- ext_builddir=ext/pspell -- ext_srcdir=$abs_srcdir/ext/pspell -+ -+ ext_builddir=ext/simplexml -+ ext_srcdir=$abs_srcdir/ext/simplexml - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_PSPELL_SHARED=no -+ PHP_SIMPLEXML_SHARED=no +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - -- case ext/pspell in -+ case ext/simplexml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -78287,7 +85237,7 @@ if test "$PHP_PSPELL" != "no"; then - - - old_IFS=$IFS -- for ac_src in pspell.c; do -+ for ac_src in simplexml.c sxe.c; do - - IFS=. - set $ac_src -@@ -78310,18 +85260,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC pspell" -+ EXT_STATIC="$EXT_STATIC simplexml" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC pspell" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" - fi +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii ++ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ++ ai_p=$RECODE_DIR/$RECODE_LIB else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_PSPELL_SHARED=yes -+ PHP_SIMPLEXML_SHARED=yes - -- case ext/pspell in -+ case ext/simplexml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -78336,14 +85286,14 @@ EOF - + +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" + fi - old_IFS=$IFS -- for ac_src in pspell.c; do -+ for ac_src in simplexml.c sxe.c; do +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- ++ ++ - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo" -+ shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo" + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +@@ -79313,75 +82938,75 @@ fi + fi - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -78366,31 +85316,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppspell.so '$ext_builddir'/phppspell.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsimplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsimplexml.so '$ext_builddir'/phpsimplexml.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD)' - ;; - esac - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix" +- fi + fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" - cat >>Makefile.objects<&6 +-echo "configure:79326: checking for readline in -lreadline" >&5 +-ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++ ++ fi ++ ++ ++ ++ + else +- ac_save_LIBS="$LIBS" +-LIBS="-lreadline $LIBS" +-cat > conftest.$ac_ext <&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_recode_recode_format_table ++ ++ old_LDFLAGS=$LDFLAGS ++ old_LIBS=$LIBS ++ LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" ++ LIBS="$LIBS -lrecode" ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 ++if { (eval echo configure:82986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 + +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- +- ++ - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pspell.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/simplexml.$suffix" + if test "$ext_shared" = "yes"; then +- READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD" +- if test -n "$READLINE_DIR/$PHP_LIBDIR"; then ++ RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" ++ if test -n "$RECODE_DIR/$RECODE_LIB"; then + +- if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then + +- if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$READLINE_DIR/$PHP_LIBDIR ++ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ++ ai_p=$RECODE_DIR/$RECODE_LIB else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pspell.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix" + +- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" - - cat >>Makefile.objects<> confdefs.h </dev/null ; then +- ai_p=$READLINE_DIR/$PHP_LIBDIR ++ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ++ ai_p=$RECODE_DIR/$RECODE_LIB + else + +- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" fi - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_PSPELL_SHARED=no -+ PHP_SIMPLEXML_SHARED=no - case "$PHP_SAPI" in - cgi|embed) - - -- case ext/pspell in -+ case ext/simplexml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac + +@@ -79444,10 +83069,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + fi -@@ -78465,7 +85415,7 @@ EOF +- case readline in ++ case recode in + c|c_r|pthread*) ;; + *) +- LIBS="-lreadline $LIBS" ++ DLIBS="-lrecode $DLIBS" + ;; + esac +@@ -79457,826 +83082,1022 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + fi - old_IFS=$IFS -- for ac_src in pspell.c; do -+ for ac_src in simplexml.c sxe.c; do - - IFS=. - set $ac_src -@@ -78488,15 +85438,15 @@ EOF - done +- +- +-else +- echo "$ac_t""no" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_BROKEN_RECODE 1 ++EOF -- EXT_STATIC="$EXT_STATIC pspell" -+ EXT_STATIC="$EXT_STATIC simplexml" - ;; - *) - - -- case ext/pspell in -+ case ext/simplexml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_readline_readline + +- { echo "configure: error: readline library not found" 1>&2; exit 1; } ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ ++ { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } ++ ++fi ++rm -f conftest* ++ LIBS=$old_LIBS ++ LDFLAGS=$old_LDFLAGS -@@ -78511,7 +85461,7 @@ EOF + fi - old_IFS=$IFS -- for ac_src in pspell.c; do -+ for ac_src in simplexml.c sxe.c; do ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBRECODE 1 ++EOF ++ - IFS=. - set $ac_src -@@ -78536,7 +85486,7 @@ EOF - - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC pspell" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" - fi +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS +- " ++ if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then ++ ++ if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then ++ ai_p=$RECODE_DIR/$RECODE_INC ++ else ++ ++ ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" ++ fi ++ ++ +- save_ext_shared=$ext_shared +- ext_shared=yes ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -78545,145 +85495,240 @@ EOF - - - if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=pspell -+ PHP_PECL_EXTENSION=simplexml - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - - fi - -- if test "$PHP_PSPELL" != "yes"; then -- PSPELL_SEARCH_DIRS=$PHP_PSPELL -- else -- PSPELL_SEARCH_DIRS="/usr/local /usr" -- fi -- for i in $PSPELL_SEARCH_DIRS; do -- if test -f $i/include/pspell/pspell.h; then -- PSPELL_DIR=$i -- PSPELL_INCDIR=$i/include/pspell -- elif test -f $i/include/pspell.h; then -- PSPELL_DIR=$i -- PSPELL_INCDIR=$i/include -- fi -- done -- -- if test -z "$PSPELL_DIR"; then -- { echo "configure: error: Cannot find pspell" 1>&2; exit 1; } -- fi -- -- PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR -- -- -- -- if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD" -- if test -n "$PSPELL_LIBDIR"; then -- -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -- else -- -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -- fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD" - -- +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) - if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" -- else +- LDFLAGS="$LDFLAGS -pthread" ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" + else - - -+ else -+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ + fi + -+ -+ am_i_shared=$PHP_SIMPLEXML_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension simplexml to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build simplexml shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension simplexml, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } + fi ++ -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" - -+ am_i_shared=$PHP_SIMPLEXML_SHARED -+ is_it_shared=$PHP_SPL_SHARED -+ is_it_enabled=$PHP_SPL -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension simplexml to build statically, but it -+depends on extension spl, which you've configured to build shared. -+You either need to build simplexml shared or build spl statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension simplexml, which depends on extension spl, -+but you've either not enabled spl, or have disabled it. -+" 1>&2; exit 1; } - fi -+ +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" ++ ++ for ac_hdr in stdbool.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:83149: checking for $ac_hdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:83159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" +fi - - -- fi -- ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++ cat >> confdefs.h <&6 ++fi ++done ++ + +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi ++ ext_builddir=ext/recode ++ ext_srcdir=$abs_srcdir/ext/recode -- fi -- else -- -+php_with_snmp=no - -- if test -n "$PSPELL_LIBDIR"; then -- -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -- else -- -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -- fi -+echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 -+echo "configure:85562: checking for SNMP support" >&5 -+# Check whether --with-snmp or --without-snmp was given. -+if test "${with_snmp+set}" = set; then -+ withval="$with_snmp" -+ PHP_SNMP=$withval -+else +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` ++ ac_extra= ++ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_RECODE_SHARED=no ++ + -+ PHP_SNMP=no -+ test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL - -- -- -+fi ++ case ext/recode in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac ++ ++ ++ ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + + ++ old_IFS=$IFS ++ for ac_src in recode.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SNMP in -+shared,*) -+ PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SNMP=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + ++ cat >>Makefile.objects<&6 ++ EXT_STATIC="$EXT_STATIC recode" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC recode" ++ fi ++ else ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_RECODE_SHARED=yes + ++ case ext/recode in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -l$ac_ii" +- else ++ ++ ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo + + ++ old_IFS=$IFS ++ for ac_src in recode.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + ++ shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo" + ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + ++ cat >>Makefile.objects<&6 -+echo "configure:85606: checking OpenSSL dir for SNMP" >&5 -+# Check whether --with-openssl-dir or --without-openssl-dir was given. -+if test "${with_openssl_dir+set}" = set; then -+ withval="$with_openssl_dir" -+ PHP_OPENSSL_DIR=$withval -+else - -+ PHP_OPENSSL_DIR=no ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phprecode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phprecode.so '$ext_builddir'/phprecode.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD)' ++ ;; ++ esac ++ ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix" ++ fi -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- LIBS="$LIBS -l$ac_ii" +- ;; ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" + -+fi ++ cat >>Makefile.objects<&6 ++ ;; ++ *) ++ ++ install_modules="install-modules" + ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/recode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(RECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/recode.so '$ext_builddir'/recode.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(RECODE, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(RECODE_SHARED_LIBADD)' ++ ;; + esac + ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/recode.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/recode.$suffix" ++ fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" + ++ cat >>Makefile.objects<> confdefs.h <&6 -+echo "configure:85629: checking whether to enable UCD SNMP hack" >&5 -+# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given. -+if test "${enable_ucd_snmp_hack+set}" = set; then -+ enableval="$enable_ucd_snmp_hack" -+ PHP_UCD_SNMP_HACK=$enableval -+else ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then ++ PHP_RECODE_SHARED=no ++ case "$PHP_SAPI" in ++ cgi|embed) ++ ++ ++ case ext/recode in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac ++ ++ ++ ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + + +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` ++ old_IFS=$IFS ++ for ac_src in recode.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- fi ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&6 + ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + + ++ old_IFS=$IFS ++ for ac_src in recode.c; do + ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" + -+if test "$PHP_SNMP" != "no"; then ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + -+ if test "$PHP_SNMP" = "yes"; then -+ # Extract the first word of "net-snmp-config", so it can be a program name with args. -+set dummy net-snmp-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:85654: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$SNMP_CONFIG" in -+ /*) -+ ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="/usr/local/bin:$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word" -+ break -+ fi ++ cat >>Makefile.objects<&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ else -+ SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config" - fi - -+ if test -x "$SNMP_CONFIG"; then -+ SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs` -+ SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`" -+ SNMP_PREFIX=`$SNMP_CONFIG --prefix` - -+ if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then -+ -+ if test "${SNMP_PREFIX}/include" != "/usr/include"; then -+ -+ if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then -+ ai_p=${SNMP_PREFIX}/include -+ else -+ -+ ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`" - -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" - fi - -- fi -+ - -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- case pspell in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lpspell $LIBS" -- ;; -- esac -- -- -- -- -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ ++ ++ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC recode" fi ++ ++ ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ -+ fi - -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$PSPELL_LIBDIR -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -+ -+ for ac_i in $SNMP_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" - else - - -@@ -78705,7 +85750,7 @@ EOF - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" - else - - -@@ -78740,8 +85785,8 @@ EOF +- fi ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=recode - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" - else - - -@@ -78767,108 +85812,252 @@ EOF - esac - done ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ + fi -- echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 --echo "configure:78772: checking for new_aspell_config in -laspell" >&5 --ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` +- ;; +- esac +- done ++fi + +- echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6 +-echo "configure:79574: checking for rl_pending_input in -lreadline" >&5 +-ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_NET_SNMP 1 -+EOF -+ -+ SNMP_LIBNAME=netsnmp -+ else -+ { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; } -+ fi -+ else -+ -+ -+ if test "$PHP_SNMP" = "yes"; then -+ for i in /usr/include /usr/local/include; do -+ test -f $i/snmp.h && SNMP_INCDIR=$i -+ test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp -+ test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp -+ test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp -+ done -+ for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do -+ test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i -+ done -+ else -+ SNMP_INCDIR=$PHP_SNMP/include -+ test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp -+ SNMP_LIBDIR=$PHP_SNMP/lib -+ fi -+ -+ if test -z "$SNMP_INCDIR"; then -+ { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; } -+ elif test -z "$SNMP_LIBDIR"; then -+ { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; } -+ fi -+ -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$SNMP_INCDIR -+ for ac_hdr in default_store.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:85855: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else +- echo $ac_n "(cached) $ac_c" 1>&6 +-else - ac_save_LIBS="$LIBS" --LIBS="-laspell $LIBS" +-LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < ++cat >> confdefs.h <<\EOF ++#define HAVE_REFLECTION 1 EOF --if { (eval echo configure:78791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:85865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - rm -rf conftest* +-if { (eval echo configure:79593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -+ eval "ac_cv_header_$ac_safe=yes" - else -+ echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -+ eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* +-fi +-rm -f conftest* -LIBS="$ac_save_LIBS" -- - fi + +-fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ if test "$ac_cv_header_default_store_h" = "yes"; then -+ echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 -+echo "configure:85893: checking for OpenSSL support in SNMP libraries" >&5 -+ cat > conftest.$ac_ext < -+#if USE_OPENSSL -+ yes -+#endif -+ -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* - +- echo "$ac_t""yes" 1>&6 +- - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- -+ SNMP_SSL=yes -+ -+else -+ rm -rf conftest* -+ -+ SNMP_SSL=no -+ -+fi -+rm -f conftest* +- +-else +- echo "$ac_t""no" 1>&6 -- if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD" -- if test -n "$PSPELL_LIBDIR"; then -+ fi -+ CPPFLAGS=$old_CPPFLAGS -+ echo "$ac_t""$SNMP_SSL" 1>&6 -+ -+ if test "$SNMP_SSL" = "yes"; then -+ if test "$PHP_OPENSSL_DIR" != "no"; then -+ PHP_OPENSSL=$PHP_OPENSSL_DIR -+ fi - -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -- else -- -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_readline_rl_pending_input - -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -+ if test "$PHP_OPENSSL" = "no"; then -+ { echo "configure: error: The UCD-SNMP in this system is built with SSL support. -+ -+ Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } -+ else -+ -+ found_openssl=no -+ unset OPENSSL_INCDIR -+ unset OPENSSL_LIBDIR +- { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; } +- +- +-fi ++ ext_builddir=ext/reflection ++ ext_srcdir=$abs_srcdir/ext/reflection + ++ ac_extra= + ++ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then ++ PHP_REFLECTION_SHARED=no ++ + +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS +- " +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" +- else +- ++ case ext/reflection in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi + +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + -+ test -z "$PHP_OPENSSL" && PHP_OPENSSL=no -+ test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no + -+ if test "$PHP_OPENSSL" != "no"; then -+ PHP_OPENSSL_DIR=$PHP_OPENSSL -+ elif test "$PHP_IMAP_SSL" != "no"; then -+ PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi ++ old_IFS=$IFS ++ for ac_src in php_reflection.c; do + +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -l$ac_ii" +- else ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- LIBS="$LIBS -l$ac_ii" +- ;; +- esac ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -+ if test -z "$PKG_CONFIG"; then -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:85950: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$PKG_CONFIG" in -+ /*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -+ break -+ fi ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + +- fi +- ;; +- esac ++ cat >>Makefile.objects<&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then -+ if $PKG_CONFIG --atleast-version=0.9.6 openssl; then -+ found_openssl=yes -+ OPENSSL_LIBS=`$PKG_CONFIG --libs openssl` -+ OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` -+ OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` -+ else -+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } + + +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii ++ EXT_STATIC="$EXT_STATIC reflection" ++ if test "no" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" + fi -+ -+ if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then + else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- fi +- +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ if test "no" = "shared" || test "no" = "yes"; then ++ PHP_REFLECTION_SHARED=yes + -+ for ac_i in $OPENSSL_LIBS; do -+ case $ac_i in -+ -pthread) - if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" - else - - -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ case ext/reflection in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then +- if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- - fi -- + - fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ - fi -- else -- -+ ;; -+ esac ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo -- if test -n "$PSPELL_LIBDIR"; then +- fi - -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi +- fi - -- -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" -+ else -+ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -78884,49 +86073,30 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - fi +- ;; +- esac +- done ++ old_IFS=$IFS ++ for ac_src in php_reflection.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" +- echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 +-echo "configure:79724: checking for rl_callback_read_char in -lreadline" >&5 +-ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lreadline $LIBS" +-cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++ done -- fi +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 - +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- +- cat >> confdefs.h <<\EOF +-#define HAVE_RL_CALLBACK_READ_CHAR 1 +-EOF ++ case $host_alias in ++ *netware*) ++ ++ install_modules="install-modules" + - -- case aspell in -- c|c_r|pthread*) ;; -- *) -- LIBS="-laspell $LIBS" -- ;; -- esac -- -- -- -- -- fi -- -- -- - -else - echo "$ac_t""no" 1>&6 -- ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreflection.so '$ext_builddir'/phpreflection.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD)' ++ ;; ++ esac + - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_aspell_new_aspell_config +- unset ac_cv_lib_readline_rl_callback_read_char - -- ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix" ++ fi + -fi -- -+ ;; -+ esac -+ done ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" ++ ++ cat >>Makefile.objects</dev/null ; then -- ai_p=$PSPELL_INCDIR -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -- ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi ++$ext_builddir/phpreflection.$suffix: \$(shared_objects_reflection) \$(PHPREFLECTION_SHARED_DEPENDENCIES) ++ $link_cmd - -@@ -78947,128 +86117,78 @@ fi +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBREADLINE 1 + EOF - fi ++ ;; ++ *) ++ ++ install_modules="install-modules" -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD" -- -- cat >> confdefs.h <<\EOF --#define HAVE_PSPELL 1 --EOF -- --fi -- +-elif test "$PHP_LIBEDIT" != "no"; then - -+ ;; -+ esac -+ done +- for i in $PHP_LIBEDIT /usr/local /usr; do +- test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break +- done ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/reflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(REFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/reflection.so '$ext_builddir'/reflection.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(REFLECTION, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(REFLECTION_SHARED_LIBADD)' ++ ;; ++ esac --php_with_libedit=no +- if test -z "$LIBEDIT_DIR"; then +- { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; } ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/reflection.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix" + fi +- + +- if test "$LIBEDIT_DIR/include" != "/usr/include"; then +- +- if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then +- ai_p=$LIBEDIT_DIR/include +- else +- +- ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" ++ ++ cat >>Makefile.objects<> confdefs.h <&6 --echo "configure:78965: checking for libedit readline replacement" >&5 --# Check whether --with-libedit or --without-libedit was given. --if test "${with_libedit+set}" = set; then -- withval="$with_libedit" -- PHP_LIBEDIT=$withval --else -+ if test "$found_openssl" = "no"; then +- ++ if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then ++ PHP_REFLECTION_SHARED=no ++ case "$PHP_SAPI" in ++ cgi|embed) ++ ++ ++ case ext/reflection in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac -- PHP_LIBEDIT=no -- test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_LIBEDIT in --shared,*) -- PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_LIBEDIT=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -+ if test "$PHP_OPENSSL_DIR" = "yes"; then -+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" -+ fi +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi --echo "$ac_t""$ext_output" 1>&6 -+ for i in $PHP_OPENSSL_DIR; do -+ if test -r $i/include/openssl/evp.h; then -+ OPENSSL_INCDIR=$i/include -+ fi -+ if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then -+ OPENSSL_LIBDIR=$i/$PHP_LIBDIR -+ fi -+ test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break -+ done +- fi ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo -+ if test -z "$OPENSSL_INCDIR"; then -+ { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } -+ fi -+ if test -z "$OPENSSL_LIBDIR"; then -+ { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } -+ fi +- echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 +-echo "configure:79827: checking for tgetent in -lncurses" >&5 +-ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lncurses $LIBS" +-cat > conftest.$ac_ext <&6 -+echo "configure:86155: checking for OpenSSL version" >&5 -+ cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++ done --if test "$PHP_LIBEDIT" = "no"; then -+#include -+#if OPENSSL_VERSION_NUMBER >= 0x0090600fL -+ yes -+#endif -+ -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++ ++ EXT_STATIC="$EXT_STATIC reflection" ++ ;; ++ *) ++ --php_with_readline=no -- --echo $ac_n "checking for readline support""... $ac_c" 1>&6 --echo "configure:79010: checking for readline support" >&5 --# Check whether --with-readline or --without-readline was given. --if test "${with_readline+set}" = set; then -- withval="$with_readline" -- PHP_READLINE=$withval -+ echo "$ac_t"">= 0.9.6" 1>&6 -+ - else -+ rm -rf conftest* +- ++ case ext/reflection in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac -- PHP_READLINE=no -- test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_READLINE in --shared,*) -- PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_READLINE=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- --else -- php_with_readline=no -+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } -+ - fi -+rm -f conftest* - --if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then -- for i in $PHP_READLINE /usr/local /usr; do -- test -f $i/include/readline/readline.h && READLINE_DIR=$i && break -- done +- case ncurses in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" +- else +- + +- case ncurses in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lncurses $LIBS" +- ;; +- esac - -- if test -z "$READLINE_DIR"; then -- { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; } -- fi -+ CPPFLAGS=$old_CPPFLAGS -- -- if test "$READLINE_DIR/include" != "/usr/include"; then - -- if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$READLINE_DIR/include -+ if test "$OPENSSL_INCDIR" != "/usr/include"; then -+ -+ if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$OPENSSL_INCDIR - else - -- ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" -+ ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" - fi +- fi +- ;; +- esac ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo - -@@ -79089,58 +86209,50 @@ if test "$PHP_READLINE" && test "$PHP_RE - fi ++ old_IFS=$IFS ++ for ac_src in php_reflection.c; do + +-else +- echo "$ac_t""no" 1>&6 ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -- -- PHP_READLINE_LIBS="" -- echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 --echo "configure:79096: checking for tgetent in -lncurses" >&5 --ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +-echo "configure:79890: checking for tgetent in -ltermcap" >&5 +-ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-lncurses $LIBS" +-LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:79909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -26069,293 +25000,340 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -- ++ cat >>Makefile.objects<&6 ++ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" ++ fi - -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$OPENSSL_LIBDIR -+ " +- -- case ncurses in -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" -+ LDFLAGS="$LDFLAGS -l$ac_ii" - else - +- case termcap in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" +- else +- ++ BUILD_DIR="$BUILD_DIR $ext_builddir" -- case ncurses in -+ case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lncurses $LIBS" -+ LIBS="$LIBS -l$ac_ii" - ;; - esac - -@@ -79150,32 +86262,72 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - esac +- case termcap in +- c|c_r|pthread*) ;; +- *) +- LIBS="-ltermcap $LIBS" +- ;; +- esac -- PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- fi +- ;; +- esac ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=reflection + -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - ++ fi + + +- -else - echo "$ac_t""no" 1>&6 -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi +-fi -- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 --echo "configure:79160: checking for tgetent in -ltermcap" >&5 --ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` + -+ fi -+ -+ fi ++php_enable_session=yes + -+ ;; -+ esac -+ done ++echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 ++echo "configure:83782: checking whether to enable PHP sessions" >&5 ++# Check whether --enable-session or --disable-session was given. ++if test "${enable_session+set}" = set; then ++ enableval="$enable_session" ++ PHP_SESSION=$enableval ++else + ++ PHP_SESSION=yes ++ test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL + -+ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -+echo "configure:86312: checking for CRYPTO_free in -lcrypto" >&5 -+ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ltermcap $LIBS" -+LIBS="-lcrypto $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:86331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -79191,20 +86343,23 @@ fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ - - -- case termcap in -+ case crypto in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" -+ SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" - else - - -- case termcap in -+ case crypto in - c|c_r|pthread*) ;; - *) -- LIBS="-ltermcap $LIBS" -+ LIBS="-lcrypto $LIBS" - ;; - esac -@@ -79214,21 +86369,28 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - esac +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$READLINE_DIR/$PHP_LIBDIR +- " +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" +- else +- +- +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi + +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -l$ac_ii" +- else +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- LIBS="$LIBS -l$ac_ii" +- ;; +- esac ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SESSION in ++shared,*) ++ PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SESSION=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac -- PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap" - -+ - else - echo "$ac_t""no" 1>&6 --fi +- fi +- ;; +- esac -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_crypto_CRYPTO_free -+ -+ { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } -+ - - fi ++echo "$ac_t""$ext_output" 1>&6 +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- fi +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- - -+ old_LIBS=$LIBS -+ LIBS="$LIBS -lcrypto" -+ - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -- " -+ -L$OPENSSL_LIBDIR -+ " - - save_ext_shared=$ext_shared - ext_shared=yes -@@ -79321,27 +86483,27 @@ fi - esac - done +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +- +- fi -- echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 --echo "configure:79326: checking for readline in -lreadline" >&5 --ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -+echo "configure:86488: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +- fi +- +- fi + +- ;; +- esac +- done ++php_with_mm=no + +- echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 +-echo "configure:80055: checking for readline in -ledit" >&5 +-ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++echo $ac_n "checking for mm support""... $ac_c" 1>&6 ++echo "configure:83826: checking for mm support" >&5 ++# Check whether --with-mm or --without-mm was given. ++if test "${with_mm+set}" = set; then ++ withval="$with_mm" ++ PHP_MM=$withval else - ac_save_LIBS="$LIBS" --LIBS="-lreadline $LIBS" -+LIBS="-lssl $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:86507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -79360,69 +86522,88 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -+ found_openssl=yes - -+ -+else -+ echo "$ac_t""no" 1>&6 +-; return 0; } +-EOF +-if { (eval echo configure:80074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- +- - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD" -- if test -n "$READLINE_DIR/$PHP_LIBDIR"; then +- READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD" +- if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then - -- if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$READLINE_DIR/$PHP_LIBDIR +- if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$LIBEDIT_DIR/$PHP_LIBDIR - else -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - -- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ { echo "configure: error: libssl not found!" 1>&2; exit 1; } - +- +- ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" +- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" - fi -+ -+fi ++ext_output=$PHP_MM ++echo "$ac_t""$ext_output" 1>&6 -+ LIBS=$old_LIBS - +- - if test "$ext_shared" = "yes"; then - READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" - test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" - else - +- ++ ++ ++ ++if test "$PHP_SESSION" != "no"; then -+ case ssl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" -+ else -+ +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 ++echo "configure:83848: checking whether pwrite works" >&5 ++if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" + +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" ++ if test "$cross_compiling" = yes; then + +- fi +- ++ ac_cv_pwrite=no ++ ++else ++ cat > conftest.$ac_ext < ++#include ++#include ++#include ++#include + +- fi +- else +- ++ main() { ++ int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); + +- if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then +- +- if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$LIBEDIT_DIR/$PHP_LIBDIR +- else +- +- ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" +- fi ++ if (fd < 0) exit(1); ++ if (pwrite(fd, "text", 4, 0) != 4) exit(1); ++ /* Linux glibc breakage until 2.2.5 */ ++ if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); ++ exit(0); ++ } + +- +- + ++EOF ++if { (eval echo configure:83881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ ac_cv_pwrite=yes + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -26363,586 +25341,734 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi -+ case ssl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lssl $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac - - -- fi - ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + - fi +- ++ ac_cv_pwrite=no + -+ case crypto in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" -+ else -+ -+ -+ case crypto in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lcrypto $LIBS" -+ ;; -+ esac -+ ++fi ++rm -fr conftest* ++fi - fi -- else - -+ ;; -+ esac -+ -+ - -- if test -n "$READLINE_DIR/$PHP_LIBDIR"; then - -- if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then - -- if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$READLINE_DIR/$PHP_LIBDIR -+ if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$OPENSSL_LIBDIR - else - -- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" - fi +- fi - -- -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" -+ else -+ +- fi ++ if test "$ac_cv_pwrite" = "no"; then ++ ++ if test "$cross_compiling" = yes; then ++ ac_cv_pwrite=no - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -79438,83 +86619,74 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - fi - - -+ fi - - fi - - fi -- -- -- case readline in +- case edit in - c|c_r|pthread*) ;; - *) -- LIBS="-lreadline $LIBS" +- LIBS="-ledit $LIBS" - ;; - esac - - ++else ++ cat > conftest.$ac_ext <&2; exit 1; } -+ - fi ++#include ++#include ++#include ++#include ++#include ++ssize_t pwrite(int, void *, size_t, off64_t); ++ main() { ++ int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); -+ fi -+ fi +- fi ++ if (fd < 0) exit(1); ++ if (pwrite(fd, "text", 4, 0) != 4) exit(1); ++ /* Linux glibc breakage until 2.2.5 */ ++ if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); ++ exit(0); ++ } -- -- -+ echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 -+echo "configure:86643: checking for kstat_read in -lkstat" >&5 -+ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 + ++EOF ++if { (eval echo configure:83927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + ++ ac_cv_pwrite=yes + else - echo "$ac_t""no" 1>&6 -+ ac_save_LIBS="$LIBS" -+LIBS="-lkstat $LIBS" -+cat > conftest.$ac_ext <&2; exit 1; } -- -- -+int main() { -+kstat_read() -+; return 0; } +- { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; } ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ++ ac_cv_pwrite=no + ++fi ++rm -fr conftest* ++fi ++ ++ ++ if test "$ac_cv_pwrite" = "yes"; then ++ ac_cv_pwrite=64 ++ fi ++ fi + + fi + ++echo "$ac_t""$ac_cv_pwrite" 1>&6 + +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBEDIT 1 ++ if test "$ac_cv_pwrite" != "no"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_PWRITE 1 + EOF + +-fi ++ if test "$ac_cv_pwrite" = "64"; then ++ cat >> confdefs.h <<\EOF ++#define PHP_PWRITE_64 1 +EOF -+if { (eval echo configure:86662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" + +-if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then +- for ac_func in rl_completion_matches +-do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:80215: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ fi ++ fi ++ ++ ++ echo $ac_n "checking whether pread works""... $ac_c" 1>&6 ++echo "configure:83968: checking whether pread works" >&5 ++if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else ++ ++ ++ echo test > conftest_in ++ if test "$cross_compiling" = yes; then ++ ++ ac_cv_pread=no ++ ++else + cat > conftest.$ac_ext < +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func(); +- +-int main() { + +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-$ac_func(); +-#endif ++#include ++#include ++#include ++#include ++#include + +-; return 0; } ++ main() { ++ char buf[3]; ++ int fd = open("conftest_in", O_RDONLY); ++ if (fd < 0) exit(1); ++ if (pread(fd, buf, 2, 0) != 2) exit(1); ++ /* Linux glibc breakage until 2.2.5 */ ++ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); ++ exit(0); ++ } ++ + EOF +-if { (eval echo configure:80243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=yes" ++if { (eval echo configure:84001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ ac_cv_pread=yes ++ + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" ++ rm -fr conftest* ++ ++ ac_cv_pread=no ++ + fi +-rm -f conftest* ++rm -fr conftest* + fi + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- cat >> confdefs.h < conftest_in ++ if test "$cross_compiling" = yes; then ++ ++ ac_cv_pread=no ++ +else ++ cat > conftest.$ac_ext < ++#include ++#include ++#include ++#include ++ssize_t pread(int, void *, size_t, off64_t); ++ main() { ++ char buf[3]; ++ int fd = open("conftest_in", O_RDONLY); ++ if (fd < 0) exit(1); ++ if (pread(fd, buf, 2, 0) != 2) exit(1); ++ /* Linux glibc breakage until 2.2.5 */ ++ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); ++ exit(0); ++ } ++ + EOF +- ++if { (eval echo configure:84048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ ac_cv_pread=yes ++ + else +- echo "$ac_t""no" 1>&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ rm -fr conftest* ++ ++ ac_cv_pread=no ++ fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" +-done ++rm -fr conftest* ++fi ++ ++ rm -f conftest_in -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- ++ if test "$ac_cv_pread" = "yes"; then ++ ac_cv_pread=64 ++ fi ++ fi + +- ext_builddir=ext/readline +- ext_srcdir=$abs_srcdir/ext/readline +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ++ ++echo "$ac_t""$ac_cv_pread" 1>&6 ++ ++ if test "$ac_cv_pread" != "no"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_PREAD 1 ++EOF ++ ++ if test "$ac_cv_pread" = "64"; then ++ cat >> confdefs.h <<\EOF ++#define PHP_PREAD_64 1 ++EOF ++ ++ fi ++ fi ++ ++ ++ ext_builddir=ext/session ++ ext_srcdir=$abs_srcdir/ext/session + + ac_extra= + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then +- PHP_READLINE_SHARED=no ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_SESSION_SHARED=no + -- case $ac_ii in -+ case kstat in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" - else +- case ext/readline in ++ case ext/session in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -80291,7 +84112,7 @@ done + + + old_IFS=$IFS +- for ac_src in readline.c; do ++ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do + + IFS=. + set $ac_src +@@ -80314,18 +84135,18 @@ EOF + done + + +- EXT_STATIC="$EXT_STATIC readline" ++ EXT_STATIC="$EXT_STATIC session" + if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC readline" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC session" + fi + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_READLINE_SHARED=yes ++ PHP_SESSION_SHARED=yes +- case ext/readline in ++ case ext/session in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -- case $ac_ii in -+ case kstat in - c|c_r|pthread*) ;; - *) -- LIBS="$LIBS -l$ac_ii" -+ LIBS="-lkstat $LIBS" - ;; + +@@ -80340,14 +84161,14 @@ EOF + + + old_IFS=$IFS +- for ac_src in readline.c; do ++ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + +- shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo" ++ shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +@@ -80370,31 +84191,31 @@ EOF + case $host_alias in + *aix*) + suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreadline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreadline.so '$ext_builddir'/phpreadline.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsession.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsession.so '$ext_builddir'/phpsession.so' + ;; + *netware*) + suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD)' + ;; + esac + + if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix" + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" + fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" + + cat >>Makefile.objects<&6 -+fi -+ -+ -+ if test "$SNMP_INCDIR" != "/usr/include"; then -+ -+ if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SNMP_INCDIR -+ else -+ -+ ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`" -+ fi + cat >>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -+ if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SNMP_LIBDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" +-$ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES) ++$ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES) + $link_cmd + + EOF +@@ -80439,22 +84260,22 @@ EOF + ;; + esac + cat >> confdefs.h <&6 --echo "configure:79574: checking for rl_pending_input in -lreadline" >&5 --ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lreadline $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ if test -n "$SNMP_LIBDIR"; then -+ -+ if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SNMP_LIBDIR -+ else -+ -+ ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" -+ fi --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+ -+ - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" - -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" + old_IFS=$IFS +- for ac_src in readline.c; do ++ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do --else -- echo "$ac_t""no" 1>&6 -+ fi -+ + IFS=. + set $ac_src +@@ -80492,15 +84313,15 @@ EOF + done -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_readline_rl_pending_input - -- { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; } -+ fi -+ -+ fi + +- EXT_STATIC="$EXT_STATIC readline" ++ EXT_STATIC="$EXT_STATIC session" + ;; + *) + + +- case ext/readline in ++ case ext/session in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac --fi -+ case snmp in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsnmp $LIBS" -+ ;; -+ esac +@@ -80515,7 +84336,7 @@ EOF -- -+ -+ -+ fi -+ -+ -+ SNMP_LIBNAME=snmp -+ fi -+ -+ - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -+ $SNMP_SHARED_LIBADD - " + old_IFS=$IFS +- for ac_src in readline.c; do ++ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - save_ext_shared=$ext_shared -@@ -79719,27 +86928,27 @@ fi + IFS=. + set $ac_src +@@ -80540,7 +84361,7 @@ EOF + + ;; esac - done +- EXT_CLI_STATIC="$EXT_CLI_STATIC readline" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC session" + fi + + +@@ -80549,371 +84370,110 @@ EOF -- echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 --echo "configure:79724: checking for rl_callback_read_char in -lreadline" >&5 --ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -+echo "configure:86933: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 -+ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lreadline $LIBS" -+LIBS="-l$SNMP_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:86952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -79759,7 +86968,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - ext_shared=$save_ext_shared + if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=readline ++ PHP_PECL_EXTENSION=session - cat >> confdefs.h <<\EOF --#define HAVE_RL_CALLBACK_READ_CHAR 1 -+#define HAVE_SNMP_PARSE_OID 1 - EOF + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - -@@ -79769,194 +86978,16 @@ else + fi - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_readline_rl_callback_read_char -- + +- PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD" +- +-fi +- +- +- +-php_with_recode=no +- +-echo $ac_n "checking for recode support""... $ac_c" 1>&6 +-echo "configure:80569: checking for recode support" >&5 +-# Check whether --with-recode or --without-recode was given. +-if test "${with_recode+set}" = set; then +- withval="$with_recode" +- PHP_RECODE=$withval +-else - +- PHP_RECODE=no +- test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL +- -fi - - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBREADLINE 1 --EOF +- +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_RECODE in +-shared,*) +- PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_RECODE=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac - - --elif test "$PHP_LIBEDIT" != "no"; then - -- for i in $PHP_LIBEDIT /usr/local /usr; do -- test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +-if test "$PHP_RECODE" != "no"; then +- RECODE_LIST="$PHP_RECODE /usr/local /usr /opt" +- +- for i in $RECODE_LIST; do +- if test -f $i/include/recode.h; then +- RECODE_DIR=$i +- RECODE_INC=include +- RECODE_LIB=$PHP_LIBDIR +- fi +- if test -f $i/include/recode/recode.h; then +- RECODE_DIR=$i +- RECODE_INC=include/recode +- RECODE_LIB=$PHP_LIBDIR/recode +- fi +- if test -f $i/recode/include/recode.h; then +- RECODE_DIR=$i/recode +- RECODE_INC=include +- RECODE_LIB=$PHP_LIBDIR +- fi +- test -n "$RECODE_DIR" && break - done - -- if test -z "$LIBEDIT_DIR"; then -- { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; } +- if test -z "$RECODE_DIR"; then +- { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; } - fi - - -- if test "$LIBEDIT_DIR/include" != "/usr/include"; then -- -- if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$LIBEDIT_DIR/include -- else -- -- ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`" -- fi -- -- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$RECODE_DIR/$RECODE_LIB +- " - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- save_ext_shared=$ext_shared +- ext_shared=yes - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" - else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- -- echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 --echo "configure:79827: checking for tgetent in -lncurses" >&5 --ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lncurses $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" +- +- +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ am_i_shared=$PHP_SESSION_SHARED ++ is_it_shared=$PHP_HASH_SHARED ++ is_it_enabled=$PHP_HASH ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension session to build statically, but it ++depends on extension hash, which you've configured to build shared. ++You either need to build session shared or build hash statically for the ++build to be successful. ++" 1>&2; exit 1; } + fi - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- - -+ unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid - - -- case ncurses in +- case $ac_ii in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" +- LDFLAGS="$LDFLAGS -l$ac_ii" - else - - -- case ncurses in +- case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lncurses $LIBS" +- LIBS="$LIBS -l$ac_ii" +- ;; +- esac +- +- +- fi - ;; - esac - - -- fi -- ;; -- esac +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension session, which depends on extension hash, ++but you've either not enabled hash, or have disabled it. ++" 1>&2; exit 1; } + fi +- +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- +- + +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" + ++ am_i_shared=$PHP_SESSION_SHARED ++ is_it_shared=$PHP_SPL_SHARED ++ is_it_enabled=$PHP_SPL ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension session to build statically, but it ++depends on extension spl, which you've configured to build shared. ++You either need to build session shared or build spl statically for the ++build to be successful. ++" 1>&2; exit 1; } + fi +- - +- fi +- +- fi - -- --else -- echo "$ac_t""no" 1>&6 +- ;; +- esac +- done - -- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 --echo "configure:79890: checking for tgetent in -ltermcap" >&5 --ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 +-echo "configure:80733: checking for recode_format_table in -lrecode" >&5 +-ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-ltermcap $LIBS" +-LIBS="-lrecode $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:80752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -26954,118 +26080,48 @@ -rm -f conftest* -LIBS="$ac_save_LIBS" - - fi +-fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - -- -- -- case termcap in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" -- else -- -- -- case termcap in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ltermcap $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac - - - --else -- echo "$ac_t""no" 1>&6 --fi -- -- --fi -- -- -- - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR -+ $SNMP_SHARED_LIBADD - " - - save_ext_shared=$ext_shared -@@ -80050,27 +87081,27 @@ fi - esac - done - -- echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 --echo "configure:80055: checking for readline in -ledit" >&5 --ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -+echo "configure:87086: checking for init_snmp in -l$SNMP_LIBNAME" >&5 -+ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ledit $LIBS" -+LIBS="-l$SNMP_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:87105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -80089,194 +87120,46 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- - - - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD" -- if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then +- RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" +- if test -n "$RECODE_DIR/$RECODE_LIB"; then - -- if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - -- if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$LIBEDIT_DIR/$PHP_LIBDIR +- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then +- ai_p=$RECODE_DIR/$RECODE_LIB - else - -- ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" -- fi +- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" ++ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension session, which depends on extension spl, ++but you've either not enabled spl, or have disabled it. ++" 1>&2; exit 1; } + fi - - - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" +- RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" - else - -- -- + + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" ++ + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -27073,7 +26129,7 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- + - fi - - @@ -27085,28 +26141,33 @@ - else - - -- if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then +- if test -n "$RECODE_DIR/$RECODE_LIB"; then - -- if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - -- if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$LIBEDIT_DIR/$PHP_LIBDIR +- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then +- ai_p=$RECODE_DIR/$RECODE_LIB - else - -- ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" +- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" - fi - - -- -- -- ++ header_path=ext/session ++ for header_file in php_session.h mod_files.h mod_user.h; do ++ hp_hf="$header_path/$header_file" + + ++ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" @@ -27116,434 +26177,605 @@ - fi - - -- -- fi -- ++ eval "INSTALLHEADERS$unique=set" + ++ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" ++ + fi + - fi - -- -- case edit in ++ done + +- case recode in - c|c_r|pthread*) ;; - *) -- LIBS="-ledit $LIBS" +- LIBS="-lrecode $LIBS" - ;; - esac + ++ cat >> confdefs.h <<\EOF ++#define HAVE_PHP_SESSION 1 ++EOF + ++fi + ++if test "$PHP_MM" != "no"; then ++ for i in $PHP_MM /usr/local /usr; do ++ test -f "$i/include/mm.h" && MM_DIR=$i && break ++ done + ++ if test -z "$MM_DIR" ; then ++ { echo "configure: error: cannot find mm library" 1>&2; exit 1; } + fi +- - + + +-else +- echo "$ac_t""no" 1>&6 - +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_recode_recode_format_table +- +- old_LDFLAGS=$LDFLAGS +- old_LIBS=$LIBS +- LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" +- LIBS="$LIBS -lrecode" +- cat > conftest.$ac_ext <> confdefs.h <<\EOF -+#define HAVE_SNMP 1 -+EOF +-recode_format_table(); +- +-; return 0; } +-EOF +-if { (eval echo configure:80893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- +- + if test "$ext_shared" = "yes"; then +- RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" +- if test -n "$RECODE_DIR/$RECODE_LIB"; then ++ SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD" ++ if test -n "$MM_DIR/$PHP_LIBDIR"; then + +- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then ++ if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then + +- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then +- ai_p=$RECODE_DIR/$RECODE_LIB ++ if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$MM_DIR/$PHP_LIBDIR + else + +- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" ++ ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" + fi + + + if test "$ext_shared" = "yes"; then +- RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" ++ SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" + else + - -- - else - echo "$ac_t""no" 1>&6 +@@ -80939,18 +84499,18 @@ if { (eval echo configure:80893: \"$ac_l + else + - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_edit_readline -+ unset ac_cv_lib_$SNMP_LIBNAME_init_snmp +- if test -n "$RECODE_DIR/$RECODE_LIB"; then ++ if test -n "$MM_DIR/$PHP_LIBDIR"; then -- { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; } -+ { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; } +- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then ++ if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then + +- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then +- ai_p=$RECODE_DIR/$RECODE_LIB ++ if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$MM_DIR/$PHP_LIBDIR + else + +- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" ++ ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" + fi + + +@@ -80976,55 +84536,30 @@ if { (eval echo configure:80893: \"$ac_l + fi - fi +- case recode in +- c|c_r|pthread*) ;; +- *) +- DLIBS="-lrecode $DLIBS" +- ;; +- esac +- +- +- +- +- fi +- +- +- cat >> confdefs.h <<\EOF +-#define HAVE_BROKEN_RECODE 1 +-EOF +- +- +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- +- { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } +- +-fi +-rm -f conftest* +- LIBS=$old_LIBS +- LDFLAGS=$old_LDFLAGS +- +- +-fi ++ case mm in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lmm $LIBS" ++ ;; ++ esac - cat >> confdefs.h <<\EOF --#define HAVE_LIBEDIT 1 +-#define HAVE_LIBRECODE 1 -EOF -- --fi -- --if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -- for ac_func in rl_completion_matches ++ ++ ++ fi ++ + + +- if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then ++ if test "$MM_DIR/include" != "/usr/include"; then + +- if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then +- ai_p=$RECODE_DIR/$RECODE_INC ++ if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then ++ ai_p=$MM_DIR/include + else + +- ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" ++ ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" + fi + + +@@ -81046,62 +84581,92 @@ EOF + fi + + +- PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" ++ ++ for header_file in ext/session/mod_mm.h; do ++ ++ ++ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INSTALLHEADERS$unique=set" ++ ++ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" ++ ++ fi + +- for ac_hdr in stdbool.h -do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:80215: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:81056: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif -- --; return 0; } --EOF --if { (eval echo configure:80243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-#include <$ac_hdr> ++ done ++ ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBMM 1 + EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:81066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then - rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" +- eval "ac_cv_header_$ac_safe=yes" -else +- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" +- eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* --fi -- --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <> confdefs.h <<\EOF -+#define UCD_SNMP_HACK 1 - EOF +-#define $ac_tr_hdr 1 +-EOF - --else ++ ++ ++php_enable_shmop=no ++ ++echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 ++echo "configure:84612: checking whether to enable shmop support" >&5 ++# Check whether --enable-shmop or --disable-shmop was given. ++if test "${enable_shmop+set}" = set; then ++ enableval="$enable_shmop" ++ PHP_SHMOP=$enableval + else - echo "$ac_t""no" 1>&6 --fi ++ ++ PHP_SHMOP=no ++ test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL ++ + fi -done ++ ++ ++ ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SHMOP in ++shared,*) ++ PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SHMOP=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac ++ ++ ++ ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++if test "$PHP_SHMOP" != "no"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_SHMOP 1 ++EOF -+ fi -- ext_builddir=ext/readline -- ext_srcdir=$abs_srcdir/ext/readline -+ -+ ext_builddir=ext/snmp -+ ext_srcdir=$abs_srcdir/ext/snmp +- ext_builddir=ext/recode +- ext_srcdir=$abs_srcdir/ext/recode ++ ext_builddir=ext/shmop ++ ext_srcdir=$abs_srcdir/ext/shmop ac_extra= -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then -- PHP_READLINE_SHARED=no -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SNMP_SHARED=no + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_RECODE_SHARED=no ++ PHP_SHMOP_SHARED=no -- case ext/readline in -+ case ext/snmp in +- case ext/recode in ++ case ext/shmop in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -80291,7 +87174,7 @@ done +@@ -81116,7 +84681,7 @@ done old_IFS=$IFS -- for ac_src in readline.c; do -+ for ac_src in snmp.c; do +- for ac_src in recode.c; do ++ for ac_src in shmop.c; do IFS=. set $ac_src -@@ -80314,18 +87197,18 @@ EOF +@@ -81139,18 +84704,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC readline" -+ EXT_STATIC="$EXT_STATIC snmp" +- EXT_STATIC="$EXT_STATIC recode" ++ EXT_STATIC="$EXT_STATIC shmop" if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC readline" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" +- EXT_CLI_STATIC="$EXT_CLI_STATIC recode" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_READLINE_SHARED=yes -+ PHP_SNMP_SHARED=yes +- PHP_RECODE_SHARED=yes ++ PHP_SHMOP_SHARED=yes -- case ext/readline in -+ case ext/snmp in +- case ext/recode in ++ case ext/shmop in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -80340,14 +87223,14 @@ EOF +@@ -81165,14 +84730,14 @@ EOF old_IFS=$IFS -- for ac_src in readline.c; do -+ for ac_src in snmp.c; do +- for ac_src in recode.c; do ++ for ac_src in shmop.c; do IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS -- shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo" -+ shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo" +- shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo" ++ shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -80370,31 +87253,31 @@ EOF +@@ -81195,31 +84760,31 @@ EOF case $host_alias in *aix*) suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreadline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreadline.so '$ext_builddir'/phpreadline.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsnmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsnmp.so '$ext_builddir'/phpsnmp.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phprecode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phprecode.so '$ext_builddir'/phprecode.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so' ;; *netware*) suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' ;; *) suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:80569: checking for recode support" >&5 --# Check whether --with-recode or --without-recode was given. --if test "${with_recode+set}" = set; then -- withval="$with_recode" -- PHP_RECODE=$withval -+echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 -+echo "configure:87452: checking whether to enable SOAP support" >&5 -+# Check whether --enable-soap or --disable-soap was given. -+if test "${enable_soap+set}" = set; then -+ enableval="$enable_soap" -+ PHP_SOAP=$enableval - else - -- PHP_RECODE=no -- test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL -+ PHP_SOAP=no -+ test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL - +@@ -81383,24 +84948,321 @@ EOF fi -@@ -80581,12 +87464,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_RECODE in -+case $PHP_SOAP in - shared,*) -- PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'` -+ PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'` - ;; - shared) -- PHP_RECODE=yes -+ PHP_SOAP=yes - ;; - no) - ext_output=no -@@ -80605,46 +87488,72 @@ echo "$ac_t""$ext_output" 1>&6 - - --if test "$PHP_RECODE" != "no"; then -- RECODE_LIST="$PHP_RECODE /usr/local /usr /opt" +-cat >> confdefs.h <<\EOF +-#define HAVE_REFLECTION 1 ++ ++php_enable_simplexml=yes ++ ++echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 ++echo "configure:84956: checking whether to enable SimpleXML support" >&5 ++# Check whether --enable-simplexml or --disable-simplexml was given. ++if test "${enable_simplexml+set}" = set; then ++ enableval="$enable_simplexml" ++ PHP_SIMPLEXML=$enableval ++else ++ ++ PHP_SIMPLEXML=yes ++ test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL ++ ++fi ++ ++ ++ ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SIMPLEXML in ++shared,*) ++ PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SIMPLEXML=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac ++ ++ ++ ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ +if test -z "$PHP_LIBXML_DIR"; then + +php_with_libxml_dir=no - -- for i in $RECODE_LIST; do -- if test -f $i/include/recode.h; then -- RECODE_DIR=$i -- RECODE_INC=include -- RECODE_LIB=$PHP_LIBDIR -- fi -- if test -f $i/include/recode/recode.h; then -- RECODE_DIR=$i -- RECODE_INC=include/recode -- RECODE_LIB=$PHP_LIBDIR/recode -- fi -- if test -f $i/recode/include/recode.h; then -- RECODE_DIR=$i/recode -- RECODE_INC=include -- RECODE_LIB=$PHP_LIBDIR -- fi -- test -n "$RECODE_DIR" && break -- done ++ +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:87497: checking libxml2 install dir" >&5 ++echo "configure:85001: checking libxml2 install dir" >&5 +# Check whether --with-libxml-dir or --without-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" @@ -27552,9 +26784,7 @@ + + PHP_LIBXML_DIR=no + - -- if test -z "$RECODE_DIR"; then -- { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; } ++ +fi + + @@ -27565,27 +26795,19 @@ + +fi + -+if test "$PHP_SOAP" != "no"; then ++if test "$PHP_SIMPLEXML" != "no"; then + + if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi - - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$RECODE_DIR/$RECODE_LIB -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes ++ { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } ++ fi ++ ++ +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:87525: checking for xml2-config path" >&5 ++echo "configure:85029: checking for xml2-config path" >&5 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else - -- for ac_i in $ac_stuff; do ++ + for i in $PHP_LIBXML_DIR /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -27610,703 +26832,472 @@ + LIBXML_INCS=`$XML2_CONFIG --cflags` + + for ac_i in $LIBXML_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread" - else - - -@@ -80666,7 +87575,7 @@ if test "$PHP_RECODE" != "no"; then - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" - else - - -@@ -80701,8 +87610,8 @@ if test "$PHP_RECODE" != "no"; then - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD" - else - - -@@ -80728,380 +87637,128 @@ if test "$PHP_RECODE" != "no"; then - esac - done - -- echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 --echo "configure:80733: checking for recode_format_table in -lrecode" >&5 --ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lrecode $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- -- if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" -- if test -n "$RECODE_DIR/$RECODE_LIB"; then - -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi ++ ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ ;; ++ esac ++ done ++ ++ + for ac_i in $LIBXML_INCS; do + case $ac_i in + -I*) + ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/include"; then - -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB ++ ++ if test "$ac_ii" != "/usr/include"; then ++ + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii - else - -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" ++ else ++ + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - - -- if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" -- else -- -- - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ fi ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" - -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi -- -- ++ + if test ""; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" - fi - - fi - -- fi -- else -- -- -- if test -n "$RECODE_DIR/$RECODE_LIB"; then -- -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -- -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB -- else -- -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -- fi -- -- -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- - fi - ++ fi ++ ++ fi ++ ++ fi ++ + ;; + esac + done - -- -- fi - -- fi -- ++ ++ + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:87683: checking whether libxml build works" >&5 ++echo "configure:85187: checking whether libxml build works" >&5 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else - -- case recode in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lrecode $LIBS" -- ;; -- esac -- -- -- -- -- fi -- -- ++ + + old_LIBS=$LIBS + LIBS=" -+ $SOAP_SHARED_LIBADD ++ $SIMPLEXML_SHARED_LIBADD + $LIBS" + if test "$cross_compiling" = yes; then - ++ + LIBS=$old_LIBS - - else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_recode_recode_format_table -- -- old_LDFLAGS=$LDFLAGS -- old_LIBS=$LIBS -- LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" -- LIBS="$LIBS -lrecode" -- cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -+if { (eval echo configure:87710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++EOF ++if { (eval echo configure:85214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then - -- -- -- if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" -- if test -n "$RECODE_DIR/$RECODE_LIB"; then -- -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -- -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB -- else -- -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -- fi -- ++ + LIBS=$old_LIBS - -- if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" -- else ++ + php_cv_libxml_build_works=yes - - -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi -- -- -- fi -- -- fi -- -- fi -- else -- -- -- if test -n "$RECODE_DIR/$RECODE_LIB"; then -- -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -- -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB -- else -- -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -- fi -- -- -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi -- -- -- -- fi -- -- fi -- -- -- case recode in -- c|c_r|pthread*) ;; -- *) -- DLIBS="-lrecode $DLIBS" -- ;; -- esac -- -- -- -- -- fi -- -- -- cat >> confdefs.h <<\EOF --#define HAVE_BROKEN_RECODE 1 --EOF -- -- - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* ++ ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -fr conftest* - -- { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } -- --fi --rm -f conftest* - LIBS=$old_LIBS -- LDFLAGS=$old_LDFLAGS -- ++ ++ LIBS=$old_LIBS + + echo "$ac_t""no" 1>&6 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } + - - fi ++ ++fi +rm -fr conftest* +fi - - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRECODE 1 --EOF ++ ++ + +fi - -- -- if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then -- -- if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_INC -- else -- -- ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" -- fi ++ +echo "$ac_t""$php_cv_libxml_build_works" 1>&6 + if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBXML 1 -+EOF + EOF -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" - fi -- -- fi -- -- fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" -- -- for ac_hdr in stdbool.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:81056: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:81066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_SOAP 1 - EOF -- --else -- echo "$ac_t""no" 1>&6 --fi --done ++#define HAVE_SIMPLEXML 1 ++EOF -- -- ext_builddir=ext/recode -- ext_srcdir=$abs_srcdir/ext/recode +- ext_builddir=ext/reflection +- ext_srcdir=$abs_srcdir/ext/reflection + -+ ext_builddir=ext/soap -+ ext_srcdir=$abs_srcdir/ext/soap ++ ext_builddir=ext/simplexml ++ ext_srcdir=$abs_srcdir/ext/simplexml ac_extra= - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_RECODE_SHARED=no -+ PHP_SOAP_SHARED=no +- if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then +- PHP_REFLECTION_SHARED=no ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_SIMPLEXML_SHARED=no -- case ext/recode in -+ case ext/soap in +- case ext/reflection in ++ case ext/simplexml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -81116,7 +87773,7 @@ done +@@ -81415,7 +85277,7 @@ EOF old_IFS=$IFS -- for ac_src in recode.c; do -+ for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do +- for ac_src in php_reflection.c; do ++ for ac_src in simplexml.c sxe.c; do IFS=. set $ac_src -@@ -81139,18 +87796,18 @@ EOF +@@ -81438,18 +85300,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC recode" -+ EXT_STATIC="$EXT_STATIC soap" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC recode" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC soap" +- EXT_STATIC="$EXT_STATIC reflection" +- if test "no" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" ++ EXT_STATIC="$EXT_STATIC simplexml" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" fi else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_RECODE_SHARED=yes -+ PHP_SOAP_SHARED=yes +- if test "no" = "shared" || test "no" = "yes"; then +- PHP_REFLECTION_SHARED=yes ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_SIMPLEXML_SHARED=yes -- case ext/recode in -+ case ext/soap in +- case ext/reflection in ++ case ext/simplexml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -81165,14 +87822,14 @@ EOF +@@ -81464,14 +85326,14 @@ EOF old_IFS=$IFS -- for ac_src in recode.c; do -+ for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do +- for ac_src in php_reflection.c; do ++ for ac_src in simplexml.c sxe.c; do IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS -- shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo" -+ shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo" +- shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" ++ shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -81195,31 +87852,31 @@ EOF +@@ -81494,31 +85356,31 @@ EOF case $host_alias in *aix*) suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phprecode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phprecode.so '$ext_builddir'/phprecode.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsoap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsoap.so '$ext_builddir'/phpsoap.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreflection.so '$ext_builddir'/phpreflection.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsimplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsimplexml.so '$ext_builddir'/phpsimplexml.so' ;; *netware*) suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOAP, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)' ;; *) suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<> confdefs.h <<\EOF --#define HAVE_REFLECTION 1 ++ ++ am_i_shared=$PHP_SIMPLEXML_SHARED ++ is_it_shared=$PHP_LIBXML_SHARED ++ is_it_enabled=$PHP_LIBXML ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension simplexml to build statically, but it ++depends on extension libxml, which you've configured to build shared. ++You either need to build simplexml shared or build libxml statically for the ++build to be successful. ++" 1>&2; exit 1; } ++ fi ++ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension simplexml, which depends on extension libxml, ++but you've either not enabled libxml, or have disabled it. ++" 1>&2; exit 1; } ++ fi ++ ++ ++ am_i_shared=$PHP_SIMPLEXML_SHARED ++ is_it_shared=$PHP_SPL_SHARED ++ is_it_enabled=$PHP_SPL ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension simplexml to build statically, but it ++depends on extension spl, which you've configured to build shared. ++You either need to build simplexml shared or build spl statically for the ++build to be successful. ++" 1>&2; exit 1; } ++ fi ++ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension simplexml, which depends on extension spl, ++but you've either not enabled spl, or have disabled it. ++" 1>&2; exit 1; } ++ fi ++ ++fi + -+php_enable_sockets=no + -+echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 -+echo "configure:88060: checking whether to enable sockets support" >&5 -+# Check whether --enable-sockets or --disable-sockets was given. -+if test "${enable_sockets+set}" = set; then -+ enableval="$enable_sockets" -+ PHP_SOCKETS=$enableval ++ ++php_with_snmp=no ++ ++echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 ++echo "configure:85602: checking for SNMP support" >&5 ++# Check whether --with-snmp or --without-snmp was given. ++if test "${with_snmp+set}" = set; then ++ withval="$with_snmp" ++ PHP_SNMP=$withval +else + -+ PHP_SOCKETS=no -+ test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL ++ PHP_SNMP=no ++ test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL + +fi + @@ -28342,12 +27369,12 @@ + +ext_output="yes, shared" +ext_shared=yes -+case $PHP_SOCKETS in ++case $PHP_SNMP in +shared,*) -+ PHP_SOCKETS=`echo "$PHP_SOCKETS"|$SED 's/^shared,//'` ++ PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'` + ;; +shared) -+ PHP_SOCKETS=yes ++ PHP_SNMP=yes + ;; +no) + ext_output=no @@ -28366,117 +27393,270 @@ + + + -+if test "$PHP_SOCKETS" != "no"; then -+ echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 -+echo "configure:88102: checking for struct cmsghdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ ++php_with_openssl_dir=no ++ ++echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 ++echo "configure:85646: checking OpenSSL dir for SNMP" >&5 ++# Check whether --with-openssl-dir or --without-openssl-dir was given. ++if test "${with_openssl_dir+set}" = set; then ++ withval="$with_openssl_dir" ++ PHP_OPENSSL_DIR=$withval +else + -+ cat > conftest.$ac_ext < -+#include -+int main() { -+struct cmsghdr s; s -+; return 0; } - EOF -+if { (eval echo configure:88117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_cmsghdr=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_cmsghdr=no +fi -+rm -f conftest* ++ ++ ++ext_output=$PHP_OPENSSL_DIR ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++ ++php_enable_ucd_snmp_hack=no ++ ++echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 ++echo "configure:85669: checking whether to enable UCD SNMP hack" >&5 ++# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given. ++if test "${enable_ucd_snmp_hack+set}" = set; then ++ enableval="$enable_ucd_snmp_hack" ++ PHP_UCD_SNMP_HACK=$enableval ++else + ++ PHP_UCD_SNMP_HACK=no ++ ++ +fi - -+echo "$ac_t""$ac_cv_cmsghdr" 1>&6 - -- ext_builddir=ext/reflection -- ext_srcdir=$abs_srcdir/ext/reflection -+ if test "$ac_cv_cmsghdr" = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_CMSGHDR 1 -+EOF + -+ fi + -+ for ac_func in hstrerror socketpair -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:88142: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); ++ext_output=$PHP_UCD_SNMP_HACK ++echo "$ac_t""$ext_output" 1>&6 + -+int main() { + -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif + -+; return 0; } -+EOF -+if { (eval echo configure:88170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" ++ ++if test "$PHP_SNMP" != "no"; then ++ ++ if test "$PHP_SNMP" = "yes"; then ++ # Extract the first word of "net-snmp-config", so it can be a program name with args. ++set dummy net-snmp-config; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:85694: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 +else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* ++ case "$SNMP_CONFIG" in ++ /*) ++ ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="/usr/local/bin:$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ ;; ++esac +fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 +else + echo "$ac_t""no" 1>&6 +fi -+done + -+ for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h ++ else ++ SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config" ++ fi ++ ++ if test -x "$SNMP_CONFIG"; then ++ SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs` ++ SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`" ++ SNMP_PREFIX=`$SNMP_CONFIG --prefix` ++ ++ if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then ++ ++ if test "${SNMP_PREFIX}/include" != "/usr/include"; then ++ ++ if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then ++ ai_p=${SNMP_PREFIX}/include ++ else ++ ++ ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" ++ fi ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi ++ ++ fi ++ ++ ++ for ac_i in $SNMP_LIBS; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi ++ ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ ;; ++ esac ++ done ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_NET_SNMP 1 ++EOF ++ ++ SNMP_LIBNAME=netsnmp ++ else ++ { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; } ++ fi ++ else ++ ++ ++ if test "$PHP_SNMP" = "yes"; then ++ for i in /usr/include /usr/local/include; do ++ test -f $i/snmp.h && SNMP_INCDIR=$i ++ test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp ++ test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp ++ test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp ++ done ++ for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do ++ test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i ++ done ++ else ++ SNMP_INCDIR=$PHP_SNMP/include ++ test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp ++ SNMP_LIBDIR=$PHP_SNMP/lib ++ fi ++ ++ if test -z "$SNMP_INCDIR"; then ++ { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; } ++ elif test -z "$SNMP_LIBDIR"; then ++ { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; } ++ fi ++ ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS=-I$SNMP_INCDIR ++ for ac_hdr in default_store.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:88198: checking for $ac_hdr" >&5 ++echo "configure:85895: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:88208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:85905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* @@ -28496,287 +27676,91 @@ + cat >> confdefs.h <&6 -+fi -+done -+ -+ cat > conftest.$ac_ext < -+#include -+ -+int main() { -+static struct msghdr tp; int n = (int) tp.msg_flags; return n -+; return 0; } -+EOF -+if { (eval echo configure:88245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ cat >> confdefs.h <<\EOF -+#define MISSING_MSGHDR_MSGFLAGS 1 -+EOF -+ -+ -+fi -+rm -f conftest* -+ cat >> confdefs.h <<\EOF -+#define HAVE_SOCKETS 1 -+EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++done + ++ if test "$ac_cv_header_default_store_h" = "yes"; then ++ echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 ++echo "configure:85933: checking for OpenSSL support in SNMP libraries" >&5 ++ cat > conftest.$ac_ext < ++#if USE_OPENSSL ++ yes ++#endif -- shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" -+ shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -81494,31 +88366,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreflection.so '$ext_builddir'/phpreflection.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(PHPSOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsockets.so '$ext_builddir'/phpsockets.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOCKETS, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(PHPSOCKETS_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsockets.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<&5 | ++ egrep "yes" >/dev/null 2>&1; then ++ rm -rf conftest* + ++ SNMP_SSL=yes ++ ++else ++ rm -rf conftest* + - BUILD_DIR="$BUILD_DIR $ext_builddir" -- -- -- ++ SNMP_SSL=no ++ ++fi ++rm -f conftest* ++ ++ fi ++ CPPFLAGS=$old_CPPFLAGS ++ echo "$ac_t""$SNMP_SSL" 1>&6 + ++ if test "$SNMP_SSL" = "yes"; then ++ if test "$PHP_OPENSSL_DIR" != "no"; then ++ PHP_OPENSSL=$PHP_OPENSSL_DIR ++ fi ++ ++ if test "$PHP_OPENSSL" = "no"; then ++ { echo "configure: error: The UCD-SNMP in this system is built with SSL support. + ++ Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } ++ else ++ ++ found_openssl=no ++ unset OPENSSL_INCDIR ++ unset OPENSSL_LIBDIR + - if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=reflection - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -- fi -- ++ test -z "$PHP_OPENSSL" && PHP_OPENSSL=no ++ test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no + ++ if test "$PHP_OPENSSL" != "no"; then ++ PHP_OPENSSL_DIR=$PHP_OPENSSL ++ elif test "$PHP_IMAP_SSL" != "no"; then ++ PHP_OPENSSL_DIR=$PHP_IMAP_SSL + fi + - - - @@ -28788,7 +27772,14 @@ -if test "${enable_session+set}" = set; then - enableval="$enable_session" - PHP_SESSION=$enableval --else ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:85990: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 + else - - PHP_SESSION=yes - test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL @@ -28805,27 +27796,116 @@ - ;; -shared) - PHP_SESSION=yes -- ;; ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; -no) - ext_output=no - ext_shared=no -- ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; -*) - ext_output=yes - ext_shared=no -- ;; --esac -- -- -- ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; + esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi + ++ fi + ++ if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then ++ if $PKG_CONFIG --atleast-version=0.9.6 openssl; then ++ found_openssl=yes ++ OPENSSL_LIBS=`$PKG_CONFIG --libs openssl` ++ OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` ++ OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` ++ else ++ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } ++ fi + -echo "$ac_t""$ext_output" 1>&6 -- -- -- -- -- ++ if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then ++ ++ for ac_i in $OPENSSL_LIBS; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi + ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac + + ++ fi ++ ;; ++ esac + + -php_with_mm=no -- ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi + -echo $ac_n "checking for mm support""... $ac_c" 1>&6 -echo "configure:81733: checking for mm support" >&5 -# Check whether --with-mm or --without-mm was given. @@ -28833,19 +27913,59 @@ - withval="$with_mm" - PHP_MM=$withval -else -- ++ ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" ++ else ++ + - PHP_MM=no -- -- + ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi + -fi - - -ext_output=$PHP_MM -echo "$ac_t""$ext_output" 1>&6 -- -- -- -- + ++ fi ++ ++ fi + ++ ;; ++ esac ++ done + ++ ++ for ac_i in $OPENSSL_INCS; do ++ case $ac_i in ++ -I*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/include"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi + -if test "$PHP_SESSION" != "no"; then - - echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 @@ -28854,57 +27974,136 @@ - echo $ac_n "(cached) $ac_c" 1>&6 -else - -- + - if test "$cross_compiling" = yes; then -- + - ac_cv_pwrite=no -- ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + -else - cat > conftest.$ac_ext < -#include -#include -#include -#include -- ++ fi + - main() { - int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); -- ++ ;; ++ esac ++ done + - if (fd < 0) exit(1); - if (pwrite(fd, "text", 4, 0) != 4) exit(1); - /* Linux glibc breakage until 2.2.5 */ - if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); - exit(0); - } -- -- --EOF ++ fi ++ fi + ++ if test "$found_openssl" = "no"; then + ++ if test "$PHP_OPENSSL_DIR" = "yes"; then ++ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" ++ fi ++ ++ for i in $PHP_OPENSSL_DIR; do ++ if test -r $i/include/openssl/evp.h; then ++ OPENSSL_INCDIR=$i/include ++ fi ++ if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then ++ OPENSSL_LIBDIR=$i/$PHP_LIBDIR ++ fi ++ test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break ++ done ++ ++ if test -z "$OPENSSL_INCDIR"; then ++ { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } ++ fi ++ ++ if test -z "$OPENSSL_LIBDIR"; then ++ { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } ++ fi ++ ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS=-I$OPENSSL_INCDIR ++ echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 ++echo "configure:86195: checking for OpenSSL version" >&5 ++ cat > conftest.$ac_ext < ++#if OPENSSL_VERSION_NUMBER >= 0x0090600fL ++ yes ++#endif ++ + EOF -if { (eval echo configure:81788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_pwrite=yes -- --else ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ egrep "yes" >/dev/null 2>&1; then ++ rm -rf conftest* + ++ echo "$ac_t"">= 0.9.6" 1>&6 ++ + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - ac_cv_pwrite=no -- --fi ++ rm -rf conftest* + ++ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } ++ + fi -rm -fr conftest* -fi -- -- ++rm -f conftest* + ++ CPPFLAGS=$old_CPPFLAGS + - if test "$ac_cv_pwrite" = "no"; then - - if test "$cross_compiling" = yes; then -- ++ ++ if test "$OPENSSL_INCDIR" != "/usr/include"; then ++ ++ if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then ++ ai_p=$OPENSSL_INCDIR ++ else ++ ++ ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" ++ fi ++ ++ + - ac_cv_pwrite=no -- ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then -- ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff=" ++ -L$OPENSSL_LIBDIR ++ " + - ac_cv_pwrite=yes -- ++ save_ext_shared=$ext_shared ++ ext_shared=yes + -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ + - ac_cv_pwrite=no -- ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + -fi -rm -fr conftest* -fi - -- ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi + - if test "$ac_cv_pwrite" = "yes"; then - ac_cv_pwrite=64 -- fi + fi - fi -- ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ + -fi - -echo "$ac_t""$ac_cv_pwrite" 1>&6 @@ -28958,13 +28193,27 @@ - cat >> confdefs.h <<\EOF -#define HAVE_PWRITE 1 -EOF -- ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac + - if test "$ac_cv_pwrite" = "64"; then - cat >> confdefs.h <<\EOF -#define PHP_PWRITE_64 1 -EOF -- -- fi + + fi - fi - - @@ -28973,623 +28222,246 @@ -if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" -+ fi - +- - - echo test > conftest_in - if test "$cross_compiling" = yes; then - +- - ac_cv_pread=no -+ BUILD_DIR="$BUILD_DIR $ext_builddir" - +- -else - cat > conftest.$ac_ext < --#include --#include --#include --#include - -- main() { -- char buf[3]; -- int fd = open("conftest_in", O_RDONLY); -- if (fd < 0) exit(1); -- if (pread(fd, buf, 2, 0) != 2) exit(1); -- /* Linux glibc breakage until 2.2.5 */ -- if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -- exit(0); -- } -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sockets -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ -+ fi -+ - --EOF --if { (eval echo configure:81908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then - -- ac_cv_pread=yes -+ header_path=ext/sockets/ -+ for header_file in php_sockets.h; do -+ hp_hf="$header_path/$header_file" -+ - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - -- ac_cv_pread=no -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -+ -+ fi -+ -+ done - --fi --rm -fr conftest* -+ - fi - -- rm -f conftest_in - -- if test "$ac_cv_pread" = "no"; then -- -- echo test > conftest_in -+ echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 -+echo "configure:88579: checking whether zend_object_value is packed" >&5 -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" - if test "$cross_compiling" = yes; then - -- ac_cv_pread=no -+ ac_result=0 -+ echo "$ac_t""no" 1>&6 - - else - cat > conftest.$ac_ext < --#include --#include --#include --#include --ssize_t pread(int, void *, size_t, off64_t); -- main() { -- char buf[3]; -- int fd = open("conftest_in", O_RDONLY); -- if (fd < 0) exit(1); -- if (pread(fd, buf, 2, 0) != 2) exit(1); -- /* Linux glibc breakage until 2.2.5 */ -- if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -- exit(0); -- } -+#include "Zend/zend_types.h" -+int main(int argc, char **argv) { -+ return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1; -+} - - EOF --if { (eval echo configure:81955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:88598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - -- ac_cv_pread=yes -+ ac_result=1 -+ echo "$ac_t""yes" 1>&6 - - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- ac_cv_pread=no -+ ac_result=0 -+ echo "$ac_t""no" 1>&6 - - fi - rm -fr conftest* - fi - -- rm -f conftest_in -- -- if test "$ac_cv_pread" = "yes"; then -- ac_cv_pread=64 -- fi -- fi -- --fi -- --echo "$ac_t""$ac_cv_pread" 1>&6 -- -- if test "$ac_cv_pread" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_PREAD 1 -+ CPPFLAGS=$old_CPPFLAGS -+ cat >> confdefs.h <> confdefs.h <<\EOF --#define PHP_PREAD_64 1 -+ cat >> confdefs.h <<\EOF -+#define HAVE_SPL 1 - EOF -- -- fi -- fi -- -+ - -- ext_builddir=ext/session -- ext_srcdir=$abs_srcdir/ext/session -+ ext_builddir=ext/spl -+ ext_srcdir=$abs_srcdir/ext/spl - - ac_extra= - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SESSION_SHARED=no -+ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -+ PHP_SPL_SHARED=no - - -- case ext/session in -+ case ext/spl in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -82019,7 +88649,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do -+ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - - IFS=. - set $ac_src -@@ -82042,18 +88672,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC session" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC session" -+ EXT_STATIC="$EXT_STATIC spl" -+ if test "no" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC spl" - fi - else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SESSION_SHARED=yes -+ if test "no" = "shared" || test "no" = "yes"; then -+ PHP_SPL_SHARED=yes - -- case ext/session in -+ case ext/spl in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -82068,14 +88698,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do -+ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo" -+ shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -82098,31 +88728,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsession.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsession.so '$ext_builddir'/phpsession.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpspl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpspl.so '$ext_builddir'/phpspl.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h < +-#include +-#include +-#include +-#include - old_IFS=$IFS -- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do -+ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do +- main() { +- char buf[3]; +- int fd = open("conftest_in", O_RDONLY); +- if (fd < 0) exit(1); +- if (pread(fd, buf, 2, 0) != 2) exit(1); +- /* Linux glibc breakage until 2.2.5 */ +- if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); +- exit(0); +- } +- +-EOF +-if { (eval echo configure:81908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ - IFS=. - set $ac_src -@@ -82268,7 +88898,7 @@ EOF - - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC session" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC spl" - fi +- ac_cv_pread=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -82277,110 +88907,341 @@ EOF - - - if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=session -+ PHP_PECL_EXTENSION=spl - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +- ac_cv_pread=no ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + +-fi +-rm -fr conftest* +-fi ++ fi - fi +- rm -f conftest_in - -- am_i_shared=$PHP_SESSION_SHARED -- is_it_shared=$PHP_HASH_SHARED -- is_it_enabled=$PHP_HASH -+ -+ header_path=ext/spl -+ for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do -+ hp_hf="$header_path/$header_file" -+ -+ -+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" +- if test "$ac_cv_pread" = "no"; then +- +- echo test > conftest_in +- if test "$cross_compiling" = yes; then +- +- ac_cv_pread=no +- ++ fi + -+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -+ + fi + -+ done -+ -+ -+ -+ am_i_shared=$PHP_SPL_SHARED -+ is_it_shared=$PHP_PCRE_SHARED -+ is_it_enabled=$PHP_PCRE - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: error: --You've configured extension session to build statically, but it --depends on extension hash, which you've configured to build shared. --You either need to build session shared or build hash statically for the -+You've configured extension spl to build statically, but it -+depends on extension pcre, which you've configured to build shared. -+You either need to build spl shared or build pcre statically for the - build to be successful. - " 1>&2; exit 1; } - fi - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: error: --You've configured extension session, which depends on extension hash, --but you've either not enabled hash, or have disabled it. -+You've configured extension spl, which depends on extension pcre, -+but you've either not enabled pcre, or have disabled it. - " 1>&2; exit 1; } - fi - -+ -+ -+ -+php_with_sqlite=yes -+ -+echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 -+echo "configure:88962: checking for sqlite support" >&5 -+# Check whether --with-sqlite or --without-sqlite was given. -+if test "${with_sqlite+set}" = set; then -+ withval="$with_sqlite" -+ PHP_SQLITE=$withval -+else - -- am_i_shared=$PHP_SESSION_SHARED -- is_it_shared=$PHP_SPL_SHARED -- is_it_enabled=$PHP_SPL -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension session to build statically, but it --depends on extension spl, which you've configured to build shared. --You either need to build session shared or build spl statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension session, which depends on extension spl, --but you've either not enabled spl, or have disabled it. --" 1>&2; exit 1; } -+ PHP_SQLITE=yes -+ test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SQLITE in -+shared,*) -+ PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SQLITE=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_enable_sqlite_utf8=no ++ ;; ++ esac ++ done + -+echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 -+echo "configure:89006: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 -+# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. -+if test "${enable_sqlite_utf8+set}" = set; then -+ enableval="$enable_sqlite_utf8" -+ PHP_SQLITE_UTF8=$enableval -+else -+ -+ PHP_SQLITE_UTF8=no ++ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 ++echo "configure:86352: checking for CRYPTO_free in -lcrypto" >&5 ++ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext < conftest.$ac_ext < +-#include +-#include +-#include +-#include +-ssize_t pread(int, void *, size_t, off64_t); +- main() { +- char buf[3]; +- int fd = open("conftest_in", O_RDONLY); +- if (fd < 0) exit(1); +- if (pread(fd, buf, 2, 0) != 2) exit(1); +- /* Linux glibc breakage until 2.2.5 */ +- if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); +- exit(0); +- } +- ++int main() { ++CRYPTO_free() ++; return 0; } + EOF +-if { (eval echo configure:81955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- +- ac_cv_pread=yes +- ++if { (eval echo configure:86371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* +- +- ac_cv_pread=no +- +-fi +-rm -fr conftest* ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" + fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + +- rm -f conftest_in +- +- if test "$ac_cv_pread" = "yes"; then +- ac_cv_pread=64 +- fi +- fi +- + fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 + -+ -+fi -+ -+ -+ext_output=$PHP_SQLITE_UTF8 -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test "$PHP_SQLITE" != "no"; then -+ if test "$PHP_PDO" != "no"; then ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + -+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -+echo "configure:89034: checking for PDO includes" >&5 -+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else ++ + -+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -+echo "configure:89040: checking for PDO includes" >&5 -+ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then -+ pdo_inc_path=$abs_srcdir/ext -+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -+ pdo_inc_path=$abs_srcdir/ext -+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then -+ pdo_inc_path=$prefix/include/php/ext -+ fi ++ case crypto in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" ++ else ++ + -+fi -+ -+echo "$ac_t""$pdo_inc_path" 1>&6 -+ if test -n "$pdo_inc_path"; then -+: -+ else -+echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 - fi -+ -+ if test -n "$pdo_inc_path"; then -+ cat >> confdefs.h <<\EOF -+#define PHP_SQLITE2_HAVE_PDO 1 -+EOF -+ -+ pdo_inc_path="-I$pdo_inc_path" -+ fi -+ fi -+ -+ if test "$PHP_SQLITE" != "yes"; then -+ SEARCH_PATH="/usr/local /usr" -+ SEARCH_FOR="/include/sqlite.h" -+ if test -r $PHP_SQLITE/; then # path given as parameter -+ SQLITE_DIR=$PHP_SQLITE -+ else # search default path list -+ echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 -+echo "configure:89074: checking for sqlite files in default path" >&5 -+ for i in $SEARCH_PATH ; do -+ if test -r $i/$SEARCH_FOR; then -+ SQLITE_DIR=$i -+ echo "$ac_t""found in $i" 1>&6 -+ fi -+ done ++ case crypto in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lcrypto $LIBS" ++ ;; ++ esac + +-echo "$ac_t""$ac_cv_pread" 1>&6 + +- if test "$ac_cv_pread" != "no"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_PREAD 1 +-EOF + fi ++ ;; ++ esac + +- if test "$ac_cv_pread" = "64"; then +- cat >> confdefs.h <<\EOF +-#define PHP_PREAD_64 1 +-EOF + +- fi +- fi ++ + -+ if test -z "$SQLITE_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } -+ fi -+ ++else ++ echo "$ac_t""no" 1>&6 + ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_crypto_CRYPTO_free ++ ++ { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } + + +- ext_builddir=ext/session +- ext_srcdir=$abs_srcdir/ext/session ++fi + +- ac_extra= + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SESSION_SHARED=no ++ old_LIBS=$LIBS ++ LIBS="$LIBS -lcrypto" + + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" -+ -L$SQLITE_DIR/$PHP_LIBDIR -lm ++ -L$OPENSSL_LIBDIR + " +- case ext/session in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + save_ext_shared=$ext_shared + ext_shared=yes -- PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) @@ -29597,7 +28469,7 @@ + LDFLAGS="$LDFLAGS -pthread" + else + -+ + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" @@ -29606,112 +28478,240 @@ + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- +- +- old_IFS=$IFS +- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else -+ - -- header_path=ext/session -- for header_file in php_session.h mod_files.h mod_user.h; do -- hp_hf="$header_path/$header_file" + +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac +- +- cat >>Makefile.objects<>Makefile.objects</dev/null ; then + ai_p=$ac_ii -+ else + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ + fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" +- +- cat >>Makefile.objects<> confdefs.h <<\EOF --#define HAVE_PHP_SESSION 1 +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/session.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/session.$suffix" + fi + -+ fi -+ + fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" + +- cat >>Makefile.objects<&6 -+echo "configure:89186: checking for sqlite_open in -lsqlite" >&5 -+ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` + +-EOF ++ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 ++echo "configure:86528: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" -+LIBS="-lsqlite $LIBS" ++LIBS="-lssl $LIBS" +cat > conftest.$ac_ext <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:86547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -29719,19 +28719,24 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" - fi ++fi +rm -f conftest* +LIBS="$ac_save_LIBS" --if test "$PHP_MM" != "no"; then -- for i in $PHP_MM /usr/local /usr; do -- test -f "$i/include/mm.h" && MM_DIR=$i && break -- done -- -- if test -z "$MM_DIR" ; then -- { echo "configure: error: cannot find mm library" 1>&2; exit 1; } +- fi - fi +- +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_SESSION_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) +- - +- case ext/session in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -29739,1025 +28744,718 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + -+ - - if test "$ext_shared" = "yes"; then -- SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD" -- if test -n "$MM_DIR/$PHP_LIBDIR"; then -+ SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" -+ if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then - -- if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$MM_DIR/$PHP_LIBDIR -+ if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SQLITE_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" -+ SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD" - else - ++ found_openssl=yes ++ -@@ -82406,18 +89267,18 @@ if test "$PHP_MM" != "no"; then - else - ++else ++ echo "$ac_t""no" 1>&6 -- if test -n "$MM_DIR/$PHP_LIBDIR"; then -+ if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then - -- if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$MM_DIR/$PHP_LIBDIR -+ if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SQLITE_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" - fi +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version ++ ++ { echo "configure: error: libssl not found!" 1>&2; exit 1; } ++ ++ ++fi - -@@ -82443,10 +89304,10 @@ if test "$PHP_MM" != "no"; then - fi +- old_IFS=$IFS +- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do ++ LIBS=$old_LIBS ++ +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS ++ case ssl in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" ++ else + +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac +- +- cat >>Makefile.objects</dev/null ; then -- ai_p=$MM_DIR/include -+ if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$SQLITE_DIR/include - else - -- ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" -+ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" +- old_IFS=$IFS +- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do ++ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS ++ case crypto in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" ++ else + +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ ++ case crypto in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lcrypto $LIBS" ++ ;; ++ esac + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + +- cat >>Makefile.objects</dev/null ; then ++ ai_p=$OPENSSL_LIBDIR ++ else ++ ++ ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" ++ else ++ + + +- BUILD_DIR="$BUILD_DIR $ext_builddir" ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + ++ fi - -@@ -82487,93 +89348,121 @@ if test "$PHP_MM" != "no"; then +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=session ++ fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +- fi - +- am_i_shared=$PHP_SESSION_SHARED +- is_it_shared=$PHP_HASH_SHARED +- is_it_enabled=$PHP_HASH +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension session to build statically, but it +-depends on extension hash, which you've configured to build shared. +-You either need to build session shared or build hash statically for the +-build to be successful. +-" 1>&2; exit 1; } +- fi +- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then +- { echo "configure: error: +-You've configured extension session, which depends on extension hash, +-but you've either not enabled hash, or have disabled it. +-" 1>&2; exit 1; } + fi ++ ++ if test "$found_openssl" = "yes"; then ++ OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR + - -- for header_file in ext/session/mod_mm.h; do -- +- am_i_shared=$PHP_SESSION_SHARED +- is_it_shared=$PHP_SPL_SHARED +- is_it_enabled=$PHP_SPL +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension session to build statically, but it +-depends on extension spl, which you've configured to build shared. +-You either need to build session shared or build spl statically for the +-build to be successful. +-" 1>&2; exit 1; } +- fi +- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then +- { echo "configure: error: +-You've configured extension session, which depends on extension spl, +-but you've either not enabled spl, or have disabled it. +-" 1>&2; exit 1; } ++ ++: ++else ++ { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } ++ + fi - -- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" - -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -- -- fi -- -- done - -+else -+ echo "$ac_t""no" 1>&6 - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBMM 1 --EOF -- -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_sqlite_sqlite_open -+ -+ { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; } -+ -+ - fi - -+ SQLITE_MODULE_TYPE=external -+ PHP_SQLITE_CFLAGS=$pdo_inc_path -+ sqlite_extra_sources="libsqlite/src/encode.c" -+ else -+ # use bundled library -+ -+ # we only support certain lemon versions -+ lemon_version_list="1.0" +- PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" --php_enable_shmop=no -+ # Extract the first word of "lemon", so it can be a program name with args. -+set dummy lemon; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:89378: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then ++ fi ++ fi ++ ++ echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 ++echo "configure:86683: checking for kstat_read in -lkstat" >&5 ++ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ if test -n "$LEMON"; then -+ ac_cv_prog_LEMON="$LEMON" # Let the user override the test. ++ ac_save_LIBS="$LIBS" ++LIBS="-lkstat $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" +else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_LEMON="lemon" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" +fi -+LEMON="$ac_cv_prog_LEMON" -+if test -n "$LEMON"; then -+ echo "$ac_t""$LEMON" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ +fi - --echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 --echo "configure:82519: checking whether to enable shmop support" >&5 --# Check whether --enable-shmop or --disable-shmop was given. --if test "${enable_shmop+set}" = set; then -- enableval="$enable_shmop" -- PHP_SHMOP=$enableval -+ if test "$LEMON"; then -+ echo $ac_n "checking for lemon version""... $ac_c" 1>&6 -+echo "configure:89406: checking for lemon version" >&5 -+if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ + +- +- header_path=ext/session +- for header_file in php_session.h mod_files.h mod_user.h; do +- hp_hf="$header_path/$header_file" ++ case kstat in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" ++ else + -- PHP_SHMOP=no -- test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL -- -+ lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` -+ php_cv_lemon_version=invalid -+ for lemon_check_version in $lemon_version_list; do -+ if test "$lemon_version" = "$lemon_check_version"; then -+ php_cv_lemon_version="$lemon_check_version (ok)" -+ fi -+ done -+ - fi - -+echo "$ac_t""$php_cv_lemon_version" 1>&6 -+ else -+ lemon_version=none -+ fi -+ case $php_cv_lemon_version in -+ ""|invalid) -+ lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." -+ echo "configure: warning: $lemon_msg" 1>&2 -+ LEMON="exit 0;" -+ ;; +- unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INSTALLHEADERS$unique=set" +- +- INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" +- +- fi ++ case kstat in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lkstat $LIBS" ++ ;; + esac -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" +- done +- --ext_output="yes, shared" --ext_shared=yes --case $PHP_SHMOP in --shared,*) -- PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SHMOP=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_SHMOP" != "no"; then - cat >> confdefs.h <<\EOF --#define HAVE_SHMOP 1 +-#define HAVE_PHP_SESSION 1 -EOF -- -+ SQLITE_MODULE_TYPE=builtin -+ PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" -+ sqlite_extra_sources="libsqlite/src/opcodes.c \ -+ libsqlite/src/parse.c libsqlite/src/encode.c \ -+ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ -+ libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \ -+ libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \ -+ libsqlite/src/os.c libsqlite/src/pager.c \ -+ libsqlite/src/printf.c libsqlite/src/random.c \ -+ libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \ -+ libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \ -+ libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \ -+ libsqlite/src/vacuum.c libsqlite/src/copy.c \ -+ libsqlite/src/vdbeaux.c libsqlite/src/date.c \ -+ libsqlite/src/where.c libsqlite/src/trigger.c" -+ fi -+ sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" - -- ext_builddir=ext/shmop -- ext_srcdir=$abs_srcdir/ext/shmop -+ ext_builddir=ext/sqlite -+ ext_srcdir=$abs_srcdir/ext/sqlite ++ fi ++ ;; ++ esac -- ac_extra= -+ ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` ++ ++else ++ echo "$ac_t""no" 1>&6 + fi - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SHMOP_SHARED=no -+ PHP_SQLITE_SHARED=no - - -- case ext/shmop in -+ case ext/sqlite in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac +-if test "$PHP_MM" != "no"; then +- for i in $PHP_MM /usr/local /usr; do +- test -f "$i/include/mm.h" && MM_DIR=$i && break +- done +- +- if test -z "$MM_DIR" ; then +- { echo "configure: error: cannot find mm library" 1>&2; exit 1; } ++ ++ if test "$SNMP_INCDIR" != "/usr/include"; then ++ ++ if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then ++ ai_p=$SNMP_INCDIR ++ else ++ ++ ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`" + fi ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -82588,7 +89477,7 @@ EOF ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi ++ ++ fi ++ ++ + if test "$ext_shared" = "yes"; then +- SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD" +- if test -n "$MM_DIR/$PHP_LIBDIR"; then ++ SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD" ++ if test -n "$SNMP_LIBDIR"; then + +- if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then + +- if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$MM_DIR/$PHP_LIBDIR ++ if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$SNMP_LIBDIR + else + +- ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" + fi - old_IFS=$IFS -- for ac_src in shmop.c; do -+ for ac_src in $sqlite_sources; do + + if test "$ext_shared" = "yes"; then +- SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" ++ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" + else + - IFS=. - set $ac_src -@@ -82611,18 +89500,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC shmop" -+ EXT_STATIC="$EXT_STATIC sqlite" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" - fi +@@ -82406,18 +86818,18 @@ if test "$PHP_MM" != "no"; then else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SHMOP_SHARED=yes -+ PHP_SQLITE_SHARED=yes - -- case ext/shmop in -+ case ext/sqlite in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -82637,14 +89526,14 @@ EOF + +- if test -n "$MM_DIR/$PHP_LIBDIR"; then ++ if test -n "$SNMP_LIBDIR"; then + +- if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then + +- if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$MM_DIR/$PHP_LIBDIR ++ if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$SNMP_LIBDIR + else + +- ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" + fi - old_IFS=$IFS -- for ac_src in shmop.c; do -+ for ac_src in $sqlite_sources; do + +@@ -82443,10 +86855,10 @@ if test "$PHP_MM" != "no"; then + fi - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" -+ shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -82667,31 +89556,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD)' - ;; + +- case mm in ++ case snmp in + c|c_r|pthread*) ;; + *) +- LIBS="-lmm $LIBS" ++ LIBS="-lsnmp $LIBS" + ;; esac - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" +@@ -82456,124 +86868,338 @@ if test "$PHP_MM" != "no"; then fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension sqlite, which depends on extension spl, -+but you've either not enabled spl, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ am_i_shared=$PHP_SQLITE_SHARED -+ is_it_shared=$PHP_PDO_SHARED -+ is_it_enabled=$PHP_PDO -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension sqlite to build statically, but it -+depends on extension pdo, which you've configured to build shared. -+You either need to build sqlite shared or build pdo statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension sqlite, which depends on extension pdo, -+but you've either not enabled pdo, or have disabled it. -+" 1>&2; exit 1; } -+ fi ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ + ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac + -+ -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" ++ fi ++ ;; ++ esac + -+ -+ -+ for header_file in $ext_builddir/libsqlite/src/sqlite.h; do ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` + ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + +- if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then +- ai_p=$MM_DIR/include ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii + else + +- ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ + -+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" ++ eval "LIBPATH$unique=set" + +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -+ + fi + -+ done -+ -+ -+ -+ if test "$SQLITE_MODULE_TYPE" = "builtin"; then -+ -+ -+ $php_shtool mkdir -p $ext_builddir/libsqlite/src -+ + -+ echo $ac_n "checking size of char *""... $ac_c" 1>&6 -+echo "configure:89819: checking size of char *" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_char_p=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(char *)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:89839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_char_p=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_char_p=0 -+fi -+rm -fr conftest* -+fi - -- cat >>Makefile.objects<&6 -+cat >> confdefs.h <> confdefs.h <<\EOF -+#define SQLITE_PTR_SZ SIZEOF_CHAR_P - EOF - -- ;; -- esac -- cat >> confdefs.h <> confdefs.h <<\EOF -+#define SQLITE_UTF8 1 - EOF - -+ else -+ SQLITE_ENCODING="ISO8859" - fi -- fi -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SHMOP_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/shmop in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" - -- old_IFS=$IFS -- for ac_src in shmop.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h + fi + + fi -- cat >>Makefile.objects<' > $ext_builddir/libsqlite/src/config.h -+ else -+ echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h -+ fi -+ -+ cat >> $ext_builddir/libsqlite/src/config.h <&6 -+echo "configure:89901: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 ++echo "configure:86973: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 ++ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ cat > conftest.$ac_ext < conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char $ac_func(); - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo ++char snmp_parse_oid(); ++ +int main() { - -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif - -- old_IFS=$IFS -- for ac_src in shmop.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++snmp_parse_oid() +; return 0; } +EOF -+if { (eval echo configure:89929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done - -- cat >>Makefile.objects<&6 -+echo "configure:89957: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < - EOF -- done -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:89967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then ++if { (eval echo configure:86992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" ++ eval "ac_cv_lib_$ac_lib_var=yes" +else -+ echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" ++ eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* ++LIBS="$ac_save_LIBS" ++ +fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <> confdefs.h <<\EOF ++#define HAVE_SNMP_PARSE_OID 1 +EOF -+ ++ ++ ++ +else + echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid ++ ++ +fi -+done - -+fi - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" -- fi -- -- -- BUILD_DIR="$BUILD_DIR $ext_builddir" -- - - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=shmop -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 -+echo "configure:89998: checking whether flush should be called explicitly after a buffered io" >&5 -+if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else ++ ++ ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff=" ++ $SNMP_SHARED_LIBADD ++ " + -+if test "$cross_compiling" = yes; then ++ save_ext_shared=$ext_shared ++ ext_shared=yes + -+ ac_cv_flush_io=no - -- fi -+else -+ cat > conftest.$ac_ext < -+#include - -+int main(int argc, char **argv) -+{ -+ char *filename = tmpnam(NULL); -+ char buffer[64]; -+ int result = 0; -+ -+ FILE *fp = fopen(filename, "wb"); -+ if (NULL == fp) -+ return 0; -+ fputs("line 1\n", fp); -+ fputs("line 2\n", fp); -+ fclose(fp); -+ -+ fp = fopen(filename, "rb+"); -+ if (NULL == fp) -+ return 0; -+ fgets(buffer, sizeof(buffer), fp); -+ fputs("line 3\n", fp); -+ rewind(fp); -+ fgets(buffer, sizeof(buffer), fp); -+ if (0 != strcmp(buffer, "line 1\n")) -+ result = 1; -+ fgets(buffer, sizeof(buffer), fp); -+ if (0 != strcmp(buffer, "line 3\n")) -+ result = 1; -+ fclose(fp); -+ unlink(filename); - -+ exit(result); -+} - --php_enable_simplexml=yes -+EOF -+if { (eval echo configure:90047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ + -+ ac_cv_flush_io=no ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi --echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 --echo "configure:82863: checking whether to enable SimpleXML support" >&5 --# Check whether --enable-simplexml or --disable-simplexml was given. --if test "${enable_simplexml+set}" = set; then -- enableval="$enable_simplexml" -- PHP_SIMPLEXML=$enableval - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ -- PHP_SIMPLEXML=yes -- test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL -+ ac_cv_flush_io=yes - - fi -+rm -fr conftest* -+fi - -+fi - -+echo "$ac_t""$ac_cv_flush_io" 1>&6 -+if test "$ac_cv_flush_io" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_FLUSHIO 1 -+EOF - --ext_output="yes, shared" --ext_shared=yes --case $PHP_SIMPLEXML in --shared,*) -- PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SIMPLEXML=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -+fi ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ + +- for header_file in ext/session/mod_mm.h; do ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` + ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ + +- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` + +- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INSTALLHEADERS$unique=set" ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi + +- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" +- + fi -+if test "$ac_cv_func_crypt" = "no"; then -+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -+echo "configure:90075: checking for crypt in -lcrypt" >&5 -+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` +- done ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 ++echo "configure:87126: checking for init_snmp in -l$SNMP_LIBNAME" >&5 ++ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" -+LIBS="-lcrypt $LIBS" ++LIBS="-l$SNMP_LIBNAME $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:87145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -30768,930 +29466,728 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - ++ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ -+ LIBS="-lcrypt $LIBS -lcrypt" + +- +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBMM 1 ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ + cat >> confdefs.h <<\EOF -+#define HAVE_CRYPT 1 -+EOF ++#define HAVE_SNMP 1 + EOF --if test -z "$PHP_LIBXML_DIR"; then +-fi +- +- +-php_enable_shmop=no +- +-echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 +-echo "configure:82519: checking whether to enable shmop support" >&5 +-# Check whether --enable-shmop or --disable-shmop was given. +-if test "${enable_shmop+set}" = set; then +- enableval="$enable_shmop" +- PHP_SHMOP=$enableval +-else --php_with_libxml_dir=no +- PHP_SHMOP=no +- test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL ++ +else + echo "$ac_t""no" 1>&6 -+fi --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:82908: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval -+fi ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_$SNMP_LIBNAME_init_snmp ++ ++ { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; } + -+echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 -+echo "configure:90123: checking for standard DES crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else ++ + fi + + +- +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_SHMOP in +-shared,*) +- PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_SHMOP=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac +- +- +- +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +-if test "$PHP_SHMOP" != "no"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_SHMOP 1 ++ if test "$PHP_UCD_SNMP_HACK" = "yes" ; then ++ cat >> confdefs.h <<\EOF ++#define UCD_SNMP_HACK 1 + EOF + ++ fi -- PHP_LIBXML_DIR=no -+ if test "$cross_compiling" = yes; then +- ext_builddir=ext/shmop +- ext_srcdir=$abs_srcdir/ext/shmop ++ ++ ext_builddir=ext/snmp ++ ext_srcdir=$abs_srcdir/ext/snmp + + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SHMOP_SHARED=no ++ PHP_SNMP_SHARED=no + -+ ac_cv_crypt_des=yes +- case ext/shmop in ++ case ext/snmp in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -82588,7 +87214,7 @@ EOF --fi -+else -+ cat > conftest.$ac_ext < -+#endif + old_IFS=$IFS +- for ac_src in shmop.c; do ++ for ac_src in snmp.c; do + + IFS=. + set $ac_src +@@ -82611,18 +87237,18 @@ EOF + done --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -+#if HAVE_CRYPT_H -+#include -+#endif -+main() { -+#if HAVE_CRYPT -+ exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_crypt_des=yes +- EXT_STATIC="$EXT_STATIC shmop" ++ EXT_STATIC="$EXT_STATIC snmp" + if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" + fi + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_SHMOP_SHARED=yes ++ PHP_SNMP_SHARED=yes + +- case ext/shmop in ++ case ext/snmp in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -82637,14 +87263,14 @@ EOF -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_crypt_des=no - fi -+rm -fr conftest* -+fi + old_IFS=$IFS +- for ac_src in shmop.c; do ++ for ac_src in snmp.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + +- shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" ++ shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo" --if test "$PHP_SIMPLEXML" != "no"; then -+fi + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +@@ -82667,31 +87293,31 @@ EOF + case $host_alias in + *aix*) + suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsnmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsnmp.so '$ext_builddir'/phpsnmp.so' + ;; + *netware*) + suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD)' + ;; + esac -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -+echo "$ac_t""$ac_cv_crypt_des" 1>&6 + if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix" + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix" + fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" -- --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:82936: checking for xml2-config path" >&5 --if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 -+echo "configure:90174: checking for extended DES crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else + cat >>Makefile.objects< conftest.$ac_ext <>Makefile.objects<&6 -+#if HAVE_UNISTD_H -+#include -+#endif +-$ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES) ++$ext_builddir/snmp.$suffix: \$(shared_objects_snmp) \$(SNMP_SHARED_DEPENDENCIES) + $link_cmd -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -- -- for ac_i in $LIBXML_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+#if HAVE_CRYPT_H -+#include -+#endif + EOF +@@ -82736,22 +87362,22 @@ EOF + ;; + esac + cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then + fi + fi + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_SHMOP_SHARED=no ++ PHP_SNMP_SHARED=no + case "$PHP_SAPI" in + cgi|embed) + -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -+ ac_cv_crypt_ext_des=yes +- case ext/shmop in ++ case ext/snmp in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -82766,7 +87392,7 @@ EOF + + + old_IFS=$IFS +- for ac_src in shmop.c; do ++ for ac_src in snmp.c; do + + IFS=. + set $ac_src +@@ -82789,15 +87415,15 @@ EOF + done + + +- EXT_STATIC="$EXT_STATIC shmop" ++ EXT_STATIC="$EXT_STATIC snmp" + ;; + *) + + +- case ext/shmop in ++ case ext/snmp in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -82812,7 +87438,7 @@ EOF + + + old_IFS=$IFS +- for ac_src in shmop.c; do ++ for ac_src in snmp.c; do + + IFS=. + set $ac_src +@@ -82837,7 +87463,7 @@ EOF + + ;; + esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" + fi + + +@@ -82846,28 +87472,31 @@ EOF + + + if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=shmop ++ PHP_PECL_EXTENSION=snmp + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + + fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* + -+ ac_cv_crypt_ext_des=no ++ PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD" ++ + fi -- fi -- ;; -- esac -+fi -+rm -fr conftest* -+fi -+fi -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 +-php_enable_simplexml=yes ++php_enable_soap=no + +-echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 +-echo "configure:82863: checking whether to enable SimpleXML support" >&5 +-# Check whether --enable-simplexml or --disable-simplexml was given. +-if test "${enable_simplexml+set}" = set; then +- enableval="$enable_simplexml" +- PHP_SIMPLEXML=$enableval ++echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 ++echo "configure:87492: checking whether to enable SOAP support" >&5 ++# Check whether --enable-soap or --disable-soap was given. ++if test "${enable_soap+set}" = set; then ++ enableval="$enable_soap" ++ PHP_SOAP=$enableval + else + +- PHP_SIMPLEXML=yes +- test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL ++ PHP_SOAP=no ++ test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL + + fi + +@@ -82875,12 +87504,12 @@ fi -- -- if test "$ext_shared" = "yes"; then -- SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 -+echo "configure:90225: checking for MD5 crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -+if test "$cross_compiling" = yes; then - -- fi -+ ac_cv_crypt_md5=no + ext_output="yes, shared" + ext_shared=yes +-case $PHP_SIMPLEXML in ++case $PHP_SOAP in + shared,*) +- PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'` ++ PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'` + ;; + shared) +- PHP_SIMPLEXML=yes ++ PHP_SOAP=yes + ;; + no) + ext_output=no +@@ -82904,7 +87533,7 @@ if test -z "$PHP_LIBXML_DIR"; then + php_with_libxml_dir=no -+else -+ cat > conftest.$ac_ext <&6 +-echo "configure:82908: checking libxml2 install dir" >&5 ++echo "configure:87537: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -82924,15 +87553,15 @@ echo "$ac_t""$ext_output" 1>&6 -- fi -- -- fi -+#if HAVE_UNISTD_H -+#include -+#endif + fi -- ;; -- esac -- done -+#if HAVE_CRYPT_H -+#include -+#endif +-if test "$PHP_SIMPLEXML" != "no"; then ++if test "$PHP_SOAP" != "no"; then -- -- for ac_i in $LIBXML_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+main() { -+#if HAVE_CRYPT -+ char salt[15], answer[40]; + if test "$PHP_LIBXML" = "no"; then +- { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } ++ { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + fi -- -+ salt[0]='$'; salt[1]='1'; salt[2]='$'; -+ salt[3]='r'; salt[4]='a'; salt[5]='s'; -+ salt[6]='m'; salt[7]='u'; salt[8]='s'; -+ salt[9]='l'; salt[10]='e'; salt[11]='$'; -+ salt[12]='\0'; -+ strcpy(answer,salt); -+ strcat(answer,"rISCgZzpwk3UhDidwXvin0"); -+ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_crypt_md5=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:82936: checking for xml2-config path" >&5 ++echo "configure:87565: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -82964,7 +87593,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then +- SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" ++ SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread" + else + -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -+ ac_cv_crypt_md5=no - -- fi -+fi -+rm -fr conftest* -+fi +@@ -82986,7 +87615,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then +- SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" ++ SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" + else + + +@@ -83021,8 +87650,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path -- ;; -- esac -- done -+fi + + if test "$ext_shared" = "yes"; then +- SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD" ++ SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD" + else + + +@@ -83090,7 +87719,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path -+echo "$ac_t""$ac_cv_crypt_md5" 1>&6 -- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:83094: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 -+echo "configure:90285: checking for Blowfish crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then ++echo "configure:87723: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - -- -- old_LIBS=$LIBS -- LIBS=" +@@ -83098,7 +87727,7 @@ else + + old_LIBS=$LIBS + LIBS=" - $SIMPLEXML_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then -- -- LIBS=$old_LIBS -+if test "$cross_compiling" = yes; then ++ $SOAP_SHARED_LIBADD + $LIBS" + if test "$cross_compiling" = yes; then + +@@ -83106,7 +87735,7 @@ else -+ ac_cv_crypt_blowfish=no -+ else cat > conftest.$ac_ext < -+#endif -+ -+#if HAVE_CRYPT_H -+#include -+#endif -+ -+main() { -+#if HAVE_CRYPT -+ char salt[30], answer[70]; -- char xmlInitParser(); -- int main() { -- xmlInitParser(); -- return 0; -- } -- -+ salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; -+ strcat(salt,"rasmuslerd............"); -+ strcpy(answer,salt); -+ strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); -+ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#else -+ exit(0); -+#endif -+} +@@ -83117,7 +87746,7 @@ else + } + EOF -if { (eval echo configure:83121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:90321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:87750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -- -+ ac_cv_crypt_blowfish=yes -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- LIBS=$old_LIBS -- -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -- -+ ac_cv_crypt_blowfish=no -+ - fi - rm -fr conftest* - fi - -- -- - fi - --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 --EOF -+echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 - -- fi -- -- cat >> confdefs.h <<\EOF + LIBS=$old_LIBS +@@ -83153,23 +87782,23 @@ EOF + fi + + cat >> confdefs.h <<\EOF -#define HAVE_SIMPLEXML 1 --EOF -+echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 -+echo "configure:90342: checking for SHA512 crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ -+ ac_cv_crypt_SHA512=no ++#define HAVE_SOAP 1 + EOF -- + - ext_builddir=ext/simplexml - ext_srcdir=$abs_srcdir/ext/simplexml -+else -+ cat > conftest.$ac_ext < -+#endif + ac_extra= -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_SIMPLEXML_SHARED=no -+#if HAVE_CRYPT_H -+#include -+#endif -+ -+main() { -+#if HAVE_CRYPT -+ char salt[30], answer[80]; ++ PHP_SOAP_SHARED=no -+ salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; -+ strcpy(answer, salt); -+ strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); -+ exit (strcmp((char *)crypt("foo",salt),answer)); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - case ext/simplexml in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ case ext/soap in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -+ ac_cv_crypt_SHA512=yes - -- old_IFS=$IFS -- for ac_src in simplexml.c sxe.c; do -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* ++ /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ ac_cv_crypt_SHA512=no + +@@ -83184,7 +87813,7 @@ EOF -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+fi -+rm -fr conftest* -+fi -- cat >>Makefile.objects<&6 - EXT_STATIC="$EXT_STATIC simplexml" -- if test "$ext_shared" != "nocli"; then ++ EXT_STATIC="$EXT_STATIC soap" + if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" -- fi -- else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC soap" + fi + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_SIMPLEXML_SHARED=yes -- ++ PHP_SOAP_SHARED=yes + - case ext/simplexml in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ case ext/soap in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 -+echo "configure:90398: checking for SHA256 crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else ++ /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -+if test "$cross_compiling" = yes; then -+ ac_cv_crypt_SHA256=no +@@ -83233,14 +87862,14 @@ EOF -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -- -+else -+ cat > conftest.$ac_ext < -+#endif - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+#if HAVE_CRYPT_H -+#include -+#endif ++ shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo" -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_crypt_SHA256=yes ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD)' + ;; + esac -- if test "x" = "xyes"; then + if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix" -- else ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix" + else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix" -- fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" + fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" -+ ac_cv_crypt_SHA256=no ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" -- cat >>Makefile.objects<>Makefile.objects<&6 - -- ;; -- *) -- -- install_modules="install-modules" ++$ext_builddir/phpsoap.$suffix: \$(shared_objects_soap) \$(PHPSOAP_SHARED_DEPENDENCIES) + $link_cmd -- case $host_alias in -- *aix*) -- suffix=so + EOF +@@ -83300,31 +87929,31 @@ EOF + case $host_alias in + *aix*) + suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/simplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(SIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/simplexml.so '$ext_builddir'/simplexml.so' -- ;; -- *netware*) -- suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/soap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(SOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/soap.so '$ext_builddir'/soap.so' + ;; + *netware*) + suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SIMPLEXML, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOAP, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(SIMPLEXML_SHARED_LIBADD)' -- ;; -- esac -+if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(SOAP_SHARED_LIBADD)' + ;; + esac -- if test "x" = "xyes"; then + if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/simplexml.$suffix" -- else ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix" + else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix" -- fi -+ echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 -+echo "configure:90457: checking whether the compiler supports __alignof__" >&5 -+if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix" + fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" -- -- cat >>Makefile.objects<>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+ ac_cv_alignof_exists=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+ ac_cv_alignof_exists=no -+ -+fi -+rm -f conftest* -+fi - -- ;; -- esac -- cat >> confdefs.h <> confdefs.h <&6 -+ if test "$ac_cv_alignof_exists" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ALIGNOF 1 ++#define COMPILE_DL_SOAP 1 EOF -- fi + fi fi -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_SIMPLEXML_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -+ echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 -+echo "configure:90498: checking whether the compiler supports aligned attribute" >&5 -+if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else ++ PHP_SOAP_SHARED=no + case "$PHP_SAPI" in + cgi|embed) + - case ext/simplexml in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ case ext/soap in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+ ac_cv_attribute_aligned=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+ ac_cv_attribute_aligned=no -+fi -+rm -f conftest* -+fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 -+ if test "$ac_cv_attribute_aligned" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATTRIBUTE_ALIGNED 1 -+EOF -+ -+ fi -+ +@@ -83362,7 +87991,7 @@ EOF -+ cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects<> confdefs.h <> confdefs.h <&2; exit 1; } @@ -31699,17 +30195,8 @@ -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - -+ if test "$ac_cv_crypt_ext_des" = "yes"; then -+ ac_result=1 -+ ac_crypt_edes=1 -+ else -+ ac_result=0 -+ ac_crypt_edes=0 - fi -+ cat >> confdefs.h <&2; exit 1; } -+ -+ if test "$ac_cv_crypt_md5" = "yes"; then -+ ac_result=1 -+ ac_crypt_md5=1 -+ else -+ ac_result=0 -+ ac_crypt_md5=0 - fi -+ cat >> confdefs.h <&2; exit 1; } -+ if test "$ac_cv_crypt_sha512" = "yes"; then -+ ac_result=1 -+ ac_crypt_sha512=1 -+ else -+ ac_result=0 -+ ac_crypt_sha512=0 - fi +- fi - -fi -+ cat >> confdefs.h <> confdefs.h <&6 -echo "configure:83509: checking for SNMP support" >&5 -# Check whether --with-snmp or --without-snmp was given. @@ -31793,32 +30251,11 @@ - - PHP_SNMP=no - test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL -+ cat >> confdefs.h <&6 -+echo "configure:90693: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - -+int main() { - +- +-fi +- +- +- -ext_output="yes, shared" -ext_shared=yes -case $PHP_SNMP in @@ -31847,39 +30284,20 @@ - - -php_with_openssl_dir=no -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif - +- -echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 -echo "configure:83553: checking OpenSSL dir for SNMP" >&5 -# Check whether --with-openssl-dir or --without-openssl-dir was given. -if test "${with_openssl_dir+set}" = set; then - withval="$with_openssl_dir" - PHP_OPENSSL_DIR=$withval -+; return 0; } -+EOF -+if { (eval echo configure:90721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" - else +-else - - PHP_OPENSSL_DIR=no - - -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* - fi - +-fi +- - -ext_output=$PHP_OPENSSL_DIR -echo "$ac_t""$ext_output" 1>&6 @@ -31896,22 +30314,13 @@ -if test "${enable_ucd_snmp_hack+set}" = set; then - enableval="$enable_ucd_snmp_hack" - PHP_UCD_SNMP_HACK=$enableval -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 - fi -+done - +-fi +- - -ext_output=$PHP_UCD_SNMP_HACK -echo "$ac_t""$ext_output" 1>&6 @@ -31927,11 +30336,8 @@ -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:83601: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then -+echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -+echo "configure:90746: checking for working fnmatch" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else +- echo $ac_n "(cached) $ac_c" 1>&6 +-else - case "$SNMP_CONFIG" in - /*) - ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path. @@ -31956,30 +30362,10 @@ -SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG" -if test -n "$SNMP_CONFIG"; then - echo "$ac_t""$SNMP_CONFIG" 1>&6 -+ # Some versions of Solaris or SCO have a broken fnmatch function. -+# So we run a test program. If we are cross-compiling, take no chance. -+# Thanks to John Oleynick and Franc,ois Pinard for this test. -+if test "$cross_compiling" = yes; then -+ ac_cv_func_fnmatch_works=no - else +-else - echo "$ac_t""no" 1>&6 -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_func_fnmatch_works=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_func_fnmatch_works=no -+fi -+rm -fr conftest* - fi - +-fi +- - else - SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config" - fi @@ -32002,11 +30388,19 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" - fi -- ++ $ac_comp ++EOF ++ done + - -- ++ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC soap" ++ fi + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- + - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" @@ -32016,11 +30410,18 @@ - else - INCLUDES="$INCLUDES -I$ai_p" - fi -- -- fi -- ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ ++ ++ ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=soap + - fi -- ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + + fi + - - for ac_i in $SNMP_LIBS; do - case $ac_i in @@ -32037,34 +30438,42 @@ - eval "EXTRA_LDFLAGS$unique=set" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi -- ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD" + - fi - ;; - -l*) - ac_ii=`echo $ac_i|cut -c 3-` - -- + - case $ac_ii in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" -- else + else - -- ++ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } ++ fi ++else ++ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } + - case $ac_ii in - c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" - ;; - esac -- -- ++ fi + ++fi + - fi - ;; - esac -- -- + + - ;; - -L*) - ac_ii=`echo $ac_i|cut -c 3-` @@ -32080,7 +30489,8 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -- ++php_enable_sockets=no + - - if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" @@ -32088,9 +30498,55 @@ - else - - -- ++echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 ++echo "configure:88100: checking whether to enable sockets support" >&5 ++# Check whether --enable-sockets or --disable-sockets was given. ++if test "${enable_sockets+set}" = set; then ++ enableval="$enable_sockets" ++ PHP_SOCKETS=$enableval ++else + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ PHP_SOCKETS=no ++ test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL ++ ++fi ++ ++ ++ ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SOCKETS in ++shared,*) ++ PHP_SOCKETS=`echo "$PHP_SOCKETS"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SOCKETS=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac ++ ++ ++ ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++if test "$PHP_SOCKETS" != "no"; then ++ echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 ++echo "configure:88142: checking for struct cmsghdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -32098,33 +30554,73 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- ++ cat > conftest.$ac_ext < ++#include ++int main() { ++struct cmsghdr s; s ++; return 0; } ++EOF ++if { (eval echo configure:88157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cmsghdr=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ ac_cv_cmsghdr=no ++fi ++rm -f conftest* + - fi -- -- ++fi + ++echo "$ac_t""$ac_cv_cmsghdr" 1>&6 + - fi - - fi -- ++ if test "$ac_cv_cmsghdr" = yes; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_CMSGHDR 1 ++EOF + - ;; - esac - done -+fi ++ fi - cat >> confdefs.h <<\EOF -#define HAVE_NET_SNMP 1 -+echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6 -+if test $ac_cv_func_fnmatch_works = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_FNMATCH 1 - EOF +-EOF ++ for ac_func in hstrerror socketpair ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:88182: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func(); - SNMP_LIBNAME=netsnmp - else - { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; } - fi - else -- ++int main() { + - - if test "$PHP_SNMP" = "yes"; then - for i in /usr/include /usr/local/include; do @@ -32141,91 +30637,71 @@ - test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp - SNMP_LIBDIR=$PHP_SNMP/lib - fi -+fi -+ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif - if test -z "$SNMP_INCDIR"; then - { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; } - elif test -z "$SNMP_LIBDIR"; then - { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; } - fi ++; return 0; } ++EOF ++if { (eval echo configure:88210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$SNMP_INCDIR - for ac_hdr in default_store.h -+for ac_func in fork CreateProcess ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <&6 ++fi ++done ++ ++ for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:83802: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:90788: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++echo "configure:88238: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func(); below. */ -+#include -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } + #include <$ac_hdr> EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:83812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -+if { (eval echo configure:90816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+ eval "ac_cv_func_$ac_func=yes" - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 ++{ (eval echo configure:88248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" -+ eval "ac_cv_func_$ac_func=no" - fi - rm -f conftest* - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -+php_can_support_proc_open=no -+ +@@ -83834,955 +88270,865 @@ else fi done @@ -32234,87 +30710,52 @@ -echo "configure:83840: checking for OpenSSL support in SNMP libraries" >&5 - cat > conftest.$ac_ext <&6 -+echo "configure:90846: checking if your OS can spawn processes with inherited handles" >&5 -+if test "$php_can_support_proc_open" = "yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define PHP_CAN_SUPPORT_PROC_OPEN 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then -+ cat >> confdefs.h <<\EOF -+#define ENABLE_CHROOT_FUNC 1 -+EOF -+ -+fi -+ -+ -+ unset ac_cv_func_res_nsearch -+ unset ac_cv_func___res_nsearch -+ unset found -+ -+ echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 -+echo "configure:90870: checking for res_nsearch" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else + cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char res_nsearch(); -#include -#if USE_OPENSSL - yes -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch) -+choke me -+#else -+res_nsearch(); - #endif +-#endif - -+ -+; return 0; } - EOF +-EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then -+if { (eval echo configure:90898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- +- rm -rf conftest* ++#include ++#include + - SNMP_SSL=yes - -+ eval "ac_cv_func_res_nsearch=yes" ++int main() { ++static struct msghdr tp; int n = (int) tp.msg_flags; return n ++; return 0; } ++EOF ++if { (eval echo configure:88285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ : else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* -- ++ cat >> confdefs.h <<\EOF ++#define MISSING_MSGHDR_MSGFLAGS 1 ++EOF ++ + - SNMP_SSL=no - -+ eval "ac_cv_func_res_nsearch=no" fi rm -f conftest* -+fi ++ cat >> confdefs.h <<\EOF ++#define HAVE_SOCKETS 1 ++EOF ++ - fi - CPPFLAGS=$old_CPPFLAGS - echo "$ac_t""$SNMP_SSL" 1>&6 -- + - if test "$SNMP_SSL" = "yes"; then - if test "$PHP_OPENSSL_DIR" != "no"; then - PHP_OPENSSL=$PHP_OPENSSL_DIR @@ -32322,51 +30763,43 @@ - - if test "$PHP_OPENSSL" = "no"; then - { echo "configure: error: The UCD-SNMP in this system is built with SSL support. -- ++ ext_builddir=ext/sockets ++ ext_srcdir=$abs_srcdir/ext/sockets + - Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } - else - - found_openssl=no - unset OPENSSL_INCDIR - unset OPENSSL_LIBDIR -+if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 -+echo "configure:90916: checking for __res_nsearch" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __res_nsearch(); ++ ac_extra= - test -z "$PHP_OPENSSL" && PHP_OPENSSL=no - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no -+int main() { ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_SOCKETS_SHARED=no ++ ++ ++ case ext/sockets in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac ++ ++ - if test "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL - elif test "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) -+choke me -+#else -+__res_nsearch(); -+#endif ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. @@ -32375,12 +30808,7 @@ -echo "configure:83897: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -+; return 0; } -+EOF -+if { (eval echo configure:90944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___res_nsearch=yes" - else +-else - case "$PKG_CONFIG" in - /*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -32397,34 +30825,43 @@ - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi -- done ++ ++ old_IFS=$IFS ++ for ac_src in sockets.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___res_nsearch=no" - fi +-fi -PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no -+fi -+ - fi +-else +- echo "$ac_t""no" 1>&6 +-fi - fi -- + - if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then - if $PKG_CONFIG --atleast-version=0.9.6 openssl; then - found_openssl=yes @@ -32433,10 +30870,16 @@ - OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` - else - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } -- fi ++ EXT_STATIC="$EXT_STATIC sockets" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" + fi - - if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then -- ++ else ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_SOCKETS_SHARED=yes + - for ac_i in $OPENSSL_LIBS; do - case $ac_i in - -pthread) @@ -32444,15 +30887,108 @@ - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" - else - -- ++ case ext/sockets in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- + - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "EXTRA_LDFLAGS$unique=set" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- ++ ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo ++ ++ ++ old_IFS=$IFS ++ for ac_src in sockets.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 -+EOF - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_func_res_nsearch=yes -+ ;; ++ old_IFS=$IFS ++ for ac_src in sockets.c; do - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then @@ -32565,23 +31131,49 @@ - fi - - fi -- ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + - fi -- ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + - ;; - esac -- done -- ++ cat >>Makefile.objects<&6 -+echo "configure:90982: checking for res_nsearch in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext <" 1>&2; exit 1; } - fi -+int main() { -+res_nsearch() -+; return 0; } -+EOF -+if { (eval echo configure:91001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - if test -z "$OPENSSL_LIBDIR"; then - { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } - fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 ++ old_IFS=$IFS ++ for ac_src in sockets.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$OPENSSL_INCDIR @@ -32645,54 +31214,51 @@ -echo "configure:84102: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext <&6 -+echo "configure:91021: checking for __res_nsearch in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext < -#if OPENSSL_VERSION_NUMBER >= 0x0090600fL - yes -#endif - -+int main() { -+__res_nsearch() -+; return 0; } ++ cat >>Makefile.objects<&5 | - egrep "yes" >/dev/null 2>&1; then -+if { (eval echo configure:91040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- +- rm -rf conftest* ++ done ++ ++ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" ++ fi + - echo "$ac_t"">= 0.9.6" 1>&6 - -+ eval "ac_cv_lib_$ac_lib_var=yes" - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* -- +-else +- rm -rf conftest* + - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } - -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -+LIBS="$ac_save_LIBS" +-fi +-rm -f conftest* ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ - CPPFLAGS=$old_CPPFLAGS -- -- + ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=sockets + - if test "$OPENSSL_INCDIR" != "/usr/include"; then - - if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then @@ -32703,22 +31269,24 @@ - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" -- fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ + fi - -- + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ header_path=ext/sockets/ ++ for header_file in php_sockets.h; do ++ hp_hf="$header_path/$header_file" ++ ++ ++ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" - - if test ""; then @@ -32726,22 +31294,45 @@ - else - INCLUDES="$INCLUDES -I$ai_p" - fi -- -- fi -+fi ++ eval "INSTALLHEADERS$unique=set" + ++ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" ++ + fi - fi ++ done ++ -- ++fi ++ ++ ++ echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 ++echo "configure:88619: checking whether zend_object_value is packed" >&5 ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" ++ if test "$cross_compiling" = yes; then + - - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" - -L$OPENSSL_LIBDIR - " -- ++ ac_result=0 ++ echo "$ac_t""no" 1>&6 + - save_ext_shared=$ext_shared - ext_shared=yes -- ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ ac_result=1 ++ echo "$ac_t""yes" 1>&6 + - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "EXTRA_LDFLAGS$unique=set" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ -+ LIBS=$ac_libs - fi - +- fi +- - fi - ;; - -l*) - ac_ii=`echo $ac_i|cut -c 3-` - -- ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + - case $ac_ii in - c|c_r|pthread*) ;; - *) @@ -32795,29 +31371,35 @@ - LDFLAGS="$LDFLAGS -l$ac_ii" - else - -+ if test "$found" = "yes"; then -+ ++ ac_result=0 ++ echo "$ac_t""no" 1>&6 - case $ac_ii in -+ case resolv in - c|c_r|pthread*) ;; - *) +- c|c_r|pthread*) ;; +- *) - LIBS="$LIBS -l$ac_ii" -+ LIBS="-lresolv $LIBS" - ;; - esac - +- ;; +- esac +- ++fi ++rm -fr conftest* ++fi - fi - ;; - esac -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 ++ CPPFLAGS=$old_CPPFLAGS ++ cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 ++ cat >> confdefs.h <<\EOF ++#define HAVE_SPL 1 +EOF ++ ++ ++ ext_builddir=ext/spl ++ ext_srcdir=$abs_srcdir/ext/spl - ;; - -L*) @@ -32827,25 +31409,32 @@ - - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -+ ac_cv_func_res_nsearch=yes - else - +- else +- - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -- -- ++ ac_extra= + ++ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then ++ PHP_SPL_SHARED=no + - if test "$ext_shared" = "yes"; then - LDFLAGS="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - - -- + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ case ext/spl in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -32855,61 +31444,96 @@ - PHP_RPATHS="$PHP_RPATHS $ai_p" - fi -- -- + ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + - fi - - fi -- + - ;; - esac - done -- ++ old_IFS=$IFS ++ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:84259: checking for CRYPTO_free in -lcrypto" >&5 -ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` -+ unset ac_cv_lib_bind_res_nsearch -+ unset ac_cv_lib_bind___res_nsearch -+ unset found -+ echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 -+echo "configure:91118: checking for res_nsearch in -lbind" >&5 -+ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" -LIBS="-lcrypto $LIBS" -+LIBS="-lbind $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:91137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -84289,168 +91148,167 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++ done + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- -- ++ ++ EXT_STATIC="$EXT_STATIC spl" ++ if test "no" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC spl" ++ fi ++ else ++ if test "no" = "shared" || test "no" = "yes"; then ++ PHP_SPL_SHARED=yes + ++ case ext/spl in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + - case crypto in - c|c_r|pthread*) ;; - *) @@ -32917,63 +31541,79 @@ - SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" - else - -- + - case crypto in - c|c_r|pthread*) ;; - *) - LIBS="-lcrypto $LIBS" - ;; - esac -- -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 + ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo ++ ++ ++ old_IFS=$IFS ++ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&6 -+echo "configure:91157: checking for __res_nsearch in -lbind" >&5 -+ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpspl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpspl.so '$ext_builddir'/phpspl.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD)' ++ ;; ++ esac - -- -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no -+fi ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" ++ fi + +-else +- echo "$ac_t""no" 1>&6 ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared @@ -32981,9 +31621,14 @@ - - { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } - - - fi +- +-fi ++ cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ -+ LIBS=$ac_libs - fi - fi - ;; @@ -33049,29 +31671,49 @@ - LDFLAGS="$LDFLAGS -l$ac_ii" - else - -+ if test "$found" = "yes"; then -+ - +- - case $ac_ii in -+ case bind in - c|c_r|pthread*) ;; - *) +- c|c_r|pthread*) ;; +- *) - LIBS="$LIBS -l$ac_ii" -+ LIBS="-lbind $LIBS" - ;; +- ;; ++ ;; ++ *) ++ ++ install_modules="install-modules" ++ ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD)' ++ ;; esac ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix" ++ fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" - fi - ;; - esac -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 -+EOF ++ cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF ++$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES) ++ $link_cmd - ;; - -L*) @@ -33081,23 +31723,40 @@ - - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -+ ac_cv_func_res_nsearch=yes - else - +- else +- - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- ++EOF ++ ++ ;; ++ esac ++ cat >> confdefs.h <&6 -+echo "configure:91254: checking for res_nsearch in -lsocket" >&5 -+ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - ;; - esac - done -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 ++ old_IFS=$IFS ++ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:84435: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 -+echo "configure:91293: checking for __res_nsearch in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" -LIBS="-lssl $LIBS" -+LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:91312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -84465,147 +91323,216 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++ done + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared @@ -33201,23 +31846,30 @@ - found_openssl=yes - - -+ found=yes - else - echo "$ac_t""no" 1>&6 -- +-else +- echo "$ac_t""no" 1>&6 + - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - - { echo "configure: error: libssl not found!" 1>&2; exit 1; } - -- -+found=no - fi - ++ EXT_STATIC="$EXT_STATIC spl" ++ ;; ++ *) ++ + +-fi +- - LIBS=$old_LIBS - -- ++ case ext/spl in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + - case ssl in - c|c_r|pthread*) ;; - *) @@ -33232,40 +31884,23 @@ - LIBS="-lssl $LIBS" - ;; - esac -+fi - +- - fi - ;; - esac -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lsocket" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo -+ LIBS=$ac_libs -+ fi -+ if test "$found" = "yes"; then - +- ++ old_IFS=$IFS ++ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - case crypto in - c|c_r|pthread*) ;; @@ -33273,46 +31908,63 @@ - if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" - else -- ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + - - case crypto in -+ case socket in - c|c_r|pthread*) ;; - *) +- c|c_r|pthread*) ;; +- *) - LIBS="-lcrypto $LIBS" -+ LIBS="-lsocket $LIBS" - ;; - esac +- ;; +- esac ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac - fi - ;; - esac -- -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 ++ cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 -+EOF -- ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC spl" ++ fi ++ ++ ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ + ++ ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=spl + - if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then - - if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then - ai_p=$OPENSSL_LIBDIR -+ ac_cv_func_res_nsearch=yes - else - +- else +- - ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" -+ : ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + fi -+ - - if test "$ext_shared" = "yes"; then @@ -33320,193 +31972,113 @@ - test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" - else - -+ fi -+ -+ fi - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ;; ++ header_path=ext/spl ++ for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do ++ hp_hf="$header_path/$header_file" ++ - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" -- ++ eval "INSTALLHEADERS$unique=set" + - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -+ esac -+ -+ -+ unset ac_cv_func_dns_search -+ unset ac_cv_func___dns_search -+ unset found - -- fi -+ echo $ac_n "checking for dns_search""... $ac_c" 1>&6 -+echo "configure:91405: checking for dns_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dns_search(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_dns_search) || defined (__stub___dns_search) -+choke me -+#else -+dns_search(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:91433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_dns_search=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_dns_search=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 -+echo "configure:91451: checking for __dns_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __dns_search(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___dns_search) || defined (__stub_____dns_search) -+choke me -+#else -+__dns_search(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:91479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___dns_search=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___dns_search=no" -+fi -+rm -f conftest* -+fi +- ++ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" ++ + fi -+if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+fi ++ done ++ - fi - -- fi - -- fi -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 -+EOF - ++ ++ am_i_shared=$PHP_SPL_SHARED ++ is_it_shared=$PHP_PCRE_SHARED ++ is_it_enabled=$PHP_PCRE ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension spl to build statically, but it ++depends on extension pcre, which you've configured to build shared. ++You either need to build spl shared or build pcre statically for the ++build to be successful. ++" 1>&2; exit 1; } + fi +- ++ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension spl, which depends on extension pcre, ++but you've either not enabled pcre, or have disabled it. ++" 1>&2; exit 1; } + fi +- - if test "$found_openssl" = "yes"; then - OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR -+ ac_cv_func_dns_search=yes -+ ;; -- + -: -else - { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } - - fi -- + - fi - fi -- + - echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 -echo "configure:84590: checking for kstat_read in -lkstat" >&5 -ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'` -+ *) -+ -+ unset ac_cv_lib_resolv_dns_search -+ unset ac_cv_lib_resolv___dns_search -+ unset found -+ echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:91517: checking for dns_search in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" -LIBS="-lkstat $LIBS" -+LIBS="-lresolv $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:91536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 ++echo "configure:89002: checking for sqlite support" >&5 ++# Check whether --with-sqlite or --without-sqlite was given. ++if test "${with_sqlite+set}" = set; then ++ withval="$with_sqlite" ++ PHP_SQLITE=$withval else -@@ -84620,282 +91547,167 @@ LIBS="$ac_save_LIBS" +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++ ++ PHP_SQLITE=yes ++ test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL + fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 - - - case kstat in @@ -33523,54 +32095,38 @@ - LIBS="-lkstat $LIBS" - ;; - esac -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:91556: checking for __dns_search in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no - fi +-else +- echo "$ac_t""no" 1>&6 +-fi ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SQLITE in ++shared,*) ++ PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SQLITE=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac ++ ++ ++ ++echo "$ac_t""$ext_output" 1>&6 - - if test "$SNMP_INCDIR" != "/usr/include"; then @@ -33584,7 +32140,7 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`" - fi -- + - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` @@ -33600,11 +32156,11 @@ - fi - - fi -- + - fi -- + - -- + - if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD" - if test -n "$SNMP_LIBDIR"; then @@ -33620,7 +32176,8 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" - fi -- ++php_enable_sqlite_utf8=no + - - if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" @@ -33630,7 +32187,14 @@ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 ++echo "configure:89046: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 ++# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. ++if test "${enable_sqlite_utf8+set}" = set; then ++ enableval="$enable_sqlite_utf8" ++ PHP_SQLITE_UTF8=$enableval ++else + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -33638,18 +32202,23 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- ++ PHP_SQLITE_UTF8=no + - fi -- -- + ++fi + - fi - - fi -- + - fi - else - -- ++ext_output=$PHP_SQLITE_UTF8 ++echo "$ac_t""$ext_output" 1>&6 ++ + - if test -n "$SNMP_LIBDIR"; then - - if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then @@ -33663,7 +32232,7 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" - fi -- + - - - @@ -33679,13 +32248,13 @@ - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi -- -- + + - - fi -- + - fi - +- - - case snmp in - c|c_r|pthread*) ;; @@ -33693,247 +32262,152 @@ - LIBS="-lsnmp $LIBS" - ;; - esac -- -- -- -+fi -- fi -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes + ++if test "$PHP_SQLITE" != "no"; then ++ if test "$PHP_PDO" != "no"; then ++ ++ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 ++echo "configure:89074: checking for PDO includes" >&5 ++if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 +else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* ++ ++ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 ++echo "configure:89080: checking for PDO includes" >&5 ++ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then ++ pdo_inc_path=$abs_srcdir/ext ++ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then ++ pdo_inc_path=$abs_srcdir/ext ++ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then ++ pdo_inc_path=$prefix/include/php/ext ++ fi ++ +fi -- SNMP_LIBNAME=snmp -+ LIBS=$ac_libs ++echo "$ac_t""$pdo_inc_path" 1>&6 ++ if test -n "$pdo_inc_path"; then ++: ++ else ++echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 fi -+ if test "$found" = "yes"; then - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SNMP_SHARED_LIBADD -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- - -- case $ac_ii in -+ case resolv in - c|c_r|pthread*) ;; - *) -- LIBS="$LIBS -l$ac_ii" -+ LIBS="-lresolv $LIBS" - ;; - esac - - -- fi -- ;; -- esac -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 ++ if test -n "$pdo_inc_path"; then ++ cat >> confdefs.h <<\EOF ++#define PHP_SQLITE2_HAVE_PDO 1 +EOF -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 -+EOF +- SNMP_LIBNAME=snmp +- fi ++ pdo_inc_path="-I$pdo_inc_path" ++ fi ++ fi ++ ++ if test "$PHP_SQLITE" != "yes"; then ++ SEARCH_PATH="/usr/local /usr" ++ SEARCH_FOR="/include/sqlite.h" ++ if test -r $PHP_SQLITE/; then # path given as parameter ++ SQLITE_DIR=$PHP_SQLITE ++ else # search default path list ++ echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 ++echo "configure:89114: checking for sqlite files in default path" >&5 ++ for i in $SEARCH_PATH ; do ++ if test -r $i/$SEARCH_FOR; then ++ SQLITE_DIR=$i ++ echo "$ac_t""found in $i" 1>&6 ++ fi ++ done ++ fi ++ ++ if test -z "$SQLITE_DIR"; then ++ echo "$ac_t""not found" 1>&6 ++ { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } ++ fi -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ ac_cv_func_dns_search=yes - else -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" +- $SNMP_SHARED_LIBADD +- " ++ -L$SQLITE_DIR/$PHP_LIBDIR -lm ++ " -- fi -- -+ unset ac_cv_lib_bind_dns_search -+ unset ac_cv_lib_bind___dns_search -+ unset found -+ echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 -+echo "configure:91653: checking for dns_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -- ;; -- esac -- done -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 + save_ext_shared=$ext_shared + ext_shared=yes +@@ -84875,27 +89221,27 @@ fi + esac + done - echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -echo "configure:84880: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 -ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 -+echo "configure:91692: checking for __dns_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 ++echo "configure:89226: checking for sqlite_open in -lsqlite" >&5 ++ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-l$SNMP_LIBNAME $LIBS" -+LIBS="-lbind $LIBS" ++LIBS="-lsqlite $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:91711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:89245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -84910,145 +91722,89 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- +@@ -84914,97 +89260,69 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + - cat >> confdefs.h <<\EOF -#define HAVE_SNMP_PARSE_OID 1 -EOF - - - -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no -+fi +-else +- echo "$ac_t""no" 1>&6 ++ - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid -- - - fi - ++ if test "$ext_shared" = "yes"; then ++ SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" ++ if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then ++ ++ if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then + +- +-fi +- ++ if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$SQLITE_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" ++ fi -- + - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" - $SNMP_SHARED_LIBADD @@ -33945,41 +32419,28 @@ - for ac_i in $ac_stuff; do - case $ac_i in - -pthread) -- if test "$ext_shared" = "yes"; then + if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -pthread" -- else -- -- ++ SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD" + else + + - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- + - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "EXTRA_LDFLAGS$unique=set" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lbind" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ -+ LIBS=$ac_libs ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ fi - fi @@ -33995,599 +32456,842 @@ - LDFLAGS="$LDFLAGS -l$ac_ii" - else - -+ if test "$found" = "yes"; then -+ - +- - case $ac_ii in -+ case bind in - c|c_r|pthread*) ;; - *) +- c|c_r|pthread*) ;; +- *) - LIBS="$LIBS -l$ac_ii" - ;; - esac + ++ fi ++ ++ fi + + fi +- ;; +- esac - -- -- fi -+ LIBS="-lbind $LIBS" - ;; - esac - ++ else ++ - ;; - -L*) - ac_ii=`echo $ac_i|cut -c 3-` - - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- ++ if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then + - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -- else -- ++ if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$SQLITE_DIR/$PHP_LIBDIR + else + - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- ++ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" + fi + + - if test "$ext_shared" = "yes"; then - LDFLAGS="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi -- -- ++ + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +@@ -85020,93 +89338,171 @@ fi + fi + + - fi -- -- fi -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 -+EOF + + fi - ;; - esac - done -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF ++ fi ++ ++ ++ case sqlite in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsqlite $LIBS" ++ ;; ++ esac - echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -echo "configure:85033: checking for init_snmp in -l$SNMP_LIBNAME" >&5 -ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'` -+ ac_cv_func_dns_search=yes -+ else -+ -+ -+ unset ac_cv_lib_socket_dns_search -+ unset ac_cv_lib_socket___dns_search -+ unset found -+ echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:91789: checking for dns_search in -lsocket" >&5 -+ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" -LIBS="-l$SNMP_LIBNAME $LIBS" -+LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:91808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -85063,2353 +91819,2264 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- ++ ++ fi ++ ++ ++ ++ if test "$SQLITE_DIR/include" != "/usr/include"; then + - cat >> confdefs.h <<\EOF -#define HAVE_SNMP 1 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 +-EOF ++ if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then ++ ai_p=$SQLITE_DIR/include ++ else ++ ++ ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" ++ fi + ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi + -+ echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:91828: checking for __dns_search in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -- -- -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes ++ + else echo "$ac_t""no" 1>&6 -+found=no -+fi -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared - unset ac_cv_lib_$SNMP_LIBNAME_init_snmp -- ++ unset ac_cv_lib_sqlite_sqlite_open ++ ++ { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; } + - { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; } - fi ++ SQLITE_MODULE_TYPE=external ++ PHP_SQLITE_CFLAGS=$pdo_inc_path ++ sqlite_extra_sources="libsqlite/src/encode.c" ++ else ++ # use bundled library ++ ++ # we only support certain lemon versions ++ lemon_version_list="1.0" - if test "$PHP_UCD_SNMP_HACK" = "yes" ; then - cat >> confdefs.h <<\EOF -#define UCD_SNMP_HACK 1 -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lsocket" -+ if test "$cross_compiling" = yes; then -+ found=no +-EOF ++ # Extract the first word of "lemon", so it can be a program name with args. ++set dummy lemon; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:89418: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 +else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes ++ if test -n "$LEMON"; then ++ ac_cv_prog_LEMON="$LEMON" # Let the user override the test. +else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_prog_LEMON="lemon" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" +fi -+rm -fr conftest* ++fi ++LEMON="$ac_cv_prog_LEMON" ++if test -n "$LEMON"; then ++ echo "$ac_t""$LEMON" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ if test "$LEMON"; then ++ echo $ac_n "checking for lemon version""... $ac_c" 1>&6 ++echo "configure:89446: checking for lemon version" >&5 ++if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ++ lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` ++ php_cv_lemon_version=invalid ++ for lemon_check_version in $lemon_version_list; do ++ if test "$lemon_version" = "$lemon_check_version"; then ++ php_cv_lemon_version="$lemon_check_version (ok)" ++ fi ++ done ++ +fi -+ LIBS=$ac_libs ++echo "$ac_t""$php_cv_lemon_version" 1>&6 ++ else ++ lemon_version=none fi -- -- ++ case $php_cv_lemon_version in ++ ""|invalid) ++ lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." ++ echo "configure: warning: $lemon_msg" 1>&2 ++ LEMON="exit 0;" ++ ;; ++ esac + ++ PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" ++ ++ ++ SQLITE_MODULE_TYPE=builtin ++ PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" ++ sqlite_extra_sources="libsqlite/src/opcodes.c \ ++ libsqlite/src/parse.c libsqlite/src/encode.c \ ++ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ ++ libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \ ++ libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \ ++ libsqlite/src/os.c libsqlite/src/pager.c \ ++ libsqlite/src/printf.c libsqlite/src/random.c \ ++ libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \ ++ libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \ ++ libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \ ++ libsqlite/src/vacuum.c libsqlite/src/copy.c \ ++ libsqlite/src/vdbeaux.c libsqlite/src/date.c \ ++ libsqlite/src/where.c libsqlite/src/trigger.c" ++ fi ++ sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" + - ext_builddir=ext/snmp - ext_srcdir=$abs_srcdir/ext/snmp -- ++ ext_builddir=ext/sqlite ++ ext_srcdir=$abs_srcdir/ext/sqlite + - ac_extra= ++ ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_SNMP_SHARED=no -+ if test "$found" = "yes"; then ++ PHP_SQLITE_SHARED=no - case ext/snmp in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ case ext/sqlite in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case socket in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsocket $LIBS" -+ ;; ++ /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -- -- -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS + + +@@ -85121,7 +89517,7 @@ EOF + + + old_IFS=$IFS - for ac_src in snmp.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ for ac_src in $sqlite_sources; do + + IFS=. + set $ac_src +@@ -85144,18 +89540,18 @@ EOF + done -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 - EOF -- done -- -- - EXT_STATIC="$EXT_STATIC snmp" -- if test "$ext_shared" != "nocli"; then ++ EXT_STATIC="$EXT_STATIC sqlite" + if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" -- fi -- else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" + fi + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_SNMP_SHARED=yes -- ++ PHP_SQLITE_SHARED=yes + - case ext/snmp in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ case ext/sqlite in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -- -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -- -- -- old_IFS=$IFS ++ /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -85170,14 +89566,14 @@ EOF + + + old_IFS=$IFS - for ac_src in snmp.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- ++ for ac_src in $sqlite_sources; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + - shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 - EOF -- done -- -- case $host_alias in -- *netware*) -- -- install_modules="install-modules" ++ shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" -- case $host_alias in -- *aix*) -- suffix=so + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +@@ -85200,31 +89596,31 @@ EOF + case $host_alias in + *aix*) + suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsnmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsnmp.so '$ext_builddir'/phpsnmp.so' -- ;; -- *netware*) -- suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so' + ;; + *netware*) + suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD)' -- ;; -- esac -- -- if test "x" = "xyes"; then ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD)' + ;; + esac + + if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix" -+ ac_cv_func_dns_search=yes ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix" else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix" -- fi -- ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" + fi + - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" -- -- cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects<>Makefile.objects<&6 -+echo "configure:91940: checking for dn_expand" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then ++ am_i_shared=$PHP_SQLITE_SHARED ++ is_it_shared=$PHP_SPL_SHARED ++ is_it_enabled=$PHP_SPL ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension sqlite to build statically, but it ++depends on extension spl, which you've configured to build shared. ++You either need to build sqlite shared or build spl statically for the ++build to be successful. ++" 1>&2; exit 1; } ++ fi ++ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension sqlite, which depends on extension spl, ++but you've either not enabled spl, or have disabled it. ++" 1>&2; exit 1; } ++ fi ++ ++ ++ am_i_shared=$PHP_SQLITE_SHARED ++ is_it_shared=$PHP_PDO_SHARED ++ is_it_enabled=$PHP_PDO ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension sqlite to build statically, but it ++depends on extension pdo, which you've configured to build shared. ++You either need to build sqlite shared or build pdo statically for the ++build to be successful. ++" 1>&2; exit 1; } ++ fi ++ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension sqlite, which depends on extension pdo, ++but you've either not enabled pdo, or have disabled it. ++" 1>&2; exit 1; } ++ fi ++ ++ ++ ++ src=$ext_srcdir/Makefile.frag ++ ac_srcdir=$ext_srcdir ++ ac_builddir=$ext_builddir ++ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments ++ ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" ++ ++ ++ ++ for header_file in $ext_builddir/libsqlite/src/sqlite.h; do ++ ++ ++ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INSTALLHEADERS$unique=set" ++ ++ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" ++ ++ fi ++ ++ done ++ ++ ++ ++ if test "$SQLITE_MODULE_TYPE" = "builtin"; then ++ ++ ++ $php_shtool mkdir -p $ext_builddir/libsqlite/src ++ + ++ echo $ac_n "checking size of char *""... $ac_c" 1>&6 ++echo "configure:89859: checking size of char *" >&5 ++if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_sizeof_char_p=4 ++else ++ cat > conftest.$ac_ext < ++#include ++main() ++{ ++ FILE *f=fopen("conftestval", "w"); ++ if (!f) exit(1); ++ fprintf(f, "%d\n", sizeof(char *)); ++ exit(0); ++} ++EOF ++if { (eval echo configure:89879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ac_cv_sizeof_char_p=`cat conftestval` ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ac_cv_sizeof_char_p=0 ++fi ++rm -fr conftest* + fi + ++fi ++echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 ++cat >> confdefs.h <> confdefs.h <<\EOF ++#define SQLITE_PTR_SZ SIZEOF_CHAR_P ++EOF + +-echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 +-echo "configure:85399: checking whether to enable SOAP support" >&5 +-# Check whether --enable-soap or --disable-soap was given. +-if test "${enable_soap+set}" = set; then +- enableval="$enable_soap" +- PHP_SOAP=$enableval ++ if test "$PHP_SQLITE_UTF8" = "yes"; then ++ SQLITE_ENCODING="UTF8" ++ cat >> confdefs.h <<\EOF ++#define SQLITE_UTF8 1 ++EOF ++ ++ else ++ SQLITE_ENCODING="ISO8859" ++ fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" ++ ++ ++ SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" ++ ++ ++ sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h ++ ++ if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then ++ echo '#include ' > $ext_builddir/libsqlite/src/config.h ++ else ++ echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h ++ fi ++ ++ cat >> $ext_builddir/libsqlite/src/config.h <&6 ++echo "configure:89941: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char dn_expand(); - ++char $ac_func(); ++ +int main() { - --php_enable_soap=no ++ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub_dn_expand) || defined (__stub___dn_expand) ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else -+dn_expand(); ++$ac_func(); +#endif - --echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 --echo "configure:85399: checking whether to enable SOAP support" >&5 --# Check whether --enable-soap or --disable-soap was given. --if test "${enable_soap+set}" = set; then -- enableval="$enable_soap" -- PHP_SOAP=$enableval ++ +; return 0; } +EOF -+if { (eval echo configure:91968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_dn_expand=yes" - else -- -- PHP_SOAP=no -- test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL -- ++if { (eval echo configure:89969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <&6 ++fi ++done ++ ++ for ac_hdr in time.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:89997: checking for $ac_hdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:90007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++ cat >> confdefs.h <&6 ++fi ++done ++ ++fi ++ ++ ++ ++echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 ++echo "configure:90038: checking whether flush should be called explicitly after a buffered io" >&5 ++if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 + else + +- PHP_SOAP=no +- test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL ++if test "$cross_compiling" = yes; then ++ ++ ac_cv_flush_io=no ++ ++else ++ cat > conftest.$ac_ext < ++#include ++ ++int main(int argc, char **argv) ++{ ++ char *filename = tmpnam(NULL); ++ char buffer[64]; ++ int result = 0; ++ ++ FILE *fp = fopen(filename, "wb"); ++ if (NULL == fp) ++ return 0; ++ fputs("line 1\n", fp); ++ fputs("line 2\n", fp); ++ fclose(fp); ++ ++ fp = fopen(filename, "rb+"); ++ if (NULL == fp) ++ return 0; ++ fgets(buffer, sizeof(buffer), fp); ++ fputs("line 3\n", fp); ++ rewind(fp); ++ fgets(buffer, sizeof(buffer), fp); ++ if (0 != strcmp(buffer, "line 1\n")) ++ result = 1; ++ fgets(buffer, sizeof(buffer), fp); ++ if (0 != strcmp(buffer, "line 3\n")) ++ result = 1; ++ fclose(fp); ++ unlink(filename); ++ ++ exit(result); ++} ++ ++EOF ++if { (eval echo configure:90087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ ac_cv_flush_io=no ++ ++else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_dn_expand=no" -+fi -+rm -f conftest* ++ rm -fr conftest* ++ ++ ac_cv_flush_io=yes + fi ++rm -fr conftest* ++fi -+if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 -+echo "configure:91986: checking for __dn_expand" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __dn_expand(); ++fi -+int main() { ++echo "$ac_t""$ac_cv_flush_io" 1>&6 ++if test "$ac_cv_flush_io" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_FLUSHIO 1 ++EOF -ext_output="yes, shared" -ext_shared=yes @@ -34607,173 +33311,271 @@ - ext_shared=no - ;; -esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test -z "$PHP_LIBXML_DIR"; then -- --php_with_libxml_dir=no -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___dn_expand) || defined (__stub_____dn_expand) -+choke me -+#else -+__dn_expand(); -+#endif ++fi --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:85444: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval ++if test "$ac_cv_func_crypt" = "no"; then ++ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 ++echo "configure:90115: checking for crypt in -lcrypt" >&5 ++ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lcrypt $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:90134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_func___dn_expand=yes" - else -- -- PHP_LIBXML_DIR=no -- -- ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_func___dn_expand=no" ++ eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* - fi ++LIBS="$ac_save_LIBS" -+if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then +-echo "$ac_t""$ext_output" 1>&6 ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ found=yes ++ ++ LIBS="-lcrypt $LIBS -lcrypt" ++ cat >> confdefs.h <<\EOF ++#define HAVE_CRYPT 1 ++EOF + ++ +else + echo "$ac_t""no" 1>&6 -+found=no +fi -+ ++ +fi ++ ++echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 ++echo "configure:90163: checking for standard DES crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ++ if test "$cross_compiling" = yes; then ++ ++ ac_cv_crypt_des=yes ++ ++else ++ cat > conftest.$ac_ext <&6 ++#if HAVE_UNISTD_H ++#include ++#endif -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 -+EOF ++#if HAVE_CRYPT_H ++#include ++#endif -+ ac_cv_func_dn_expand=yes -+ ;; +-if test -z "$PHP_LIBXML_DIR"; then ++main() { ++#if HAVE_CRYPT ++ exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); ++#else ++ exit(0); ++#endif ++} ++EOF ++if { (eval echo configure:90193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + -+ *) ++ ac_cv_crypt_des=yes ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + -+ unset ac_cv_lib_resolv_dn_expand -+ unset ac_cv_lib_resolv___dn_expand -+ unset found -+ echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -+echo "configure:92052: checking for dn_expand in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ ac_cv_crypt_des=no ++ ++fi ++rm -fr conftest* ++fi ++ ++fi ++ ++echo "$ac_t""$ac_cv_crypt_des" 1>&6 ++ ++echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 ++echo "configure:90214: checking for extended DES crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext < ++#endif ++ ++#if HAVE_CRYPT_H ++#include ++#endif ++ ++main() { ++#if HAVE_CRYPT ++ exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); ++#else ++ exit(0); ++#endif ++} +EOF -+if { (eval echo configure:92071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" ++if { (eval echo configure:90244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ ac_cv_crypt_ext_des=yes ++ +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ rm -fr conftest* ++ ++ ac_cv_crypt_ext_des=no ++ ++fi ++rm -fr conftest* ++fi ++ ++fi ++ ++echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 ++ ++echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 ++echo "configure:90265: checking for MD5 crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ++if test "$cross_compiling" = yes; then ++ ++ ac_cv_crypt_md5=no ++ ++else ++ cat > conftest.$ac_ext < ++#endif ++ ++#if HAVE_CRYPT_H ++#include ++#endif ++ ++main() { ++#if HAVE_CRYPT ++ char salt[15], answer[40]; ++ ++ salt[0]='$'; salt[1]='1'; salt[2]='$'; ++ salt[3]='r'; salt[4]='a'; salt[5]='s'; ++ salt[6]='m'; salt[7]='u'; salt[8]='s'; ++ salt[9]='l'; salt[10]='e'; salt[11]='$'; ++ salt[12]='\0'; ++ strcpy(answer,salt); ++ strcat(answer,"rISCgZzpwk3UhDidwXvin0"); ++ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); ++#else ++ exit(0); ++#endif ++} ++EOF ++if { (eval echo configure:90304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + +-php_with_libxml_dir=no ++ ac_cv_crypt_md5=yes + +-echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:85444: checking libxml2 install dir" >&5 +-# Check whether --with-libxml-dir or --without-libxml-dir was given. +-if test "${with_libxml_dir+set}" = set; then +- withval="$with_libxml_dir" +- PHP_LIBXML_DIR=$withval + else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + +- PHP_LIBXML_DIR=no +- ++ ac_cv_crypt_md5=no + + fi +- +- +-ext_output=$PHP_LIBXML_DIR +-echo "$ac_t""$ext_output" 1>&6 +- +- +- ++rm -fr conftest* fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -if test "$PHP_SOAP" != "no"; then -- ++fi + - if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 ++echo "$ac_t""$ac_cv_crypt_md5" 1>&6 - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:85472: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+ echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 -+echo "configure:92091: checking for __dn_expand in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 ++echo "configure:90325: checking for Blowfish crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -- + - for i in $PHP_LIBXML_DIR /usr/local /usr; do - if test -x "$i/bin/xml2-config"; then - ac_cv_php_xml2_config_path="$i/bin/xml2-config" - break - fi - done -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" +-fi +else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" - fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" ++ cat > conftest.$ac_ext <&6 -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi ++#if HAVE_UNISTD_H ++#include ++#endif - if test -x "$ac_cv_php_xml2_config_path"; then - XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -34796,39 +33598,15 @@ - - - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - +- - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "EXTRA_LDFLAGS$unique=set" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+fi -+ -+ -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ -+ LIBS=$ac_libs - fi +- fi ++#if HAVE_CRYPT_H ++#include ++#endif - fi - ;; @@ -34843,29 +33621,46 @@ - SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" - else - -+ if test "$found" = "yes"; then ++main() { ++#if HAVE_CRYPT ++ char salt[30], answer[70]; + ++ salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; ++ strcat(salt,"rasmuslerd............"); ++ strcpy(answer,salt); ++ strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); ++ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); ++#else ++ exit(0); ++#endif ++} ++EOF ++if { (eval echo configure:90361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then - case $ac_ii in -+ case resolv in - c|c_r|pthread*) ;; - *) +- c|c_r|pthread*) ;; +- *) - LIBS="$LIBS -l$ac_ii" -+ LIBS="-lresolv $LIBS" - ;; - esac +- ;; +- esac ++ ac_cv_crypt_blowfish=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ++ ac_cv_crypt_blowfish=no - fi - ;; - esac -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 -+EOF ++fi ++rm -fr conftest* ++fi -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 -+EOF ++fi - ;; - -L*) @@ -34875,15 +33670,15 @@ - - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -+ ac_cv_func_dn_expand=yes - else - +- else +- - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -- ++echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 + - - if test "$ext_shared" = "yes"; then - SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD" @@ -34893,7 +33688,12 @@ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 ++echo "configure:90382: checking for SHA512 crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -34901,56 +33701,26 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" ++if test "$cross_compiling" = yes; then - fi - -+ unset ac_cv_lib_bind_dn_expand -+ unset ac_cv_lib_bind___dn_expand -+ unset found -+ echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 -+echo "configure:92188: checking for dn_expand in -lbind" >&5 -+ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" +else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" ++ cat > conftest.$ac_ext <&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 ++#if HAVE_UNISTD_H ++#include ++#endif - - for ac_i in $LIBXML_INCS; do @@ -34969,26 +33739,34 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -+ echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 -+echo "configure:92227: checking for __dn_expand in -lbind" >&5 -+ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" -+cat > conftest.$ac_ext < ++#endif -- -- ++main() { ++#if HAVE_CRYPT ++ char salt[30], answer[80]; + ++ salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; ++ strcpy(answer, salt); ++ strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); ++ exit (strcmp((char *)crypt("foo",salt),answer)); ++#else ++ exit(0); ++#endif ++} ++EOF ++if { (eval echo configure:90417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ ac_cv_crypt_SHA512=yes ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" @@ -35000,45 +33778,29 @@ - fi - - fi -+int main() { -+__dn_expand() -+; return 0; } -+EOF -+if { (eval echo configure:92246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" ++ ac_cv_crypt_SHA512=no - fi +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no ++rm -fr conftest* +fi - ;; - esac - done -+ +fi ++echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:85630: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ++echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 ++echo "configure:90438: checking for SHA256 crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + - - old_LIBS=$LIBS - LIBS=" @@ -35047,18 +33809,16 @@ - if test "$cross_compiling" = yes; then - - LIBS=$old_LIBS -- -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lbind" -+ if test "$cross_compiling" = yes; then -+ found=no ++if test "$cross_compiling" = yes; then + ++ ac_cv_crypt_SHA256=no ++ else cat > conftest.$ac_ext < ++#endif ++ ++#if HAVE_CRYPT_H ++#include ++#endif ++ ++main() { ++#if HAVE_CRYPT ++ char salt[30], answer[80]; ++ salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; ++ strcat(salt,""); ++ strcpy(answer, salt); ++ strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); ++ exit (strcmp((char *)crypt("foo",salt),answer)); ++#else ++ exit(0); ++#endif ++} EOF -if { (eval echo configure:85657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:92282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:90473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then -- + - LIBS=$old_LIBS - - php_cv_libxml_build_works=yes - - -+ found=yes ++ ac_cv_crypt_SHA256=yes ++ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* -- + - LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - -+ found=no ++ ac_cv_crypt_SHA256=no ++ fi rm -fr conftest* fi -+ LIBS=$ac_libs -+ fi - -- --fi - +- + fi + -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 - if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF @@ -35111,31 +33890,35 @@ - cat >> confdefs.h <<\EOF -#define HAVE_SOAP 1 -EOF -- ++echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 + - - ext_builddir=ext/soap - ext_srcdir=$abs_srcdir/ext/soap -- + - ac_extra= -- ++if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then + - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_SOAP_SHARED=no -+ if test "$found" = "yes"; then - - +- +- - case ext/soap in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case bind in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lbind $LIBS" -+ ;; - esac -- +- esac - -- ++ echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 ++echo "configure:90497: checking whether the compiler supports __alignof__" >&5 ++if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + ++ cat > conftest.$ac_ext <>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 ++ int align = __alignof__(int); ++ ++; return 0; } EOF - done - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF - +- +- - EXT_STATIC="$EXT_STATIC soap" - if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC soap" - fi -+ ac_cv_func_dn_expand=yes - else +- else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_SOAP_SHARED=yes - @@ -35188,28 +33969,12 @@ - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -- -+ ++if { (eval echo configure:90513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* -+ unset ac_cv_lib_socket_dn_expand -+ unset ac_cv_lib_socket___dn_expand -+ unset found -+ echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 -+echo "configure:92324: checking for dn_expand in -lsocket" >&5 -+ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" +- +- old_IFS=$IFS +- for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -- old_IFS=$IFS -- for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do -- + - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo" -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - +- - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -+ echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 -+echo "configure:92363: checking for __dn_expand in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&6 ++ if test "$ac_cv_alignof_exists" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_ALIGNOF 1 EOF - done - @@ -35285,18 +34024,7 @@ - *netware*) - - install_modules="install-modules" -+if { (eval echo configure:92382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - +- - case $host_alias in - *aix*) - suffix=so @@ -35311,53 +34039,58 @@ - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD)' - ;; - esac -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" -- fi - + fi +- - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" -- + - cat >>Makefile.objects<&6 ++echo "configure:90538: checking whether the compiler supports aligned attribute" >&5 ++if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes ++ unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int)))); ++ ++; return 0; } ++EOF ++if { (eval echo configure:90554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ++ ac_cv_attribute_aligned=yes ++ +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no ++ rm -rf conftest* ++ ++ ac_cv_attribute_aligned=no ++ +fi -+rm -fr conftest* ++rm -f conftest* +fi ++ ++echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 ++ if test "$ac_cv_attribute_aligned" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_ATTRIBUTE_ALIGNED 1 + EOF - ;; - *) @@ -35383,65 +34116,108 @@ - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix" -+ LIBS=$ac_libs fi - - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" ++ - cat >>Makefile.objects<> confdefs.h <> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 ++ cat >> confdefs.h <> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 ++ cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>Makefile.objects<> confdefs.h <&6 -+echo "configure:92475: checking for dn_skipname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dn_skipname(); +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ if test "$ac_cv_crypt_blowfish" = "yes"; then ++ ac_result=1 ++ ac_crypt_blowfish=1 ++ else ++ ac_result=0 ++ ac_crypt_blowfish=0 ++ fi ++ cat >> confdefs.h <>Makefile.objects<> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_dn_skipname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_dn_skipname=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 -+echo "configure:92521: checking for __dn_skipname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then + +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC soap" ++ if test "$ac_cv_crypt_md5" = "yes"; then ++ ac_result=1 ++ ac_crypt_md5=1 ++ else ++ ac_result=0 ++ ac_crypt_md5=0 + fi ++ cat >> confdefs.h <> confdefs.h <> confdefs.h <&2; exit 1; } +- fi +-else +- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } +- +- fi ++ cat >> confdefs.h <&6 ++echo "configure:90733: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __dn_skipname(); - -- EXT_STATIC="$EXT_STATIC soap" -- ;; -- *) -- -- -- case ext/soap in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- ++char $ac_func(); ++ +int main() { -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname) ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else -+__dn_skipname(); ++$ac_func(); +#endif +-php_enable_sockets=no +; return 0; } +EOF -+if { (eval echo configure:92549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:90761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_func___dn_skipname=yes" ++ eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_func___dn_skipname=no" ++ eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi - -- old_IFS=$IFS -- for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ found=yes ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <&6 -+found=no -+fi -+ +fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_DN_SKIPNAME 1 - EOF -- done - -- -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC soap" -- fi -- -+ ac_cv_func_dn_skipname=yes -+ ;; - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ *) - -+ unset ac_cv_lib_resolv_dn_skipname -+ unset ac_cv_lib_resolv___dn_skipname -+ unset found -+ echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 -+echo "configure:92587: checking for dn_skipname in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++done ++ ++echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 ++echo "configure:90786: checking for working fnmatch" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" ++if { (eval echo configure:90801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ac_cv_func_fnmatch_works=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ rm -fr conftest* ++ ac_cv_func_fnmatch_works=no +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=soap -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -- fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD" ++rm -fr conftest* +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- -- else -- { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -- -- fi -+ echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 -+echo "configure:92626: checking for __dn_skipname in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ ++fi ++ ++echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6 ++if test $ac_cv_func_fnmatch_works = yes; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_FNMATCH 1 ++EOF ++ ++fi ++ ++ ++ ++for ac_func in fork CreateProcess ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:90828: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __dn_skipname(); - ++char $ac_func(); ++ +int main() { -+__dn_skipname() ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif ++ +; return 0; } +EOF -+if { (eval echo configure:92645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:90856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" ++ eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" - fi ++ eval "ac_cv_func_$ac_func=no" ++fi +rm -f conftest* -+LIBS="$ac_save_LIBS" - +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ found=yes ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <&6 -+found=no -+fi - -+ ++php_can_support_proc_open=no ++ +fi - --php_enable_sockets=no ++done ++ ++echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 ++echo "configure:90886: checking if your OS can spawn processes with inherited handles" >&5 ++if test "$php_can_support_proc_open" = "yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define PHP_CAN_SUPPORT_PROC_OPEN 1 ++EOF -echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 -echo "configure:86007: checking whether to enable sockets support" >&5 @@ -35740,37 +34514,88 @@ -if test "${enable_sockets+set}" = set; then - enableval="$enable_sockets" - PHP_SOCKETS=$enableval -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no else -- ++ echo "$ac_t""no" 1>&6 ++fi ++ ++if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then ++ cat >> confdefs.h <<\EOF ++#define ENABLE_CHROOT_FUNC 1 ++EOF ++ ++fi ++ ++ ++ unset ac_cv_func_res_nsearch ++ unset ac_cv_func___res_nsearch ++ unset found + - PHP_SOCKETS=no - test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL -- ++ echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 ++echo "configure:90910: checking for res_nsearch" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char res_nsearch(); ++ ++int main() { ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch) ++choke me ++#else ++res_nsearch(); ++#endif + ++; return 0; } +EOF -+if { (eval echo configure:92681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes ++if { (eval echo configure:90938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_res_nsearch=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no ++ rm -rf conftest* ++ eval "ac_cv_func_res_nsearch=no" +fi -+rm -fr conftest* ++rm -f conftest* fi -+ LIBS=$ac_libs -+ fi ++if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 ++echo "configure:90956: checking for __res_nsearch" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __res_nsearch(); + ++int main() { -- -ext_output="yes, shared" -ext_shared=yes -case $PHP_SOCKETS in @@ -35789,54 +34614,76 @@ - ext_shared=no - ;; -esac -+ if test "$found" = "yes"; then -+ -+ -+ case resolv in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lresolv $LIBS" -+ ;; -+ esac - ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) ++choke me ++#else ++__res_nsearch(); ++#endif -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_SKIPNAME 1 ++; return 0; } +EOF ++if { (eval echo configure:90984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func___res_nsearch=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func___res_nsearch=no" ++fi ++rm -f conftest* ++fi + ++if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi ++ ++fi -echo "$ac_t""$ext_output" 1>&6 + ++ case $found in ++ yes) + cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 ++#define HAVE_RES_NSEARCH 1 +EOF -+ ac_cv_func_dn_skipname=yes -+ else -+ ++ ac_cv_func_res_nsearch=yes ++ ;; + -+ unset ac_cv_lib_bind_dn_skipname -+ unset ac_cv_lib_bind___dn_skipname ++ *) ++ ++ unset ac_cv_lib_resolv_res_nsearch ++ unset ac_cv_lib_resolv___res_nsearch + unset found -+ echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 -+echo "configure:92723: checking for dn_skipname in -lbind" >&5 -+ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 ++echo "configure:91022: checking for res_nsearch in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" ++LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -35848,20 +34695,20 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" +-if test "$PHP_SOCKETS" != "no"; then +- echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 +-echo "configure:86049: checking for struct cmsghdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 - --if test "$PHP_SOCKETS" != "no"; then -- echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 --echo "configure:86049: checking for struct cmsghdr" >&5 --if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then -+ echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 -+echo "configure:92762: checking for __dn_skipname in -lbind" >&5 -+ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` ++ ++ echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 ++echo "configure:91061: checking for __res_nsearch in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -35869,24 +34716,24 @@ - cat > conftest.$ac_ext < conftest.$ac_ext < -#include int main() { -struct cmsghdr s; s -+__dn_skipname() ++__res_nsearch() ; return 0; } EOF -if { (eval echo configure:86064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:92781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_cmsghdr=yes + eval "ac_cv_lib_$ac_lib_var=yes" @@ -35917,16 +34764,16 @@ - if test "$ac_cv_cmsghdr" = yes; then + if test "$found" = "yes"; then + ac_libs=$LIBS -+ LIBS="$LIBS -lbind" ++ LIBS="$LIBS -lresolv" + if test "$cross_compiling" = yes; then + found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:91116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -35944,22 +34791,22 @@ + if test "$found" = "yes"; then + + -+ case bind in ++ case resolv in + c|c_r|pthread*) ;; + *) -+ LIBS="-lbind $LIBS" ++ LIBS="-lresolv $LIBS" + ;; + esac + + cat >> confdefs.h <<\EOF -#define HAVE_CMSGHDR 1 -+#define HAVE_DN_SKIPNAME 1 ++#define HAVE_RES_NSEARCH 1 EOF - fi + cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 ++#define HAVE_LIBRESOLV 1 +EOF - for ac_func in hstrerror socketpair @@ -35967,25 +34814,25 @@ -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:86089: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ ac_cv_func_dn_skipname=yes ++ ac_cv_func_res_nsearch=yes + else + + -+ unset ac_cv_lib_socket_dn_skipname -+ unset ac_cv_lib_socket___dn_skipname ++ unset ac_cv_lib_bind_res_nsearch ++ unset ac_cv_lib_bind___res_nsearch + unset found -+ echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 -+echo "configure:92859: checking for dn_skipname in -lsocket" >&5 -+ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 ++echo "configure:91158: checking for res_nsearch in -lbind" >&5 ++ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:92878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_lib_$ac_lib_var=yes" @@ -36047,34 +34894,34 @@ -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:86145: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 -+echo "configure:92898: checking for __dn_skipname in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 ++echo "configure:91197: checking for __res_nsearch in -lbind" >&5 ++ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __dn_skipname(); ++char __res_nsearch(); + +int main() { -+__dn_skipname() ++__res_nsearch() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:86155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then -+if { (eval echo configure:92917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=yes" @@ -36111,13 +34958,13 @@ + + if test "$found" = "yes"; then + ac_libs=$LIBS -+ LIBS="$LIBS -lsocket" ++ LIBS="$LIBS -lbind" + if test "$cross_compiling" = yes; then + found=no +else cat > conftest.$ac_ext < @@ -36130,7 +34977,7 @@ EOF -if { (eval echo configure:86192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -+if { (eval echo configure:92953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:91252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes else @@ -36170,15 +35017,15 @@ - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case socket in ++ case bind in + c|c_r|pthread*) ;; + *) -+ LIBS="-lsocket $LIBS" ++ LIBS="-lbind $LIBS" + ;; esac - - -- + - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta @@ -36197,7 +35044,7 @@ - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - +- - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -36209,16 +35056,20 @@ -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src - $ac_comp + cat >> confdefs.h <<\EOF -+#define HAVE_DN_SKIPNAME 1 ++#define HAVE_RES_NSEARCH 1 EOF - done -- -- + ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBBIND 1 ++EOF + - EXT_STATIC="$EXT_STATIC sockets" - if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" - fi -- else ++ ac_cv_func_res_nsearch=yes + else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_SOCKETS_SHARED=yes - @@ -36241,7 +35092,8 @@ - - old_IFS=$IFS - for ac_src in sockets.c; do -- ++ + - IFS=. - set $ac_src - ac_obj=$1 @@ -36255,12 +35107,31 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac ++ unset ac_cv_lib_socket_res_nsearch ++ unset ac_cv_lib_socket___res_nsearch ++ unset found ++ echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 ++echo "configure:91294: checking for res_nsearch in -lsocket" >&5 ++ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lsocket $LIBS" ++cat > conftest.$ac_ext <>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 ++int main() { ++res_nsearch() ++; return 0; } EOF - done - @@ -36283,28 +35154,70 @@ - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(PHPSOCKETS_SHARED_LIBADD)' - ;; - esac - +- - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsockets.$suffix" -+ ac_cv_func_dn_skipname=yes - else +- else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix" -+ -+ : -+ - fi - +- fi +- - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" -- ++if { (eval echo configure:91313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + - cat >>Makefile.objects<&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 + -$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES) - $link_cmd -- --EOF -- ++ echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 ++echo "configure:91333: checking for __res_nsearch in -lsocket" >&5 ++ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lsocket $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + - ;; - *) - @@ -36324,47 +35237,84 @@ - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(SOCKETS_SHARED_LIBADD)' - ;; - esac ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix" - fi +- fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" - - cat >>Makefile.objects<> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi + - fi ++ LIBS=$ac_libs fi -- + - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_SOCKETS_SHARED=no - case "$PHP_SAPI" in - cgi|embed) - -- ++ if test "$found" = "yes"; then ++ + - case ext/sockets in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - -+ ;; - ++ case socket in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsocket $LIBS" ++ ;; + esac +- +- - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre @@ -36373,7 +35323,6 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -+ esac - old_IFS=$IFS @@ -36385,40 +35334,29 @@ - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - +- - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac ++ cat >> confdefs.h <<\EOF ++#define HAVE_RES_NSEARCH 1 ++EOF - cat >>Makefile.objects<> confdefs.h <<\EOF ++#define HAVE_LIBSOCKET 1 + EOF - done -+ unset ac_cv_func_res_search -+ unset ac_cv_func___res_search -+ unset found -+ -+ echo $ac_n "checking for res_search""... $ac_c" 1>&6 -+echo "configure:93012: checking for res_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char res_search(); -+int main() { ++ ac_cv_func_res_nsearch=yes ++ else ++ ++ : - EXT_STATIC="$EXT_STATIC sockets" - ;; @@ -36430,16 +35368,11 @@ - /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -- -- -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_res_search) || defined (__stub___res_search) -+choke me -+#else -+res_search(); -+#endif ++ fi + ++ ++ fi + - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre @@ -36448,86 +35381,136 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo ++ fi ++ ++ ;; ++ ++ esac + + +- old_IFS=$IFS +- for ac_src in sockets.c; do ++ unset ac_cv_func_dns_search ++ unset ac_cv_func___dns_search ++ unset found + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ echo $ac_n "checking for dns_search""... $ac_c" 1>&6 ++echo "configure:91445: checking for dns_search" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char dns_search(); + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac ++int main() { + +- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +- done ++if { (eval echo configure:91473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_func_res_search=yes" ++ eval "ac_cv_func_dns_search=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_func_res_search=no" ++ eval "ac_cv_func_dns_search=no" +fi +rm -f conftest* +fi -+if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __res_search""... $ac_c" 1>&6 -+echo "configure:93058: checking for __res_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then ++ echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 ++echo "configure:91491: checking for __dns_search" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __res_search(); ++char __dns_search(); -- old_IFS=$IFS -- for ac_src in sockets.c; do +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" +- fi +- +- +- BUILD_DIR="$BUILD_DIR $ext_builddir" - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" +int main() { -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub___res_search) || defined (__stub_____res_search) ++#if defined (__stub___dns_search) || defined (__stub_____dns_search) +choke me +#else -+__res_search(); ++__dns_search(); +#endif -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:91519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_func___res_search=yes" ++ eval "ac_cv_func___dns_search=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_func___res_search=no" ++ eval "ac_cv_func___dns_search=no" +fi +rm -f conftest* +fi -+ -+if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then + +- fi ++if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else @@ -36537,48 +35520,58 @@ + +fi - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" -- fi -- ++ + case $found in + yes) + cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 ++#define HAVE_DNS_SEARCH 1 +EOF + -+ ac_cv_func_res_search=yes ++ ac_cv_func_dns_search=yes + ;; -- BUILD_DIR="$BUILD_DIR $ext_builddir" + *) -+ unset ac_cv_lib_resolv_res_search -+ unset ac_cv_lib_resolv___res_search +- header_path=ext/sockets/ +- for header_file in php_sockets.h; do +- hp_hf="$header_path/$header_file" +- +- +- unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INSTALLHEADERS$unique=set" +- +- INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" +- +- fi ++ unset ac_cv_lib_resolv_dns_search ++ unset ac_cv_lib_resolv___dns_search + unset found -+ echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:93124: checking for res_search in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 ++echo "configure:91557: checking for dns_search in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36590,55 +35583,34 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=sockets -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+fi + fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 -- fi -+ echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:93163: checking for __res_search in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 ++echo "configure:91596: checking for __dns_search in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36649,9 +35621,7 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - -- done -- ++ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -36661,10 +35631,6 @@ +found=no +fi -+ - fi - - - echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 -echo "configure:86526: checking whether zend_object_value is packed" >&5 - old_CPPFLAGS=$CPPFLAGS @@ -36673,7 +35639,10 @@ - - ac_result=0 - echo "$ac_t""no" 1>&6 -- + ++fi ++ ++ + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lresolv" @@ -36682,7 +35651,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:91651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - - ac_result=1 @@ -36757,7 +35726,7 @@ - b_lo=$php_lo + cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 ++#define HAVE_DNS_SEARCH 1 +EOF - old_IFS=$IFS @@ -36779,38 +35748,38 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -+ ac_cv_func_res_search=yes ++ ac_cv_func_dns_search=yes + else + + -+ unset ac_cv_lib_bind_res_search -+ unset ac_cv_lib_bind___res_search ++ unset ac_cv_lib_bind_dns_search ++ unset ac_cv_lib_bind___dns_search + unset found -+ echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 -+echo "configure:93260: checking for res_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 ++echo "configure:91693: checking for dns_search in -lbind" >&5 ++ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36844,21 +35813,21 @@ - esac - - -+ echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 -+echo "configure:93299: checking for __res_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 ++echo "configure:91732: checking for __dns_search in -lbind" >&5 ++ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36920,30 +35889,17 @@ + found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - +- - case $host_alias in - *netware*) - - install_modules="install-modules" -+ LIBS=$ac_libs -+ fi - +- - case $host_alias in - *aix*) - suffix=so @@ -36957,65 +35913,107 @@ - suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD)' - ;; -+ if test "$found" = "yes"; then -+ -+ -+ case bind in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lbind $LIBS" -+ ;; - esac +- esac ++if { (eval echo configure:91787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" -- fi ++ LIBS=$ac_libs + fi - - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" - cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 -+EOF ++ if test "$found" = "yes"; then ++ ++ ++ case bind in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lbind $LIBS" ++ ;; ++ esac -$ext_builddir/phpspl.$suffix: \$(shared_objects_spl) \$(PHPSPL_SHARED_DEPENDENCIES) - $link_cmd + ++ cat >> confdefs.h <<\EOF ++#define HAVE_DNS_SEARCH 1 + EOF + +- ;; +- *) +- +- install_modules="install-modules" +- +- case $host_alias in +- *aix*) +- suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so' +- ;; +- *netware*) +- suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)' +- ;; +- *) +- suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD)' +- ;; +- esac + cat >> confdefs.h <<\EOF +#define HAVE_LIBBIND 1 +EOF -+ -+ ac_cv_func_res_search=yes -+ else + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix" ++ ac_cv_func_dns_search=yes + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix" +- fi + -+ -+ unset ac_cv_lib_socket_res_search -+ unset ac_cv_lib_socket___res_search + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" ++ unset ac_cv_lib_socket_dns_search ++ unset ac_cv_lib_socket___dns_search + unset found -+ echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:93396: checking for res_search in -lsocket" >&5 -+ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 ++echo "configure:91829: checking for dns_search in -lsocket" >&5 ++ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:91848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -37027,10 +36025,8 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- ;; -- *) -- -- install_modules="install-modules" +-$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES) +- $link_cmd +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -37038,48 +36034,32 @@ +else + echo "$ac_t""no" 1>&6 -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD)' -- ;; -- esac -+ echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:93435: checking for __res_search in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'` +-EOF ++ echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 ++echo "configure:91868: checking for __dns_search in -lsocket" >&5 ++ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF ++if { (eval echo configure:91887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -37091,9 +36071,8 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- cat >>Makefile.objects<&6 @@ -37103,17 +36082,29 @@ +found=no +fi --$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES) -- $link_cmd -+ +- if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then +- PHP_SPL_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) +- +- +- case ext/spl in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +- + +fi --EOF +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo -- ;; -- esac -- cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++EOF ++if { (eval echo configure:91923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -37137,55 +36128,26 @@ +rm -fr conftest* +fi -- fi +- old_IFS=$IFS +- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do + LIBS=$ac_libs - fi - -- if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then -- PHP_SPL_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- ++ fi ++ + if test "$found" = "yes"; then + -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case socket in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsocket $LIBS" -+ ;; - esac -- -- - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 -+EOF - -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -- - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 -+EOF ++ case socket in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsocket $LIBS" ++ ;; ++ esac - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -37193,46 +36155,39 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -+ ac_cv_func_res_search=yes -+ else -+ -+ : - cat >>Makefile.objects<> confdefs.h <<\EOF ++#define HAVE_DNS_SEARCH 1 + EOF - done -+ fi -+ -+ fi -+ ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBSOCKET 1 ++EOF - EXT_STATIC="$EXT_STATIC spl" - ;; - *) - -+ fi -+ -+ ;; - +- - case ext/spl in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ +- esac ++ ac_cv_func_dns_search=yes ++ else ++ ++ : + -+echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 -+echo "configure:93543: checking whether atof() accepts NAN" >&5 -+if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else ++ fi -+if test "$cross_compiling" = yes; then ++ ++ fi -+ ac_cv_atof_accept_nan=no - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre @@ -37241,30 +36196,40 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -+else -+ cat > conftest.$ac_ext < -+#include - old_IFS=$IFS - for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -- ++ unset ac_cv_func_dn_expand ++ unset ac_cv_func___dn_expand ++ unset found + - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+#ifdef HAVE_ISNAN -+#define zend_isnan(a) isnan(a) -+#elif defined(HAVE_FPCLASS) -+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -+#else -+#define zend_isnan(a) 0 -+#endif ++ echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 ++echo "configure:91980: checking for dn_expand" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char dn_expand(); - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -37272,63 +36237,106 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -+int main(int argc, char** argv) -+{ -+ return zend_isnan(atof("NAN")) ? 0 : 1; -+} ++int main() { - cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_dn_expand=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_dn_expand=no" ++fi ++rm -f conftest* ++fi + ++if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 ++echo "configure:92026: checking for __dn_expand" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __dn_expand(); + - ;; - esac - EXT_CLI_STATIC="$EXT_CLI_STATIC spl" - fi - -+if { (eval echo configure:93574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - +- - BUILD_DIR="$BUILD_DIR $ext_builddir" -+ ac_cv_atof_accept_nan=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -+ ac_cv_atof_accept_nan=no +- ++int main() { -+fi -+rm -fr conftest* -+fi ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub___dn_expand) || defined (__stub_____dn_expand) ++choke me ++#else ++__dn_expand(); ++#endif - if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=spl - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++; return 0; } ++EOF ++if { (eval echo configure:92054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func___dn_expand=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func___dn_expand=no" ++fi ++rm -f conftest* +fi - fi -+echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 -+if test "$ac_cv_atof_accept_nan" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATOF_ACCEPTS_NAN 1 -+EOF - -+fi -+ -+echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 -+echo "configure:93601: checking whether atof() accepts INF" >&5 -+if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes +else - -+if test "$cross_compiling" = yes; then - ++ echo "$ac_t""no" 1>&6 ++found=no ++fi ++ ++fi + +- +- - header_path=ext/spl - for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do - hp_hf="$header_path/$header_file" @@ -37343,16 +36351,18 @@ - INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - - fi -+ ac_cv_atof_accept_inf=no - done - -+else -+ cat > conftest.$ac_ext <> confdefs.h <<\EOF ++#define HAVE_DN_EXPAND 1 ++EOF -- ++ ac_cv_func_dn_expand=yes ++ ;; + - am_i_shared=$PHP_SPL_SHARED - is_it_shared=$PHP_PCRE_SHARED - is_it_enabled=$PHP_PCRE @@ -37370,32 +36380,66 @@ -but you've either not enabled pcre, or have disabled it. -" 1>&2; exit 1; } - fi -- -+#include -+#include ++ *) + ++ unset ac_cv_lib_resolv_dn_expand ++ unset ac_cv_lib_resolv___dn_expand ++ unset found ++ echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 ++echo "configure:92092: checking for dn_expand in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lresolv $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" -+int main(int argc, char** argv) -+{ -+ return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; -+} ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 -php_with_sqlite=yes -+EOF -+if { (eval echo configure:93635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_atof_accept_inf=yes ++ echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 ++echo "configure:92131: checking for __dn_expand in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lresolv $LIBS" ++cat > conftest.$ac_ext <&6 -echo "configure:86909: checking for sqlite support" >&5 @@ -37403,26 +36447,37 @@ -if test "${with_sqlite+set}" = set; then - withval="$with_sqlite" - PHP_SQLITE=$withval ++int main() { ++__dn_expand() ++; return 0; } ++EOF ++if { (eval echo configure:92150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - +- - PHP_SQLITE=yes - test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL -+ ac_cv_atof_accept_inf=no ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" fi -+rm -fr conftest* ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no +fi ++ +fi -+echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 -+if test "$ac_cv_atof_accept_inf" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATOF_ACCEPTS_INF 1 -+EOF -ext_output="yes, shared" -ext_shared=yes @@ -37442,51 +36497,98 @@ - ext_shared=no - ;; -esac -- -- -+fi - --echo "$ac_t""$ext_output" 1>&6 -+echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 -+echo "configure:93662: checking whether HUGE_VAL == INF" >&5 -+if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ -+ ac_cv_huge_val_inf=yes - ++ if test "$found" = "yes"; then ++ ac_libs=$LIBS ++ LIBS="$LIBS -lresolv" ++ if test "$cross_compiling" = yes; then ++ found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi -+#include -+#include ++ LIBS=$ac_libs ++ fi -+#ifdef HAVE_ISINF -+#define zend_isinf(a) isinf(a) -+#elif defined(INFINITY) -+/* Might not work, but is required by ISO C99 */ -+#define zend_isinf(a) (((a)==INFINITY)?1:0) -+#elif defined(HAVE_FPCLASS) -+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) -+#else -+#define zend_isinf(a) 0 -+#endif ++ if test "$found" = "yes"; then ++ ++ ++ case resolv in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lresolv $LIBS" ++ ;; ++ esac -+int main(int argc, char** argv) -+{ -+ return zend_isinf(HUGE_VAL) ? 0 : 1; -+} +-echo "$ac_t""$ext_output" 1>&6 --php_enable_sqlite_utf8=no ++ cat >> confdefs.h <<\EOF ++#define HAVE_DN_EXPAND 1 +EOF -+if { (eval echo configure:93696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then + ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBRESOLV 1 ++EOF + ++ ac_cv_func_dn_expand=yes ++ else ++ + -+ ac_cv_huge_val_inf=yes ++ unset ac_cv_lib_bind_dn_expand ++ unset ac_cv_lib_bind___dn_expand ++ unset found ++ echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 ++echo "configure:92228: checking for dn_expand in -lbind" >&5 ++ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lbind $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + +-php_enable_sqlite_utf8=no ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 -echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 -echo "configure:86953: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 @@ -37494,86 +36596,121 @@ -if test "${enable_sqlite_utf8+set}" = set; then - enableval="$enable_sqlite_utf8" - PHP_SQLITE_UTF8=$enableval ++ echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 ++echo "configure:92267: checking for __dn_expand in -lbind" >&5 ++ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - +- - PHP_SQLITE_UTF8=no - -+ ac_cv_huge_val_inf=no ++ ac_save_LIBS="$LIBS" ++LIBS="-lbind $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" fi -+rm -fr conftest* -+fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" +fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi -ext_output=$PHP_SQLITE_UTF8 -echo "$ac_t""$ext_output" 1>&6 - -+echo "$ac_t""$ac_cv_huge_val_inf" 1>&6 -+if test "$ac_cv_huge_val_inf" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_HUGE_VAL_INF 1 -+EOF - ++ +fi -+echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 -+echo "configure:93723: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 -+if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ -+ ac_cv_huge_val_nan=yes ++ if test "$found" = "yes"; then ++ ac_libs=$LIBS ++ LIBS="$LIBS -lbind" ++ if test "$cross_compiling" = yes; then ++ found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi -+#include -+#include ++ LIBS=$ac_libs ++ fi -+#ifdef HAVE_ISNAN -+#define zend_isnan(a) isnan(a) -+#elif defined(HAVE_FPCLASS) -+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -+#else -+#define zend_isnan(a) 0 -+#endif ++ if test "$found" = "yes"; then ++ ++ ++ case bind in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lbind $LIBS" ++ ;; ++ esac -+int main(int argc, char** argv) -+{ -+#if defined(__sparc__) && !(__GNUC__ >= 3) -+ /* prevent bug #27830 */ -+ return 1; -+#else -+ return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; -+#endif -+} ++ cat >> confdefs.h <<\EOF ++#define HAVE_DN_EXPAND 1 ++EOF + ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBBIND 1 +EOF -+if { (eval echo configure:93759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_huge_val_nan=yes -if test "$PHP_SQLITE" != "no"; then - if test "$PHP_PDO" != "no"; then -- ++ ac_cv_func_dn_expand=yes ++ else + - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:86981: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ unset ac_cv_lib_socket_dn_expand ++ unset ac_cv_lib_socket___dn_expand ++ unset found ++ echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 ++echo "configure:92364: checking for dn_expand in -lsocket" >&5 ++ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - +- - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:86987: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then @@ -37584,11 +36721,31 @@ - pdo_inc_path=$prefix/include/php/ext - fi - -+ ac_cv_huge_val_nan=no ++ ac_save_LIBS="$LIBS" ++LIBS="-lsocket $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" -echo "$ac_t""$pdo_inc_path" 1>&6 - if test -n "$pdo_inc_path"; then @@ -37597,20 +36754,59 @@ -echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 - fi +fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 - if test -n "$pdo_inc_path"; then - cat >> confdefs.h <<\EOF -#define PHP_SQLITE2_HAVE_PDO 1 -+echo "$ac_t""$ac_cv_huge_val_nan" 1>&6 -+if test "$ac_cv_huge_val_nan" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_HUGE_VAL_NAN 1 ++ echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 ++echo "configure:92403: checking for __dn_expand in -lsocket" >&5 ++ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lsocket $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" - pdo_inc_path="-I$pdo_inc_path" - fi - fi -- ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi + - if test "$PHP_SQLITE" != "yes"; then - SEARCH_PATH="/usr/local /usr" - SEARCH_FOR="/include/sqlite.h" @@ -37626,12 +36822,13 @@ - fi - done - fi -- + - if test -z "$SQLITE_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } - fi -- ++fi + - - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" @@ -37655,8 +36852,32 @@ - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "EXTRA_LDFLAGS$unique=set" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi ++ ++ if test "$found" = "yes"; then ++ ac_libs=$LIBS ++ LIBS="$LIBS -lsocket" ++ if test "$cross_compiling" = yes; then ++ found=no ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* +fi ++ ++ LIBS=$ac_libs + fi - fi - ;; @@ -37671,28 +36892,29 @@ - LDFLAGS="$LDFLAGS -l$ac_ii" - else - -+echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 -+echo "configure:93786: checking whether strptime() declaration fails" >&5 -+if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else ++ if test "$found" = "yes"; then ++ - case $ac_ii in -- c|c_r|pthread*) ;; -- *) ++ case socket in + c|c_r|pthread*) ;; + *) - LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- ++ LIBS="-lsocket $LIBS" + ;; + esac + + - fi - ;; - esac -+cat > conftest.$ac_ext <> confdefs.h <<\EOF ++#define HAVE_DN_EXPAND 1 ++EOF -+#include ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBSOCKET 1 ++EOF - ;; - -L*) @@ -37702,14 +36924,17 @@ - - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -- else -- ++ ac_cv_func_dn_expand=yes + else + - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+int main() { ++ : ++ + fi ++ - - if test "$ext_shared" = "yes"; then @@ -37717,20 +36942,13 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+#ifndef HAVE_STRPTIME -+#error no strptime() on this platform -+#else -+/* use invalid strptime() declaration to see if it fails to compile */ -+int strptime(const char *s, const char *format, struct tm *tm); -+#endif ++ fi + + -+; return 0; } -+EOF -+if { (eval echo configure:93808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* ++ fi + +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ;; - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then @@ -37739,133 +36957,207 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -+ ac_cv_strptime_decl_fails=no ++ esac + -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* ++ ++ unset ac_cv_func_dn_skipname ++ unset ac_cv_func___dn_skipname ++ unset found - fi -+ ac_cv_strptime_decl_fails=yes ++ echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 ++echo "configure:92515: checking for dn_skipname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char dn_skipname(); -+fi -+rm -f conftest* -+fi ++int main() { - fi - - fi -+echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 -+if test "$ac_cv_strptime_decl_fails" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_STRPTIME_DECL_FAILS 1 -+EOF ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname) ++choke me ++#else ++dn_skipname(); ++#endif - ;; - esac - done ++; return 0; } ++EOF ++if { (eval echo configure:92543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_dn_skipname=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_dn_skipname=no" ++fi ++rm -f conftest* +fi - echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 -echo "configure:87133: checking for sqlite_open in -lsqlite" >&5 -ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+for ac_hdr in wchar.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:93836: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-lsqlite $LIBS" --cat > conftest.$ac_ext <&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 ++echo "configure:92561: checking for __dn_skipname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + cat > conftest.$ac_ext < ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char __dn_skipname(); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __dn_skipname(); ++ ++int main() { ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname) ++choke me ++#else ++__dn_skipname(); ++#endif ++ ++; return 0; } +EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:93846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then ++if { (eval echo configure:92589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" ++ eval "ac_cv_func___dn_skipname=yes" +else -+ echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" ++ eval "ac_cv_func___dn_skipname=no" +fi +rm -f conftest* +fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ ++if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 ++found=no ++fi ++ +fi -+done + -+for ac_func in mblen -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:93875: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <> confdefs.h <<\EOF ++#define HAVE_DN_SKIPNAME 1 ++EOF ++ ++ ac_cv_func_dn_skipname=yes ++ ;; ++ ++ *) ++ ++ unset ac_cv_lib_resolv_dn_skipname ++ unset ac_cv_lib_resolv___dn_skipname ++ unset found ++ echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 ++echo "configure:92627: checking for dn_skipname in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lsqlite $LIBS" ++LIBS="-lresolv $LIBS" + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char sqlite_open(); -+char $ac_func(); ++char dn_skipname(); ++ ++int main() { ++dn_skipname() ++; return 0; } ++EOF ++if { (eval echo configure:92646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 ++echo "configure:92666: checking for __dn_skipname in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lresolv $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:93903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" -+ eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ eval "ac_cv_func_$ac_func=no" +@@ -87163,881 +92696,762 @@ LIBS="$ac_save_LIBS" fi - rm -f conftest* --LIBS="$ac_save_LIBS" -- - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared @@ -37887,6 +37179,11 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" - fi ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi - - if test "$ext_shared" = "yes"; then @@ -37905,45 +37202,18 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- + - fi - - - fi - - fi -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 +fi -+done - fi - else - -+for ac_func in mbrlen mbsinit -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:93930: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then - @@ -37958,7 +37228,28 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" - fi -+int main() { ++ if test "$found" = "yes"; then ++ ac_libs=$LIBS ++ LIBS="$LIBS -lresolv" ++ if test "$cross_compiling" = yes; then ++ found=no ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi - - @@ -37974,94 +37265,56 @@ - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - -- fi -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif - -+; return 0; } -+EOF -+if { (eval echo configure:93958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi ++ LIBS=$ac_libs + fi -- +- ++ if test "$found" = "yes"; then + - fi -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done - +- - fi -- -+echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -+echo "configure:93983: checking for mbstate_t" >&5 -+if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else +- - case sqlite in -- c|c_r|pthread*) ;; -- *) ++ case resolv in + c|c_r|pthread*) ;; + *) - LIBS="-lsqlite $LIBS" -- ;; -- esac -- -- -- -+cat > conftest.$ac_ext < -+#endif -+int main() { ++ cat >> confdefs.h <<\EOF ++#define HAVE_DN_SKIPNAME 1 ++EOF + ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBRESOLV 1 ++EOF +- fi +- +- - - if test "$SQLITE_DIR/include" != "/usr/include"; then - - if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then - ai_p=$SQLITE_DIR/include -- else -- ++ ac_cv_func_dn_skipname=yes + else + - ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" - fi -+int __tmp__() { mbstate_t a; } - +- - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+; return 0; } -+EOF -+if { (eval echo configure:94002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - +- - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" @@ -38075,28 +37328,51 @@ - fi - - fi -+ ac_cv_type_mbstate_t=yes - +- - -- + ++ unset ac_cv_lib_bind_dn_skipname ++ unset ac_cv_lib_bind___dn_skipname ++ unset found ++ echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 ++echo "configure:92763: checking for dn_skipname in -lbind" >&5 ++ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$ac_t""no" 1>&6 -- ++ ac_save_LIBS="$LIBS" ++LIBS="-lbind $LIBS" ++cat > conftest.$ac_ext <&2; exit 1; } - +- ++int main() { ++dn_skipname() ++; return 0; } ++EOF ++if { (eval echo configure:92782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* - -+ ac_cv_type_mbstate_t=no -+ -+fi -+rm -f conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" - SQLITE_MODULE_TYPE=external - PHP_SQLITE_CFLAGS=$pdo_inc_path @@ -38106,40 +37382,43 @@ - - # we only support certain lemon versions - lemon_version_list="1.0" -+echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 -+if test "$ac_cv_type_mbstate_t" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_MBSTATE_T 1 -+EOF ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 - # Extract the first word of "lemon", so it can be a program name with args. -set dummy lemon; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:87325: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then -+fi -+ -+for ac_hdr in atomic.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:94030: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 ++echo "configure:92802: checking for __dn_skipname in -lbind" >&5 ++ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$LEMON"; then - ac_cv_prog_LEMON="$LEMON" # Let the user override the test. -+ cat > conftest.$ac_ext < conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __dn_skipname(); ++ ++int main() { ++__dn_skipname() ++; return 0; } +EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:94040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then ++if { (eval echo configure:92821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" ++ eval "ac_cv_lib_$ac_lib_var=yes" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" @@ -38151,28 +37430,25 @@ - fi - done - IFS="$ac_save_ifs" -+ echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" ++ eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* ++LIBS="$ac_save_LIBS" ++ fi -LEMON="$ac_cv_prog_LEMON" -if test -n "$LEMON"; then - echo "$ac_t""$LEMON" 1>&6 -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 ++found=no fi -+done - if test "$LEMON"; then - echo $ac_n "checking for lemon version""... $ac_c" 1>&6 @@ -38180,7 +37456,7 @@ -if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- + - lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` - php_cv_lemon_version=invalid - for lemon_check_version in $lemon_version_list; do @@ -38189,8 +37465,8 @@ - fi - done - --fi -- + fi + -echo "$ac_t""$php_cv_lemon_version" 1>&6 - else - lemon_version=none @@ -38205,6 +37481,28 @@ - - PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" ++ if test "$found" = "yes"; then ++ ac_libs=$LIBS ++ LIBS="$LIBS -lbind" ++ if test "$cross_compiling" = yes; then ++ found=no ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi - SQLITE_MODULE_TYPE=builtin - PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" @@ -38221,296 +37519,564 @@ - libsqlite/src/vacuum.c libsqlite/src/copy.c \ - libsqlite/src/vdbeaux.c libsqlite/src/date.c \ - libsqlite/src/where.c libsqlite/src/trigger.c" -- fi ++ LIBS=$ac_libs + fi - sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" - - ext_builddir=ext/sqlite - ext_srcdir=$abs_srcdir/ext/sqlite -+ ext_builddir=ext/standard -+ ext_srcdir=$abs_srcdir/ext/standard - +- - ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` -+ ac_extra= - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_SQLITE_SHARED=no -+ if test "" != "shared" && test "" != "yes" && test "" != "cli"; then -+ PHP_STANDARD_SHARED=no ++ if test "$found" = "yes"; then - case ext/sqlite in -+ case ext/standard in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ case bind in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lbind $LIBS" ++ ;; esac - - -@@ -87424,7 +94091,17 @@ echo "$ac_t""$php_cv_lemon_version" 1>&6 +- +- +- +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- +- +- old_IFS=$IFS +- for ac_src in $sqlite_sources; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac - old_IFS=$IFS -- for ac_src in $sqlite_sources; do -+ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -+ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -+ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -+ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -+ microtime.c pack.c pageinfo.c quot_print.c rand.c \ -+ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -+ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -+ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -+ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -+ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -+ filters.c proc_open.c streamsfuncs.c http.c; do - - IFS=. - set $ac_src -@@ -87447,18 +94124,18 @@ EOF - done +- cat >>Makefile.objects<> confdefs.h <<\EOF ++#define HAVE_DN_SKIPNAME 1 + EOF +- done ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBBIND 1 ++EOF - EXT_STATIC="$EXT_STATIC sqlite" - if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" -+ EXT_STATIC="$EXT_STATIC standard" -+ if test "" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC standard" - fi +- fi ++ ac_cv_func_dn_skipname=yes else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_SQLITE_SHARED=yes -+ if test "" = "shared" || test "" = "yes"; then -+ PHP_STANDARD_SHARED=yes - +- - case ext/sqlite in -+ case ext/standard in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -87473,14 +94150,24 @@ EOF - - - old_IFS=$IFS +- esac +- +- +- +- b_c_pre=$shared_c_pre +- b_cxx_pre=$shared_cxx_pre +- b_c_meta=$shared_c_meta +- b_cxx_meta=$shared_cxx_meta +- b_c_post=$shared_c_post +- b_cxx_post=$shared_cxx_post +- b_lo=$shared_lo +- +- +- old_IFS=$IFS - for ac_src in $sqlite_sources; do -+ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -+ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -+ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -+ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -+ microtime.c pack.c pageinfo.c quot_print.c rand.c \ -+ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -+ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -+ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -+ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -+ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -+ filters.c proc_open.c streamsfuncs.c http.c; do ++ - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- - shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" -+ shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac ++ unset ac_cv_lib_socket_dn_skipname ++ unset ac_cv_lib_socket___dn_skipname ++ unset found ++ echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 ++echo "configure:92899: checking for dn_skipname in -lsocket" >&5 ++ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lsocket $LIBS" ++cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + +- case $host_alias in +- *aix*) +- suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so' - ;; - *netware*) - suffix=nlm +- ;; +- *netware*) +- suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la +- ;; +- *) +- suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD)' - ;; - esac +- ;; +- esac ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 - if test "x" = "xyes"; then +- if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" - else +- else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" - fi - +- fi +- - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" ++ echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 ++echo "configure:92938: checking for __dn_skipname in -lsocket" >&5 ++ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lsocket $LIBS" ++cat > conftest.$ac_ext <>Makefile.objects<>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + +-$ext_builddir/phpsqlite.$suffix: \$(shared_objects_sqlite) \$(PHPSQLITE_SHARED_DEPENDENCIES) +- $link_cmd ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi --$ext_builddir/phpsqlite.$suffix: \$(shared_objects_sqlite) \$(PHPSQLITE_SHARED_DEPENDENCIES) -+$ext_builddir/phpstandard.$suffix: \$(shared_objects_standard) \$(PHPSTANDARD_SHARED_DEPENDENCIES) - $link_cmd +-EOF ++ ++fi - EOF -@@ -87540,31 +94227,31 @@ EOF - case $host_alias in - *aix*) - suffix=so +- ;; +- *) +- +- install_modules="install-modules" + +- case $host_alias in +- *aix*) +- suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sqlite.so '$ext_builddir'/sqlite.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/standard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/standard.so '$ext_builddir'/standard.so' - ;; - *netware*) - suffix=nlm +- ;; +- *netware*) +- suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(STANDARD, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la +- ;; +- *) +- suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD)' - ;; - esac +- ;; +- esac ++ if test "$found" = "yes"; then ++ ac_libs=$LIBS ++ LIBS="$LIBS -lsocket" ++ if test "$cross_compiling" = yes; then ++ found=no ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi - if test "x" = "xyes"; then +- if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/standard.$suffix" - else +- else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix" ++ LIBS=$ac_libs fi - +- - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <<\EOF ++#define HAVE_DN_SKIPNAME 1 EOF -@@ -87572,22 +94259,22 @@ EOF - ;; - esac - cat >> confdefs.h <> confdefs.h <> confdefs.h <<\EOF ++#define HAVE_LIBSOCKET 1 EOF - fi +- fi ++ ac_cv_func_dn_skipname=yes ++ else ++ ++ : ++ fi ++ - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_SQLITE_SHARED=no -+ if test "" != "shared" && test "" != "yes" && test "" = "cli"; then -+ PHP_STANDARD_SHARED=no - case "$PHP_SAPI" in - cgi|embed) - +- case "$PHP_SAPI" in +- cgi|embed) +- ++ fi - case ext/sqlite in -+ case ext/standard in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac +- esac ++ ++ fi ++ ;; -@@ -87602,7 +94289,17 @@ EOF ++ esac + +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo - old_IFS=$IFS +- old_IFS=$IFS - for ac_src in $sqlite_sources; do -+ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -+ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -+ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -+ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -+ microtime.c pack.c pageinfo.c quot_print.c rand.c \ -+ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -+ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -+ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -+ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -+ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -+ filters.c proc_open.c streamsfuncs.c http.c; do ++ ++ unset ac_cv_func_res_search ++ unset ac_cv_func___res_search ++ unset found - IFS=. - set $ac_src -@@ -87625,15 +94322,15 @@ EOF - done +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ echo $ac_n "checking for res_search""... $ac_c" 1>&6 ++echo "configure:93052: checking for res_search" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char res_search(); + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac ++int main() { + +- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_res_search=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_res_search=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for __res_search""... $ac_c" 1>&6 ++echo "configure:93098: checking for __res_search" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __res_search(); - EXT_STATIC="$EXT_STATIC sqlite" -+ EXT_STATIC="$EXT_STATIC standard" - ;; - *) - - +- ;; +- *) +- +- - case ext/sqlite in -+ case ext/standard in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -87648,7 +94345,17 @@ EOF +- esac +- +- ++int main() { + +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub___res_search) || defined (__stub_____res_search) ++choke me ++#else ++__res_search(); ++#endif ++; return 0; } ++EOF ++if { (eval echo configure:93126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func___res_search=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func___res_search=no" ++fi ++rm -f conftest* ++fi - old_IFS=$IFS +- old_IFS=$IFS - for ac_src in $sqlite_sources; do -+ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -+ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -+ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -+ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -+ microtime.c pack.c pageinfo.c quot_print.c rand.c \ -+ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -+ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -+ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -+ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -+ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -+ filters.c proc_open.c streamsfuncs.c http.c; do - - IFS=. - set $ac_src -@@ -87664,859 +94371,349 @@ EOF - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi ++ ++fi + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac - cat >>Makefile.objects<> confdefs.h <<\EOF ++#define HAVE_RES_SEARCH 1 + EOF - done -- + - - ;; - esac - EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" - fi - -- ++ ac_cv_func_res_search=yes ++ ;; + - BUILD_DIR="$BUILD_DIR $ext_builddir" -- -- -- ++ *) + ++ unset ac_cv_lib_resolv_res_search ++ unset ac_cv_lib_resolv___res_search ++ unset found ++ echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 ++echo "configure:93164: checking for res_search in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lresolv $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + - if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=sqlite - @@ -38556,16 +38122,52 @@ -" 1>&2; exit 1; } - fi - -- ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 + - - src=$ext_srcdir/Makefile.frag - ac_srcdir=$ext_srcdir - ac_builddir=$ext_builddir - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -- ++ echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 ++echo "configure:93203: checking for __res_search in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lresolv $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + - - - for header_file in $ext_builddir/libsqlite/src/sqlite.h; do @@ -38580,17 +38182,26 @@ - INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - - fi -- ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi + - done -- -- + ++fi + - - if test "$SQLITE_MODULE_TYPE" = "builtin"; then - - - $php_shtool mkdir -p $ext_builddir/libsqlite/src - -- + - echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:87766: checking size of char *" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then @@ -38598,10 +38209,16 @@ -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_char_p=4 --else -- cat > conftest.$ac_ext < conftest.$ac_ext < -#include -main() @@ -38611,36 +38228,55 @@ - fprintf(f, "%d\n", sizeof(char *)); - exit(0); -} --EOF ++main() { return (0); } + EOF -if { (eval echo configure:87786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then ++if { (eval echo configure:93258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then - ac_cv_sizeof_char_p=`cat conftestval` --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* ++ found=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* - ac_cv_sizeof_char_p=0 --fi --rm -fr conftest* --fi -- ++ found=no + fi + rm -fr conftest* + fi + -fi -echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 -cat >> confdefs.h <> confdefs.h <<\EOF ++ LIBS=$ac_libs ++ fi ++ ++ if test "$found" = "yes"; then ++ ++ ++ case resolv in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lresolv $LIBS" ++ ;; ++ esac + + + cat >> confdefs.h <<\EOF -#define SQLITE_PTR_SZ SIZEOF_CHAR_P --EOF -- ++#define HAVE_RES_SEARCH 1 + EOF + - if test "$PHP_SQLITE_UTF8" = "yes"; then - SQLITE_ENCODING="UTF8" - cat >> confdefs.h <<\EOF -#define SQLITE_UTF8 1 --EOF -- ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBRESOLV 1 + EOF + - else - SQLITE_ENCODING="ISO8859" - fi @@ -38660,7 +38296,9 @@ - else - echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h - fi -- ++ ac_cv_func_res_search=yes ++ else + - cat >> $ext_builddir/libsqlite/src/config.h <&6 -echo "configure:87848: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else ++ unset ac_cv_lib_bind_res_search ++ unset ac_cv_lib_bind___res_search ++ unset found ++ echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 ++echo "configure:93300: checking for res_search in -lbind" >&5 ++ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else - cat > conftest.$ac_ext < conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ + /* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); @@ -38699,76 +38348,113 @@ -#else -$ac_func(); -#endif -- --; return 0; } --EOF ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char res_search(); + ++int main() { ++res_search() + ; return 0; } + EOF -if { (eval echo configure:87876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* ++if { (eval echo configure:93319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* - eval "ac_cv_func_$ac_func=no" ++ eval "ac_cv_lib_$ac_lib_var=no" + fi + rm -f conftest* -fi --rm -f conftest* --fi -- ++LIBS="$ac_save_LIBS" + -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 ++ found=yes + else + echo "$ac_t""no" 1>&6 -fi -done -- + - for ac_hdr in time.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:87904: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else ++ echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 ++echo "configure:93339: checking for __res_search in -lbind" >&5 ++ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else - cat > conftest.$ac_ext < conftest.$ac_ext < --EOF ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __res_search(); ++ ++int main() { ++__res_search() ++; return 0; } + EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:87914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then -- rm -rf conftest* ++if { (eval echo configure:93358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" --else ++ eval "ac_cv_lib_$ac_lib_var=yes" + else - echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi ++ eval "ac_cv_lib_$ac_lib_var=no" + fi + rm -f conftest* ++LIBS="$ac_save_LIBS" ++ + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 --fi ++ found=yes + else + echo "$ac_t""no" 1>&6 ++found=no + fi -done -- --fi -- -- + ++ + fi + + - -echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 -echo "configure:87945: checking whether flush should be called explicitly after a buffered io" >&5 @@ -38780,10 +38466,16 @@ - - ac_cv_flush_io=no - --else -- cat > conftest.$ac_ext < conftest.$ac_ext < -#include @@ -38819,69 +38511,99 @@ - exit(result); -} - --EOF ++main() { return (0); } + EOF -if { (eval echo configure:87994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then ++if { (eval echo configure:93394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then - - ac_cv_flush_io=no - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* ++ found=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* - - ac_cv_flush_io=yes - ++ found=no + fi + rm -fr conftest* + fi + -fi --rm -fr conftest* --fi -- --fi -- ++ LIBS=$ac_libs ++ fi + -echo "$ac_t""$ac_cv_flush_io" 1>&6 -if test "$ac_cv_flush_io" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_FLUSHIO 1 --EOF -- ++ if test "$found" = "yes"; then ++ ++ ++ case bind in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lbind $LIBS" ++ ;; ++ esac ++ ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_RES_SEARCH 1 + EOF + -fi -- ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBBIND 1 ++EOF + -if test "$ac_cv_func_crypt" = "no"; then - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:88022: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" ++ ac_cv_func_res_search=yes ++ else ++ ++ ++ unset ac_cv_lib_socket_res_search ++ unset ac_cv_lib_socket___res_search ++ unset found ++ echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 ++echo "configure:93436: checking for res_search in -lsocket" >&5 ++ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" -LIBS="-lcrypt $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if { (eval echo configure:93455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -88052,172 +93466,161 @@ LIBS="$ac_save_LIBS" + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - - LIBS="-lcrypt $LIBS -lcrypt" - cat >> confdefs.h <<\EOF @@ -38889,1986 +38611,1275 @@ -EOF - - --else -- echo "$ac_t""no" 1>&6 ++ found=yes + else + echo "$ac_t""no" 1>&6 -fi -- + -fi - -echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 -echo "configure:88070: checking for standard DES crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- if test "$cross_compiling" = yes; then -- -- ac_cv_crypt_des=yes -- --else -- cat > conftest.$ac_ext < --#endif -- --#if HAVE_CRYPT_H --#include --#endif -- --main() { --#if HAVE_CRYPT -- exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); --#else -- exit(0); --#endif --} --EOF --if { (eval echo configure:88100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_crypt_des=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_crypt_des=no -- --fi --rm -fr conftest* --fi -- --fi -+ cat >>Makefile.objects<&6 - --echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 --echo "configure:88121: checking for extended DES crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC standard" -+ fi - -- if test "$cross_compiling" = yes; then - -- ac_cv_crypt_ext_des=no -- --else -- cat > conftest.$ac_ext < --#endif - --#if HAVE_CRYPT_H --#include --#endif -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=standard -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - --main() { --#if HAVE_CRYPT -- exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); --#else -- exit(0); --#endif --} --EOF --if { (eval echo configure:88151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_crypt_ext_des=yes -+ fi - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_crypt_ext_des=no - --fi --rm -fr conftest* --fi - --fi -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - --echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 - --echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 --echo "configure:88172: checking for MD5 crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else - --if test "$cross_compiling" = yes; then -+ for header_file in ext/standard/; do -+ - -- ac_cv_crypt_md5=no -+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -+ -+ fi - --else -- cat > conftest.$ac_ext < --#endif - --#if HAVE_CRYPT_H --#include --#endif - --main() { --#if HAVE_CRYPT -- char salt[15], answer[40]; - -- salt[0]='$'; salt[1]='1'; salt[2]='$'; -- salt[3]='r'; salt[4]='a'; salt[5]='s'; -- salt[6]='m'; salt[7]='u'; salt[8]='s'; -- salt[9]='l'; salt[10]='e'; salt[11]='$'; -- salt[12]='\0'; -- strcpy(answer,salt); -- strcat(answer,"rISCgZzpwk3UhDidwXvin0"); -- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); --#else -- exit(0); --#endif --} --EOF --if { (eval echo configure:88211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_crypt_md5=yes -+php_with_sybase_ct=no - -+echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 -+echo "configure:94430: checking for Sybase-CT support" >&5 -+# Check whether --with-sybase-ct or --without-sybase-ct was given. -+if test "${with_sybase_ct+set}" = set; then -+ withval="$with_sybase_ct" -+ PHP_SYBASE_CT=$withval ++ echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 ++echo "configure:93475: checking for __res_search in -lsocket" >&5 ++ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* - -- ac_cv_crypt_md5=no -- --fi --rm -fr conftest* --fi -+ PHP_SYBASE_CT=no -+ test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL - - fi - --echo "$ac_t""$ac_cv_crypt_md5" 1>&6 - --echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 --echo "configure:88232: checking for Blowfish crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- --if test "$cross_compiling" = yes; then -- -- ac_cv_crypt_blowfish=no - --else -- cat > conftest.$ac_ext < --#endif - --#if HAVE_CRYPT_H --#include --#endif - --main() { --#if HAVE_CRYPT -- char salt[30], answer[70]; -- -- salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; -- strcat(salt,"rasmuslerd............"); -- strcpy(answer,salt); -- strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); -- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); --#else -- exit(0); --#endif --} --EOF --if { (eval echo configure:88268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_crypt_blowfish=yes -+echo "$ac_t""$ext_output" 1>&6 - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_crypt_blowfish=no - --fi --rm -fr conftest* --fi - --fi - --echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 -+if test "$PHP_SYBASE_CT" != "no"; then - --echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 --echo "configure:88289: checking for SHA512 crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else - --if test "$cross_compiling" = yes; then -- -- ac_cv_crypt_SHA512=no -+ if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then -+ { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } -+ fi - +- if test "$cross_compiling" = yes; then +- +- ac_cv_crypt_des=yes +- -else - cat > conftest.$ac_ext <> confdefs.h <<\EOF -+#define HAVE_SYBASE_CT 1 -+EOF +-#line 88081 "configure" ++ ac_save_LIBS="$LIBS" ++LIBS="-lsocket $LIBS" ++cat > conftest.$ac_ext < -#endif -+ -+ ext_builddir=ext/sybase_ct -+ ext_srcdir=$abs_srcdir/ext/sybase_ct - +- -#if HAVE_CRYPT_H -#include -#endif -+ ac_extra= - +- -main() { -#if HAVE_CRYPT -- char salt[30], answer[80]; -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYBASE_CT_SHARED=no - -- salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; -- strcpy(answer, salt); -- strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); -- exit (strcmp((char *)crypt("foo",salt),answer)); +- exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); -#else - exit(0); -#endif -} --EOF --if { (eval echo configure:88324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++int main() { ++__res_search() ++; return 0; } + EOF +-if { (eval echo configure:88100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - -- ac_cv_crypt_SHA512=yes +- +- ac_cv_crypt_des=yes - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 ++if { (eval echo configure:93494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 - rm -fr conftest* -+ case ext/sybase_ct in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ - -- ac_cv_crypt_SHA512=no -- --fi --rm -fr conftest* --fi +- +- ac_cv_crypt_des=no ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" --fi -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo + fi +-rm -fr conftest* ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no + fi --echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 ++ + fi --echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 --echo "configure:88345: checking for SHA256 crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then +-echo "$ac_t""$ac_cv_crypt_des" 1>&6 +- +-echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 +-echo "configure:88121: checking for extended DES crypt" >&5 +-if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - --if test "$cross_compiling" = yes; then -+ old_IFS=$IFS -+ for ac_src in php_sybase_ct.c; do - -- ac_cv_crypt_SHA256=no -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - --else -- cat > conftest.$ac_ext < conftest.$ac_ext < -#endif -+ cat >>Makefile.objects< -#endif - +- -main() { -#if HAVE_CRYPT -- char salt[30], answer[80]; -- salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; -- strcat(salt,""); -- strcpy(answer, salt); -- strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); -- exit (strcmp((char *)crypt("foo",salt),answer)); +- exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); -#else -- exit(0); +- exit(0); -#endif -} --EOF --if { (eval echo configure:88380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -+ EXT_STATIC="$EXT_STATIC sybase_ct" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" -+ fi -+ else -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SYBASE_CT_SHARED=yes -+ -+ case ext/sybase_ct in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- ac_cv_crypt_SHA256=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* - -- ac_cv_crypt_SHA256=no - --fi --rm -fr conftest* --fi -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo - --fi - --echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 -+ old_IFS=$IFS -+ for ac_src in php_sybase_ct.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - --if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then -+ cat >>Makefile.objects<&6 --echo "configure:88404: checking whether the compiler supports __alignof__" >&5 --if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_alignof_exists=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- -- ac_cv_alignof_exists=no -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" -+ fi - --fi --rm -f conftest* --fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" -+ -+ cat >>Makefile.objects<&6 -- if test "$ac_cv_alignof_exists" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_ALIGNOF 1 - EOF - -- fi -+ ;; -+ *) -+ -+ install_modules="install-modules" - -- echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 --echo "configure:88445: checking whether the compiler supports aligned attribute" >&5 --if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_attribute_aligned=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- -- ac_cv_attribute_aligned=no +-if { (eval echo configure:88151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then - --fi --rm -f conftest* --fi - --echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 -- if test "$ac_cv_attribute_aligned" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_ATTRIBUTE_ALIGNED 1 -+ ;; -+ esac -+ cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>Makefile.objects<&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* - -- case ext/standard in -+ case ext/sybase_ct in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -88531,20 +94728,20 @@ EOF - - - old_IFS=$IFS -- for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do -+ for ac_src in php_sybase_ct.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<> confdefs.h <&6 ++ if test "$found" = "yes"; then ++ + ++ case socket in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsocket $LIBS" ++ ;; ++ esac - -- if test "$ac_cv_crypt_blowfish" = "yes"; then -- ac_result=1 -- ac_crypt_blowfish=1 -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sybase_ct +-echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 +-echo "configure:88172: checking for MD5 crypt" >&5 +-if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_RES_SEARCH 1 ++EOF ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBSOCKET 1 ++EOF ++ ++ ac_cv_func_res_search=yes ++ else + -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ : + + fi ++ + ++ fi + -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" + -+ -+ if test "$PHP_SYBASE_CT" = "yes"; then -+ SYBASE_CT_INCDIR=/home/sybase/include -+ SYBASE_CT_LIBDIR=/home/sybase/lib - else -- ac_result=0 -- ac_crypt_blowfish=0 -+ SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include -+ SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib - fi -- cat >> confdefs.h <&6 -+echo "configure:94785: checking size of long int" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_long_int=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() ++ ++echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 ++echo "configure:93583: checking whether atof() accepts NAN" >&5 ++if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then + +- ac_cv_crypt_md5=no ++ ac_cv_atof_accept_nan=no + + else + cat > conftest.$ac_ext < +-#endif +- +-#if HAVE_CRYPT_H +-#include +-#endif +- +-main() { +-#if HAVE_CRYPT +- char salt[15], answer[40]; ++#include ++#include + +- salt[0]='$'; salt[1]='1'; salt[2]='$'; +- salt[3]='r'; salt[4]='a'; salt[5]='s'; +- salt[6]='m'; salt[7]='u'; salt[8]='s'; +- salt[9]='l'; salt[10]='e'; salt[11]='$'; +- salt[12]='\0'; +- strcpy(answer,salt); +- strcat(answer,"rISCgZzpwk3UhDidwXvin0"); +- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); ++#ifdef HAVE_ISNAN ++#define zend_isnan(a) isnan(a) ++#elif defined(HAVE_FPCLASS) ++#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) + #else +- exit(0); ++#define zend_isnan(a) 0 + #endif ++ ++int main(int argc, char** argv) +{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long int)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:94805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_long_int=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_long_int=0 -+fi -+rm -fr conftest* -+fi ++ return zend_isnan(atof("NAN")) ? 0 : 1; + } + -+fi -+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 -+cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + +- ac_cv_crypt_md5=yes ++ ac_cv_atof_accept_nan=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + +- ac_cv_crypt_md5=no ++ ac_cv_atof_accept_nan=no -- if test "$ac_cv_crypt_ext_des" = "yes"; then -- ac_result=1 -- ac_crypt_edes=1 -+ echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 -+echo "configure:94825: checking checking if we're on a 64-bit platform" >&5 -+ if test "$ac_cv_sizeof_long_int" = "4"; then -+ echo "$ac_t""no" 1>&6 -+ PHP_SYBASE_64=no - else -- ac_result=0 -- ac_crypt_edes=0 -+ echo "$ac_t""yes" 1>&6 -+ PHP_SYBASE_64=yes - fi -- cat >> confdefs.h <&6 -+echo "configure:94836: checking Checking for ctpublic.h" >&5 -+ if test -f $SYBASE_CT_INCDIR/ctpublic.h; then -+ echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 -+ -+ if test "$SYBASE_CT_INCDIR" != "/usr/include"; then -+ -+ if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SYBASE_CT_INCDIR - else -- ac_result=0 -- ac_crypt_md5=0 -+ -+ ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" - fi -- cat >> confdefs.h <&6 ++echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 ++if test "$ac_cv_atof_accept_nan" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_ATOF_ACCEPTS_NAN 1 ++EOF + +-echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 +-echo "configure:88232: checking for Blowfish crypt" >&5 +-if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then ++fi + -+ ++echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 ++echo "configure:93641: checking whether atof() accepts INF" >&5 ++if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + if test "$cross_compiling" = yes; then -- if test "$ac_cv_crypt_sha512" = "yes"; then -- ac_result=1 -- ac_crypt_sha512=1 -- else -- ac_result=0 -- ac_crypt_sha512=0 -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ - fi -- cat >> confdefs.h < conftest.$ac_ext <&2; exit 1; } - fi -- cat >> confdefs.h <&6 -+echo "configure:94875: checking Checking Sybase libdir" >&5 -+ echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 -+ -+ echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 -+echo "configure:94879: checking Checking for Sybase platform libraries" >&5 +-#if HAVE_UNISTD_H +-#include +-#endif +- +-#if HAVE_CRYPT_H +-#include +-#endif ++#include ++#include -+ -+ if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SYBASE_CT_LIBDIR -+ else -+ -+ ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" -+ fi +-main() { +-#if HAVE_CRYPT +- char salt[30], answer[70]; +- +- salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; +- strcat(salt,"rasmuslerd............"); +- strcpy(answer,salt); +- strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); +- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); ++#ifdef HAVE_ISINF ++#define zend_isinf(a) isinf(a) ++#elif defined(INFINITY) ++/* Might not work, but is required by ISO C99 */ ++#define zend_isinf(a) (((a)==INFINITY)?1:0) ++#elif defined(HAVE_FPCLASS) ++#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) + #else +- exit(0); ++#define zend_isinf(a) 0 + #endif ++ ++int main(int argc, char** argv) ++{ ++ return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; + } ++ + EOF +-if { (eval echo configure:88268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + +- ac_cv_crypt_blowfish=yes ++ ac_cv_atof_accept_inf=yes -- cat >> confdefs.h <&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + +- ac_cv_crypt_blowfish=no ++ ac_cv_atof_accept_inf=no --fi + fi + rm -fr conftest* +@@ -88282,55 +93689,60 @@ fi --for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:88640: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -+ fi -+ -+ fi + fi --int main() { -+ if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then -+ -+ -+ case ct in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case ct in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lct $LIBS" -+ ;; -+ esac +-echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 ++echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 ++if test "$ac_cv_atof_accept_inf" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_ATOF_ACCEPTS_INF 1 ++EOF --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif +-echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 +-echo "configure:88289: checking for SHA512 crypt" >&5 +-if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then ++fi ++ ++echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 ++echo "configure:93702: checking whether HUGE_VAL == INF" >&5 ++if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then + +- ac_cv_crypt_SHA512=no ++ ac_cv_huge_val_inf=yes --; return 0; } --EOF --if { (eval echo configure:88668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" --fi --rm -f conftest* --fi -+ fi -+ ;; -+ esac + else + cat > conftest.$ac_ext <&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 --fi --done +-#if HAVE_UNISTD_H +-#include +-#endif +- +-#if HAVE_CRYPT_H +-#include +-#endif ++#include ++#include --echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 --echo "configure:88693: checking for working fnmatch" >&5 --if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- # Some versions of Solaris or SCO have a broken fnmatch function. --# So we run a test program. If we are cross-compiling, take no chance. --# Thanks to John Oleynick and Franc,ois Pinard for this test. --if test "$cross_compiling" = yes; then -- ac_cv_func_fnmatch_works=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_cv_func_fnmatch_works=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_func_fnmatch_works=no --fi --rm -fr conftest* --fi -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" -+ echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 -+ elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then -+ -+ -+ case sybcs64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybcs64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcs64 $LIBS" -+ ;; -+ esac +-main() { +-#if HAVE_CRYPT +- char salt[30], answer[80]; +- +- salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; +- strcpy(answer, salt); +- strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); +- exit (strcmp((char *)crypt("foo",salt),answer)); ++#ifdef HAVE_ISINF ++#define zend_isinf(a) isinf(a) ++#elif defined(INFINITY) ++/* Might not work, but is required by ISO C99 */ ++#define zend_isinf(a) (((a)==INFINITY)?1:0) ++#elif defined(HAVE_FPCLASS) ++#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) + #else +- exit(0); ++#define zend_isinf(a) 0 + #endif ++ ++int main(int argc, char** argv) ++{ ++ return zend_isinf(HUGE_VAL) ? 0 : 1; + } ++ + EOF +-if { (eval echo configure:88324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + +- ac_cv_crypt_SHA512=yes ++ ac_cv_huge_val_inf=yes --fi + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + +- ac_cv_crypt_SHA512=no ++ ac_cv_huge_val_inf=no --echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6 --if test $ac_cv_func_fnmatch_works = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_FNMATCH 1 --EOF -+ fi -+ ;; -+ esac + fi + rm -fr conftest* +@@ -88338,55 +93750,62 @@ fi --fi -- + fi -+ -+ -+ case sybct64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybct64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybct64 $LIBS" -+ ;; -+ esac +-echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 ++echo "$ac_t""$ac_cv_huge_val_inf" 1>&6 ++if test "$ac_cv_huge_val_inf" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_HUGE_VAL_INF 1 ++EOF --for ac_func in fork CreateProcess --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:88735: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); +-echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 +-echo "configure:88345: checking for SHA256 crypt" >&5 +-if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then ++fi ++ ++echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 ++echo "configure:93763: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 ++if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then + +- ac_cv_crypt_SHA256=no ++ ac_cv_huge_val_nan=yes --int main() { -+ fi -+ ;; -+ esac + else + cat > conftest.$ac_ext < -#endif ++#include ++#include --; return 0; } --EOF --if { (eval echo configure:88763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" --fi --rm -f conftest* --fi -+ -+ -+ case sybcomn64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybcomn64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcomn64 $LIBS" -+ ;; -+ esac +-#if HAVE_CRYPT_H +-#include ++#ifdef HAVE_ISNAN ++#define zend_isnan(a) isnan(a) ++#elif defined(HAVE_FPCLASS) ++#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) ++#else ++#define zend_isnan(a) 0 + #endif --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <= 3) ++ /* prevent bug #27830 */ ++ return 1; + #else +- exit(0); ++ return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; + #endif + } ++ + EOF +-if { (eval echo configure:88380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + +- ac_cv_crypt_SHA256=yes ++ ac_cv_huge_val_nan=yes --else -- echo "$ac_t""no" 1>&6 --php_can_support_proc_open=no -+ fi -+ ;; -+ esac + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + +- ac_cv_crypt_SHA256=no ++ ac_cv_huge_val_nan=no --fi --done + fi + rm -fr conftest* +@@ -88394,254 +93813,110 @@ fi --echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 --echo "configure:88793: checking if your OS can spawn processes with inherited handles" >&5 --if test "$php_can_support_proc_open" = "yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define PHP_CAN_SUPPORT_PROC_OPEN 1 --EOF -+ -+ -+ case sybintl64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybintl64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybintl64 $LIBS" -+ ;; -+ esac + fi --else -- echo "$ac_t""no" 1>&6 --fi +-echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 +- ++echo "$ac_t""$ac_cv_huge_val_nan" 1>&6 ++if test "$ac_cv_huge_val_nan" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_HUGE_VAL_NAN 1 ++EOF --if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then -- cat >> confdefs.h <<\EOF --#define ENABLE_CHROOT_FUNC 1 --EOF -+ fi -+ ;; -+ esac +-if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then ++fi --fi +- echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 +-echo "configure:88404: checking whether the compiler supports __alignof__" >&5 +-if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then ++echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 ++echo "configure:93826: checking whether strptime() declaration fails" >&5 ++if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + +- cat > conftest.$ac_ext < conftest.$ac_ext < ++ + int main() { -- unset ac_cv_func_res_nsearch -- unset ac_cv_func___res_nsearch -- unset found -+ ac_solid_uname_s=`uname -s 2>/dev/null` -+ case $ac_solid_uname_s in -+ *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define -+ *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # -+ esac -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" -+ echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $SYBASE_CT_LIBS -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ +- int align = __alignof__(int); +- ++#ifndef HAVE_STRPTIME ++#error no strptime() on this platform ++#else ++/* use invalid strptime() declaration to see if it fails to compile */ ++int strptime(const char *s, const char *format, struct tm *tm); ++#endif ++ + ; return 0; } + EOF +-if { (eval echo configure:88420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:93848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* -- echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 --echo "configure:88817: checking for res_nsearch" >&5 --if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char res_nsearch(); -- --int main() { -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi +- ac_cv_alignof_exists=yes +- ++ ac_cv_strptime_decl_fails=no ++ + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + +- ac_cv_alignof_exists=no +- ++ ac_cv_strptime_decl_fails=yes ++ + fi + rm -f conftest* + fi --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch) --choke me --#else --res_nsearch(); --#endif -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac +-echo "$ac_t""$ac_cv_alignof_exists" 1>&6 +- if test "$ac_cv_alignof_exists" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_ALIGNOF 1 ++echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 ++if test "$ac_cv_strptime_decl_fails" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_STRPTIME_DECL_FAILS 1 + EOF + +- fi ++fi +- echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 +-echo "configure:88445: checking whether the compiler supports aligned attribute" >&5 +-if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then ++for ac_hdr in wchar.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:93876: checking for $ac_hdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- + cat > conftest.$ac_ext < + EOF +-if { (eval echo configure:88461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:93886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then + rm -rf conftest* +- +- ac_cv_attribute_aligned=yes +- ++ eval "ac_cv_header_$ac_safe=yes" + else ++ echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- +- ac_cv_attribute_aligned=no +- ++ eval "ac_cv_header_$ac_safe=no" + fi + rm -f conftest* + fi +- +-echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 +- if test "$ac_cv_attribute_aligned" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_ATTRIBUTE_ALIGNED 1 +-EOF +- +- fi +- +- +- cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <>Makefile.objects<> confdefs.h <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_res_nsearch=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_res_nsearch=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 --echo "configure:88863: checking for __res_nsearch" >&5 --if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char __res_nsearch(); -+ fi -+ ;; -+ esac - --int main() { - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) --choke me --#else --__res_nsearch(); --#endif -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - --; return 0; } +- +- +- if test "$ac_cv_crypt_ext_des" = "yes"; then +- ac_result=1 +- ac_crypt_edes=1 +- else +- ac_result=0 +- ac_crypt_edes=0 +- fi +- cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func___res_nsearch=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___res_nsearch=no" --fi --rm -f conftest* --fi -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi - --if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi - -+ fi -+ -+ fi - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 +- +- +- if test "$ac_cv_crypt_md5" = "yes"; then +- ac_result=1 +- ac_crypt_md5=1 +- else +- ac_result=0 +- ac_crypt_md5=0 +- fi +- cat >> confdefs.h <&6 --echo "configure:88929: checking for res_nsearch in -lresolv" >&5 --ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 -+echo "configure:95145: checking for netg_errstr in -lsybtcl64" >&5 -+ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- if test "$ac_cv_crypt_sha512" = "yes"; then +- ac_result=1 +- ac_crypt_sha512=1 +- else +- ac_result=0 +- ac_crypt_sha512=0 +- fi +- cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 + fi ++done + +-for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy ++for ac_func in mblen + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:88640: checking for $ac_func" >&5 ++echo "configure:93915: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" -+LIBS="-lsybtcl64 $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:88668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_$ac_func=yes" else -@@ -88959,167 +95175,186 @@ LIBS="$ac_save_LIBS" +@@ -88688,55 +93963,15 @@ else fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl64 $LIBS" -+ ;; -+ esac + done -- echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 --echo "configure:88968: checking for __res_nsearch in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +-echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 +-echo "configure:88693: checking for working fnmatch" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ fi -+ ;; -+ esac - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_sybtcl64_netg_errstr -+ -+ - --fi -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl64 $LIBS" -+ ;; -+ esac - - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no +- # Some versions of Solaris or SCO have a broken fnmatch function. +-# So we run a test program. If we are cross-compiling, take no chance. +-# Thanks to John Oleynick and Franc,ois Pinard for this test. +-if test "$cross_compiling" = yes; then +- ac_cv_func_fnmatch_works=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:88708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then -- found=yes +- ac_cv_func_fnmatch_works=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- found=no +- ac_cv_func_fnmatch_works=no -fi -rm -fr conftest* -+ fi -+ ;; -+ esac -+ -+ -+ -+ - fi - -- LIBS=$ac_libs -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- if test "$found" = "yes"; then -- -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- case resolv in -+ case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lresolv $LIBS" -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" - ;; - esac +-fi +- +-fi +- +-echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6 +-if test $ac_cv_func_fnmatch_works = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_FNMATCH 1 +-EOF +- +-fi +- +- +- +-for ac_func in fork CreateProcess ++for ac_func in mbrlen mbsinit + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:88735: checking for $ac_func" >&5 ++echo "configure:93970: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -88778,1282 +94013,1194 @@ if eval "test \"`echo '$ac_cv_func_'$ac_ + #define $ac_tr_func 1 + EOF + +- php_can_support_proc_open=yes +- break +- + else + echo "$ac_t""no" 1>&6 +-php_can_support_proc_open=no +- + fi + done -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 +-echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 +-echo "configure:88793: checking if your OS can spawn processes with inherited handles" >&5 +-if test "$php_can_support_proc_open" = "yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define PHP_CAN_SUPPORT_PROC_OPEN 1 -EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 +- +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then +- cat >> confdefs.h <<\EOF +-#define ENABLE_CHROOT_FUNC 1 -EOF - -- ac_cv_func_res_nsearch=yes -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" - -- unset ac_cv_lib_bind_res_nsearch -- unset ac_cv_lib_bind___res_nsearch +- +-fi +- +- +- unset ac_cv_func_res_nsearch +- unset ac_cv_func___res_nsearch - unset found -- echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 --echo "configure:89065: checking for res_nsearch in -lbind" >&5 --ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext <&6 +-echo "configure:88817: checking for res_nsearch" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then ++echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 ++echo "configure:94023: checking for mbstate_t" >&5 ++if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char res_nsearch(); -+ fi ++ ++#ifdef HAVE_WCHAR_H ++# include ++#endif --int main() { --res_nsearch() --; return 0; } --EOF --if { (eval echo configure:89084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" + int main() { --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch) +-choke me +-#else +-res_nsearch(); +-#endif ++int __tmp__() { mbstate_t a; } + + ; return 0; } + EOF +-if { (eval echo configure:88845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* +- eval "ac_cv_func_res_nsearch=yes" ++ ++ ac_cv_type_mbstate_t=yes ++ + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_res_nsearch=no" ++ ++ ac_cv_type_mbstate_t=no ++ + fi + rm -f conftest* + fi + +-if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -+ fi -+ -+ fi - -- echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 --echo "configure:89104: checking for __res_nsearch in -lbind" >&5 --ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` -+ ;; -+ esac -+ done +- echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 +-echo "configure:88863: checking for __res_nsearch" >&5 +-if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then ++echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 ++if test "$ac_cv_type_mbstate_t" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_MBSTATE_T 1 ++EOF + -+ echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 -+echo "configure:95339: checking for insck__getVdate in -linsck64" >&5 -+ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++fi ++ ++for ac_hdr in atomic.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:94070: checking for $ac_hdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" -+LIBS="-linsck64 $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext < +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ -char __res_nsearch(); -+char insck__getVdate(); - - int main() { --__res_nsearch() -+insck__getVdate() - ; return 0; } +- +-int main() { +- +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) +-choke me +-#else +-__res_nsearch(); +-#endif +- +-; return 0; } ++#include <$ac_hdr> EOF --if { (eval echo configure:89123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:88891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:94080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +- eval "ac_cv_func___res_nsearch=yes" ++ eval "ac_cv_header_$ac_safe=yes" else -@@ -89134,128 +95369,159 @@ LIBS="$ac_save_LIBS" ++ echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func___res_nsearch=no" ++ eval "ac_cv_header_$ac_safe=no" fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + rm -f conftest* + fi +- +-if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes --else -- echo "$ac_t""no" 1>&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++ cat >> confdefs.h <&6 -found=no -fi -- - --fi -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ case insck64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case insck64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-linsck64 $LIBS" -+ ;; -+ esac - - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes -+ fi -+ ;; -+ esac +- + fi ++done + + -+ - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* -+ echo "$ac_t""no" 1>&6 + -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck64_insck__getVdate -+ -+ - fi - -- LIBS=$ac_libs ++ ext_builddir=ext/standard ++ ext_srcdir=$abs_srcdir/ext/standard ++ ++ ac_extra= ++ ++ if test "" != "shared" && test "" != "yes" && test "" != "cli"; then ++ PHP_STANDARD_SHARED=no + -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" + -+ save_ext_shared=$ext_shared -+ ext_shared=yes ++ case ext/standard in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ + -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo ++ ++ ++ old_IFS=$IFS ++ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ ++ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ ++ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ ++ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ ++ microtime.c pack.c pageinfo.c quot_print.c rand.c \ ++ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ ++ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ ++ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ ++ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ ++ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ ++ filters.c proc_open.c streamsfuncs.c http.c; do + -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- if test "$found" = "yes"; then -- -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<>Makefile.objects<> confdefs.h <<\EOF -#define HAVE_RES_NSEARCH 1 -EOF -+ fi -+ ;; ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD)' ++ ;; + esac -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF - - ac_cv_func_res_nsearch=yes -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- ;; +- +- *) ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" + fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -- unset ac_cv_lib_socket_res_nsearch -- unset ac_cv_lib_socket___res_nsearch +- unset ac_cv_lib_resolv_res_nsearch +- unset ac_cv_lib_resolv___res_nsearch - unset found -- echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 --echo "configure:89201: checking for res_nsearch in -lsocket" >&5 --ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 +-echo "configure:88929: checking for res_nsearch in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" +-LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:88948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -40879,6 +39890,7 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -40886,72 +39898,100 @@ - found=yes -else - echo "$ac_t""no" 1>&6 -+ fi -+ -+ fi ++ cat >>Makefile.objects<&6 --echo "configure:89240: checking for __res_nsearch in -lsocket" >&5 --ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 -+echo "configure:95506: checking for bsd_tcp in -linsck64" >&5 -+ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" -+LIBS="-linsck64 $LIBS" - cat > conftest.$ac_ext <&6 +-echo "configure:88968: checking for __res_nsearch in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lresolv $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" - int main() { --__res_nsearch() -+bsd_tcp() - ; return 0; } - EOF --if { (eval echo configure:89259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -89270,352 +95536,258 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi -- ++ ;; ++ *) ++ ++ install_modules="install-modules" ++ ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/standard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/standard.so '$ext_builddir'/standard.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(STANDARD, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD)' ++ ;; ++ esac + ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/standard.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix" ++ fi -fi -- -- ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" + ++ cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + EOF +-if { (eval echo configure:89023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -40962,269 +40002,327 @@ -fi -rm -fr conftest* -fi -- + - LIBS=$ac_libs -- fi -- ++ ;; ++ esac ++ cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_RES_NSEARCH 1 -EOF - - cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 +-#define HAVE_LIBRESOLV 1 -EOF -+ fi -+ ;; -+ esac - ac_cv_func_res_nsearch=yes - else - -- : - -- fi - -+else -+ echo "$ac_t""no" 1>&6 - -- fi -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck64_bsd_tcp -+ - -+fi - -- fi -+ elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then -+ - -- ;; -+ case sybcs in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" -+ else -+ ++ old_IFS=$IFS ++ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ ++ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ ++ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ ++ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ ++ microtime.c pack.c pageinfo.c quot_print.c rand.c \ ++ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ ++ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ ++ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ ++ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ ++ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ ++ filters.c proc_open.c streamsfuncs.c http.c; do -+ case sybcs in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcs $LIBS" -+ ;; - esac - - -- unset ac_cv_func_dns_search -- unset ac_cv_func___dns_search +- unset ac_cv_lib_bind_res_nsearch +- unset ac_cv_lib_bind___res_nsearch - unset found -- -- echo $ac_n "checking for dns_search""... $ac_c" 1>&6 --echo "configure:89352: checking for dns_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then +- echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 +-echo "configure:89065: checking for res_nsearch in -lbind" >&5 +-ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char dns_search(); -- --int main() { -+ fi -+ ;; -+ esac - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_dns_search) || defined (__stub___dns_search) --choke me --#else --dns_search(); --#endif +-char res_nsearch(); ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +-int main() { +-res_nsearch() -; return 0; } --EOF --if { (eval echo configure:89380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func_dns_search=yes" +- eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_dns_search=no" +- eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* --fi -+ -+ -+ case sybct in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybct in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybct $LIBS" -+ ;; -+ esac +-LIBS="$ac_save_LIBS" ++ done --if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 --echo "configure:89398: checking for __dns_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then + +- echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 +-echo "configure:89104: checking for __res_nsearch in -lbind" >&5 +-ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char __dns_search(); - --int main() { -+ fi -+ ;; +-char __res_nsearch(); ++ EXT_STATIC="$EXT_STATIC standard" ++ ;; ++ *) ++ ++ ++ case ext/standard in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac ++ ++ --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___dns_search) || defined (__stub_____dns_search) --choke me --#else --__dns_search(); --#endif - +-int main() { +-__res_nsearch() -; return 0; } -EOF --if { (eval echo configure:89426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func___dns_search=yes" +- eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func___dns_search=no" +- eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* --fi -+ -+ -+ case sybcomn in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybcomn in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcomn $LIBS" -+ ;; -+ esac +-LIBS="$ac_save_LIBS" ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo --if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi -- + ++ old_IFS=$IFS ++ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ ++ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ ++ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ ++ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ ++ microtime.c pack.c pageinfo.c quot_print.c rand.c \ ++ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ ++ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ ++ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ ++ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ ++ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ ++ filters.c proc_open.c streamsfuncs.c http.c; do + -fi ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ fi -+ ;; -+ esac ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + +- if test "$found" = "yes"; then +- ac_libs=$LIBS +- LIBS="$LIBS -lbind" +- if test "$cross_compiling" = yes; then +- found=no +-else +- cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- found=no +-fi +-rm -fr conftest* +-fi ++ done + +- LIBS=$ac_libs ++ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC standard" + fi ++ ++ ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ + +- if test "$found" = "yes"; then ++ ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=standard + +- +- case bind in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lbind $LIBS" +- ;; +- esac ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + ++ fi -- case $found in -- yes) - cat >> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 +-#define HAVE_RES_NSEARCH 1 -EOF -- ac_cv_func_dns_search=yes -- ;; -+ - -- *) -+ case sybintl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" -+ else +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBBIND 1 +-EOF + +- ac_cv_func_res_nsearch=yes +- else ++ src=$ext_srcdir/Makefile.frag ++ ac_srcdir=$ext_srcdir ++ ac_builddir=$ext_builddir ++ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments ++ ++ ++ ++ for header_file in ext/standard/; do ++ ++ ++ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INSTALLHEADERS$unique=set" + ++ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" + ++ fi ++ ++ done -- unset ac_cv_lib_resolv_dns_search -- unset ac_cv_lib_resolv___dns_search +- unset ac_cv_lib_socket_res_nsearch +- unset ac_cv_lib_socket___res_nsearch - unset found -- echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 --echo "configure:89464: checking for dns_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 +-echo "configure:89201: checking for res_nsearch in -lsocket" >&5 +-ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" +-LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -41235,12 +40333,6 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ case sybintl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybintl $LIBS" -+ ;; -+ esac -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -41249,38 +40341,47 @@ -else - echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 --echo "configure:89503: checking for __dns_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 +-echo "configure:89240: checking for __res_nsearch in -lsocket" >&5 +-ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" +-LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" --else ++php_with_sybase_ct=no ++ ++echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 ++echo "configure:94470: checking for Sybase-CT support" >&5 ++# Check whether --with-sybase-ct or --without-sybase-ct was given. ++if test "${with_sybase_ct+set}" = set; then ++ withval="$with_sybase_ct" ++ PHP_SYBASE_CT=$withval + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" --fi ++ ++ PHP_SYBASE_CT=no ++ test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL ++ + fi -rm -f conftest* -LIBS="$ac_save_LIBS" @@ -41292,70 +40393,45 @@ - echo "$ac_t""no" 1>&6 -found=no -fi -+ -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" -+ echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $SYBASE_CT_LIBS -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - +- -fi -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SYBASE_CT in ++shared,*) ++ PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SYBASE_CT=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac ++ ++ ++ ++echo "$ac_t""$ext_output" 1>&6 - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lresolv" +- LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:89295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -41366,359 +40442,273 @@ -fi -rm -fr conftest* -fi -+ fi -+ ;; -+ esac - LIBS=$ac_libs -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi +- fi - if test "$found" = "yes"; then - -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" - -- case resolv in +- +- +- case socket in - c|c_r|pthread*) ;; - *) -- LIBS="-lresolv $LIBS" +- LIBS="-lsocket $LIBS" - ;; - esac -+ fi ++if test "$PHP_SYBASE_CT" != "no"; then - cat >> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 +-#define HAVE_RES_NSEARCH 1 -EOF -+ fi -+ ++ if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then ++ { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } + fi - cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF -+ ;; -+ esac -+ done +-#define HAVE_LIBSOCKET 1 ++ cat >> confdefs.h <<\EOF ++#define HAVE_SYBASE_CT 1 + EOF -- ac_cv_func_dns_search=yes +- ac_cv_func_res_nsearch=yes - else - +- : +- +- fi + ++ ext_builddir=ext/sybase_ct ++ ext_srcdir=$abs_srcdir/ext/sybase_ct + +- fi - -- unset ac_cv_lib_bind_dns_search -- unset ac_cv_lib_bind___dns_search -- unset found -- echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 --echo "configure:89600: checking for dns_search in -lbind" >&5 --ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 -+echo "configure:95772: checking for netg_errstr in -lsybtcl" >&5 -+ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" -+LIBS="-lsybtcl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -89630,167 +95802,186 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared +- fi +- +- ;; ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_SYBASE_CT_SHARED=no + -+ + ++ case ext/sybase_ct in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -+ else -+ + -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl $LIBS" -+ ;; -+ esac -- echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 --echo "configure:89639: checking for __dns_search in -lbind" >&5 --ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + +- unset ac_cv_func_dns_search +- unset ac_cv_func___dns_search +- unset found +- +- echo $ac_n "checking for dns_search""... $ac_c" 1>&6 +-echo "configure:89352: checking for dns_search" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char __dns_search(); +-char dns_search(); -int main() { --__dns_search() ++ old_IFS=$IFS ++ for ac_src in php_sybase_ct.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dns_search) || defined (__stub___dns_search) +-choke me +-#else +-dns_search(); +-#endif ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + -; return 0; } --EOF --if { (eval echo configure:89658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" +- eval "ac_cv_func_dns_search=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" +- eval "ac_cv_func_dns_search=no" -fi -rm -f conftest* --LIBS="$ac_save_LIBS" -+ fi -+ ;; -+ esac - -fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ done + +-if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -+ -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi +-else +- echo "$ac_t""no" 1>&6 +- echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 +-echo "configure:89398: checking for __dns_search" >&5 +-if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char __dns_search(); -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_sybtcl_netg_errstr -+ -+ - --fi -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -+ else +-int main() { ++ EXT_STATIC="$EXT_STATIC sybase_ct" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" ++ fi ++ else ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_SYBASE_CT_SHARED=yes + -+ -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl $LIBS" -+ ;; ++ case ext/sybase_ct in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac ++ ++ +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub___dns_search) || defined (__stub_____dns_search) +-choke me +-#else +-__dns_search(); +-#endif ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes +-if { (eval echo configure:89426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func___dns_search=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no +- rm -rf conftest* +- eval "ac_cv_func___dns_search=no" +-fi +-rm -f conftest* -fi --rm -fr conftest* -+ fi -+ ;; -+ esac -+ -+ -+ -+ - fi -- LIBS=$ac_libs -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +-if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi +- +-fi ++ old_IFS=$IFS ++ for ac_src in php_sybase_ct.c; do + -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- if test "$found" = "yes"; then -- -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- case bind in -+ case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lbind $LIBS" -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" - ;; - esac ++ shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo" ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac +- case $found in +- yes) - cat >> confdefs.h <<\EOF -#define HAVE_DNS_SEARCH 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF ++ cat >>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii - else - -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- unset ac_cv_lib_socket_dns_search -- unset ac_cv_lib_socket___dns_search +- ;; +- +- *) +- +- unset ac_cv_lib_resolv_dns_search +- unset ac_cv_lib_resolv___dns_search - unset found -- echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 --echo "configure:89736: checking for dns_search in -lsocket" >&5 --ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:89464: checking for dns_search in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" +-LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -41729,6 +40719,20 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)' ++ ;; ++ esac -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -41736,72 +40740,108 @@ - found=yes -else - echo "$ac_t""no" 1>&6 -+ fi -+ ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" + fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" -- echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 --echo "configure:89775: checking for __dns_search in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'` -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -+echo "configure:95966: checking for insck__getVdate in -linsck" >&5 -+ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" -+LIBS="-linsck $LIBS" - cat > conftest.$ac_ext <&6 +-echo "configure:89503: checking for __dns_search in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lresolv $LIBS" +-cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -89805,216 +95996,159 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +-if { (eval echo configure:89522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi -- ++ ;; ++ *) ++ ++ install_modules="install-modules" ++ ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(SYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sybase_ct.so '$ext_builddir'/sybase_ct.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYBASE_CT, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(SYBASE_CT_SHARED_LIBADD)' ++ ;; ++ esac + ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix" ++ fi -fi -- -- ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" ++ ++ cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + EOF +-if { (eval echo configure:89558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -41812,223 +40852,392 @@ -fi -rm -fr conftest* -fi -- + - LIBS=$ac_libs -- fi -- ++ ;; ++ esac ++ cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_DNS_SEARCH 1 -EOF -- + - cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 --EOF -+ fi -+ ;; -+ esac +-#define HAVE_LIBRESOLV 1 ++ old_IFS=$IFS ++ for ac_src in php_sybase_ct.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&6 - -- fi -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_insck__getVdate -+ - -+fi - -- fi -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" - -- ;; -+ save_ext_shared=$ext_shared -+ ext_shared=yes - -- esac -- -- -- unset ac_cv_func_dn_expand -- unset ac_cv_func___dn_expand -- unset found -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else ++ ++ EXT_STATIC="$EXT_STATIC sybase_ct" ++ ;; ++ *) + ++ ++ case ext/sybase_ct in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac ++ -- echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 --echo "configure:89887: checking for dn_expand" >&5 --if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then +- unset ac_cv_lib_bind_dns_search +- unset ac_cv_lib_bind___dns_search +- unset found +- echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 +-echo "configure:89600: checking for dns_search in -lbind" >&5 +-ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char dn_expand(); -- --int main() { -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi +-char dns_search(); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_dn_expand) || defined (__stub___dn_expand) --choke me --#else --dn_expand(); --#endif -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ +-int main() { +-dns_search() +-; return 0; } ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo ++ ++ ++ old_IFS=$IFS ++ for ac_src in php_sybase_ct.c; do + -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - --; return 0; } --EOF --if { (eval echo configure:89915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func_dn_expand=yes" +- eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_dn_expand=no" +- eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* --fi +-LIBS="$ac_save_LIBS" ++ done --if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 --echo "configure:89933: checking for __dn_expand" >&5 --if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then + +- echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 +-echo "configure:89639: checking for __dns_search in -lbind" >&5 +-ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char __dn_expand(); -+ fi -+ ;; -+ esac +-char __dns_search(); ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" ++ fi ++ ++ ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ + +-int main() { +-__dns_search() +-; return 0; } +-EOF +-if { (eval echo configure:89658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=sybase_ct ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ ++ fi + + +-fi ++ PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" + ++ ++ if test "$PHP_SYBASE_CT" = "yes"; then ++ SYBASE_CT_INCDIR=/home/sybase/include ++ SYBASE_CT_LIBDIR=/home/sybase/lib ++ else ++ SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include ++ SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib ++ fi + +- if test "$found" = "yes"; then +- ac_libs=$LIBS +- LIBS="$LIBS -lbind" +- if test "$cross_compiling" = yes; then +- found=no ++ echo $ac_n "checking size of long int""... $ac_c" 1>&6 ++echo "configure:94825: checking size of long int" >&5 ++if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_sizeof_long_int=4 + else + cat > conftest.$ac_ext < ++#include ++main() ++{ ++ FILE *f=fopen("conftestval", "w"); ++ if (!f) exit(1); ++ fprintf(f, "%d\n", sizeof(long int)); ++ exit(0); ++} + EOF +-if { (eval echo configure:89694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:94845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then +- found=yes ++ ac_cv_sizeof_long_int=`cat conftestval` + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* +- found=no ++ ac_cv_sizeof_long_int=0 + fi + rm -fr conftest* + fi --int main() { +- LIBS=$ac_libs ++fi ++echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 ++cat >> confdefs.h <&6 ++echo "configure:94865: checking checking if we're on a 64-bit platform" >&5 ++ if test "$ac_cv_sizeof_long_int" = "4"; then ++ echo "$ac_t""no" 1>&6 ++ PHP_SYBASE_64=no ++ else ++ echo "$ac_t""yes" 1>&6 ++ PHP_SYBASE_64=yes + fi --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___dn_expand) || defined (__stub_____dn_expand) --choke me --#else --__dn_expand(); --#endif -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- if test "$found" = "yes"; then ++ ++ echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 ++echo "configure:94876: checking Checking for ctpublic.h" >&5 ++ if test -f $SYBASE_CT_INCDIR/ctpublic.h; then ++ echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 + +- +- case bind in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lbind $LIBS" +- ;; +- esac ++ if test "$SYBASE_CT_INCDIR" != "/usr/include"; then + -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii ++ if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then ++ ai_p=$SYBASE_CT_INCDIR + else + -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" + fi --; return 0; } ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi + +- cat >> confdefs.h <<\EOF +-#define HAVE_DNS_SEARCH 1 -EOF --if { (eval echo configure:89961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func___dn_expand=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___dn_expand=no" --fi --rm -f conftest* --fi ++ fi + +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBBIND 1 +-EOF ++ else ++ { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } ++ fi ++ ++ echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 ++echo "configure:94915: checking Checking Sybase libdir" >&5 ++ echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 ++ ++ echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 ++echo "configure:94919: checking Checking for Sybase platform libraries" >&5 + +- ac_cv_func_dns_search=yes ++ ++ if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$SYBASE_CT_LIBDIR + else + ++ ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" ++ fi ++ + + if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD" + else + -+ + +- unset ac_cv_lib_socket_dns_search +- unset ac_cv_lib_socket___dns_search +- unset found +- echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:89736: checking for dns_search in -lsocket" >&5 +-ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 --found=no --fi -- --fi - + fi + + fi -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 --EOF -+ ;; -+ esac -+ done - -- ac_cv_func_dn_expand=yes -- ;; -- -- *) -- -- unset ac_cv_lib_resolv_dn_expand -- unset ac_cv_lib_resolv___dn_expand -- unset found -- echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 --echo "configure:89999: checking for dn_expand in -lresolv" >&5 --ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -+echo "configure:96133: checking for bsd_tcp in -linsck" >&5 -+ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" -+LIBS="-linsck $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -90029,167 +96163,258 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes +- echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:89775: checking for __dns_search in -lsocket" >&5 +-ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 -else -- echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&6 --echo "configure:90038: checking for __dn_expand in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -42163,58 +41325,54 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ fi -+ ;; -+ esac -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -+ -+ - else - echo "$ac_t""no" 1>&6 +-else +- echo "$ac_t""no" 1>&6 -found=no -fi ++ fi ++ ;; ++ esac -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_bsd_tcp ++ ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" ++ echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 ++ elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then + - fi - -+ else -+ -+ -+ case cs in +-fi ++ case sybcs64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case cs in ++ case sybcs64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lcs $LIBS" ++ LIBS="-lsybcs64 $LIBS" + ;; + esac + - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lresolv" +- LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:89830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -42225,96 +41383,171 @@ -fi -rm -fr conftest* -fi - -- LIBS=$ac_libs -- fi + fi + ;; + esac -+ + +- LIBS=$ac_libs +- fi - if test "$found" = "yes"; then -- case resolv in -+ case ct in +- case socket in ++ case sybct64 in c|c_r|pthread*) ;; *) -- LIBS="-lresolv $LIBS" +- LIBS="-lsocket $LIBS" + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case ct in ++ case sybct64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lct $LIBS" ++ LIBS="-lsybct64 $LIBS" ;; esac - cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 +-#define HAVE_DNS_SEARCH 1 -EOF + fi + ;; + esac - cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 +-#define HAVE_LIBSOCKET 1 -EOF -- ac_cv_func_dn_expand=yes -+ -+ -+ case comn in +- ac_cv_func_dns_search=yes +- else + +- : +- +- fi + +- +- fi ++ case sybcomn64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" + else + -+ -+ case comn in + ++ case sybcomn64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lcomn $LIBS" ++ LIBS="-lsybcomn64 $LIBS" + ;; + esac -+ + +- fi +- +- ;; +- + + fi + ;; -+ esac -+ -+ + esac + + +- unset ac_cv_func_dn_expand +- unset ac_cv_func___dn_expand +- unset found + -+ -+ case intl in + +- echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 +-echo "configure:89887: checking for dn_expand" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dn_expand(); ++ case sybintl64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case intl in ++ case sybintl64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lintl $LIBS" ++ LIBS="-lsybintl64 $LIBS" + ;; + esac -+ -+ + +-int main() { + +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dn_expand) || defined (__stub___dn_expand) +-choke me +-#else +-dn_expand(); +-#endif + fi + ;; + esac -+ -+ -+ -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" -+ echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6 + +-; return 0; } +-EOF +-if { (eval echo configure:89915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_dn_expand=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_dn_expand=no" +-fi +-rm -f conftest* +-fi + +-if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +- echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 +-echo "configure:89933: checking for __dn_expand" >&5 +-if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char __dn_expand(); + +-int main() { ++ ac_solid_uname_s=`uname -s 2>/dev/null` ++ case $ac_solid_uname_s in ++ *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define ++ *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # ++ esac ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" ++ echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 + + + save_old_LDFLAGS=$LDFLAGS @@ -42340,7 +41573,15 @@ + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi -+ + +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub___dn_expand) || defined (__stub_____dn_expand) +-choke me +-#else +-__dn_expand(); +-#endif + fi + ;; + -l*) @@ -42361,13 +41602,40 @@ + LIBS="$LIBS -l$ac_ii" + ;; + esac -+ -+ + +-; return 0; } +-EOF +-if { (eval echo configure:89961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func___dn_expand=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func___dn_expand=no" +-fi +-rm -f conftest* +-fi + +-if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi +- +-fi + fi + ;; + esac -+ -+ + + +- case $found in +- yes) +- cat >> confdefs.h <<\EOF +-#define HAVE_DN_EXPAND 1 +-EOF + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -42376,14 +41644,16 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii - else - ++ else ++ + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi -+ + +- ac_cv_func_dn_expand=yes +- ;; + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" @@ -42391,25 +41661,26 @@ + else + -- unset ac_cv_lib_bind_dn_expand -- unset ac_cv_lib_bind___dn_expand +- *) + +- unset ac_cv_lib_resolv_dn_expand +- unset ac_cv_lib_resolv___dn_expand - unset found -- echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 --echo "configure:90135: checking for dn_expand in -lbind" >&5 --ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 +-echo "configure:89999: checking for dn_expand in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" +-LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -42448,25 +41719,25 @@ + + fi -- echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 --echo "configure:90174: checking for __dn_expand in -lbind" >&5 --ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 +-echo "configure:90038: checking for __dn_expand in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` + ;; + esac + done + -+ echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -+echo "configure:96399: checking for netg_errstr in -ltcl" >&5 -+ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 ++echo "configure:95185: checking for netg_errstr in -lsybtcl64" >&5 ++ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" -+LIBS="-ltcl $LIBS" +-LIBS="-lresolv $LIBS" ++LIBS="-lsybtcl64 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -90204,89 +96429,186 @@ LIBS="$ac_save_LIBS" +@@ -90068,128 +95215,186 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -42495,18 +41766,18 @@ + + + -+ case tcl in ++ case sybtcl64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case tcl in ++ case sybtcl64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-ltcl $LIBS" ++ LIBS="-lsybtcl64 $LIBS" + ;; + esac + @@ -42525,39 +41796,39 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_tcl_netg_errstr ++ unset ac_cv_lib_sybtcl64_netg_errstr + + -fi -+ case sybtcl in ++ case sybtcl64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case sybtcl in ++ case sybtcl64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lsybtcl $LIBS" ++ LIBS="-lsybtcl64 $LIBS" + ;; + esac - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lbind" +- LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:90093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -42602,15 +41873,18 @@ fi - if test "$found" = "yes"; then +- + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + -+ + +- case resolv in + case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) + c|c_r|pthread*) ;; + *) +- LIBS="-lresolv $LIBS" + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else @@ -42620,15 +41894,22 @@ + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ + ;; + esac + + +- cat >> confdefs.h <<\EOF +-#define HAVE_DN_EXPAND 1 +-EOF + fi + ;; + esac -+ -+ + +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBRESOLV 1 +-EOF + +- ac_cv_func_dn_expand=yes + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -42637,8 +41918,8 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii -+ else -+ + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" @@ -42651,106 +41932,146 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + -+ + +- unset ac_cv_lib_bind_dn_expand +- unset ac_cv_lib_bind___dn_expand +- unset found +- echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 +-echo "configure:90135: checking for dn_expand in -lbind" >&5 +-ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lbind $LIBS" +-cat > conftest.$ac_ext <> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 +-int main() { +-dn_expand() +-; return 0; } -EOF +-if { (eval echo configure:90154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 + fi + + fi -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF +- echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 +-echo "configure:90174: checking for __dn_expand in -lbind" >&5 +-ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` + ;; + esac + done - -- ac_cv_func_dn_expand=yes -- else -- -- -- unset ac_cv_lib_socket_dn_expand -- unset ac_cv_lib_socket___dn_expand -- unset found -- echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 --echo "configure:90271: checking for dn_expand in -lsocket" >&5 --ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -+echo "configure:96593: checking for insck__getVdate in -linsck" >&5 -+ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` ++ ++ echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 ++echo "configure:95379: checking for insck__getVdate in -linsck64" >&5 ++ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" -+LIBS="-linsck $LIBS" +-LIBS="-lbind $LIBS" ++LIBS="-linsck64 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -90301,31 +96623,159 @@ LIBS="$ac_save_LIBS" +@@ -90204,128 +95409,159 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes -+ +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi +- + +-fi + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + + -+ case insck in ++ case insck64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case insck in ++ case insck64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-linsck $LIBS" ++ LIBS="-linsck64 $LIBS" + ;; + esac -+ -+ + + +- if test "$found" = "yes"; then +- ac_libs=$LIBS +- LIBS="$LIBS -lbind" +- if test "$cross_compiling" = yes; then +- found=no +-else +- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=yes + fi + ;; + esac @@ -42758,18 +42079,22 @@ + + else - echo "$ac_t""no" 1>&6 - -- echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 --echo "configure:90310: checking for __dn_expand in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- found=no +-fi +-rm -fr conftest* ++ echo "$ac_t""no" 1>&6 ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_insck__getVdate ++ unset ac_cv_lib_insck64_insck__getVdate + + -+fi -+ + fi + +- LIBS=$ac_libs + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="-L$SYBASE_CT_LIBDIR" @@ -42791,17 +42116,21 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ + fi + +- if test "$found" = "yes"; then +- + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + -+ + +- case bind in + case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) + c|c_r|pthread*) ;; + *) +- LIBS="-lbind $LIBS" + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else @@ -42811,15 +42140,22 @@ + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ + ;; + esac + + +- cat >> confdefs.h <<\EOF +-#define HAVE_DN_EXPAND 1 +-EOF + fi + ;; + esac -+ -+ + +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBBIND 1 +-EOF + +- ac_cv_func_dn_expand=yes + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -42828,8 +42164,8 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii -+ else -+ + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" @@ -42842,7 +42178,25 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + -+ + +- unset ac_cv_lib_socket_dn_expand +- unset ac_cv_lib_socket___dn_expand +- unset found +- echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 +-echo "configure:90271: checking for dn_expand in -lsocket" >&5 +-ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 + fi + + fi -+ + +- echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 +-echo "configure:90310: checking for __dn_expand in -lsocket" >&5 +-ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` + ;; + esac + done + -+ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -+echo "configure:96760: checking for bsd_tcp in -linsck" >&5 -+ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 ++echo "configure:95546: checking for bsd_tcp in -linsck64" >&5 ++ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" -+LIBS="-linsck $LIBS" ++LIBS="-linsck64 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -90340,1690 +96790,1524 @@ LIBS="$ac_save_LIBS" +@@ -90340,255 +95576,258 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes --else -- echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ case insck64 in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case insck64 in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-linsck64 $LIBS" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ + else + echo "$ac_t""no" 1>&6 -found=no -fi -- + ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_insck64_bsd_tcp ++ --fi -- -- + fi + ++ elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then ++ ++ ++ case sybcs in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case sybcs in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsybcs $LIBS" ++ ;; ++ esac ++ + - if test "$found" = "yes"; then - ac_libs=$LIBS - LIBS="$LIBS -lsocket" @@ -42930,29 +42357,30 @@ -fi -rm -fr conftest* -fi -- ++ fi ++ ;; ++ esac + - LIBS=$ac_libs - fi -- + - if test "$found" = "yes"; then -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared - case socket in -+ case insck in ++ case sybct in c|c_r|pthread*) ;; *) - LIBS="-lsocket $LIBS" + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" + else + + -+ case insck in ++ case sybct in + c|c_r|pthread*) ;; + *) -+ LIBS="-linsck $LIBS" ++ LIBS="-lsybct $LIBS" ;; esac @@ -42960,44 +42388,53 @@ - cat >> confdefs.h <<\EOF -#define HAVE_DN_EXPAND 1 -EOF -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 --EOF + fi + ;; + esac +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBSOCKET 1 +-EOF + - ac_cv_func_dn_expand=yes - else -- + - : - +- - fi -+else -+ echo "$ac_t""no" 1>&6 - +- - fi -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_bsd_tcp -+ ++ case sybcomn in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" ++ else ++ -+fi ++ case sybcomn in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsybcomn $LIBS" ++ ;; ++ esac - fi +- fi - - ;; - -- esac -- -+fi ++ ++ fi ++ ;; + esac + - unset ac_cv_func_dn_skipname - unset ac_cv_func___dn_skipname - unset found -- ++ + - echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 -echo "configure:90422: checking for dn_skipname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then @@ -43013,8 +42450,22 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dn_skipname(); - +- -int main() { ++ case sybintl in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case sybintl in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsybintl $LIBS" ++ ;; ++ esac -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -43024,79 +42475,37 @@ -#else -dn_skipname(); -#endif -+php_enable_sysvmsg=no -; return 0; } -EOF -if { (eval echo configure:90450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dn_skipname=yes" -+echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 -+echo "configure:96839: checking whether to enable System V IPC support" >&5 -+# Check whether --enable-sysvmsg or --disable-sysvmsg was given. -+if test "${enable_sysvmsg+set}" = set; then -+ enableval="$enable_sysvmsg" -+ PHP_SYSVMSG=$enableval - else +-else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dn_skipname=no" -fi -rm -f conftest* -+ -+ PHP_SYSVMSG=no -+ test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL -+ - fi - --if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 --echo "configure:90468: checking for __dn_skipname" >&5 --if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SYSVMSG in -+shared,*) -+ PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SYSVMSG=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SYSVMSG" != "no"; then -+ ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -+echo "configure:96882: checking for sys/msg.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +- echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 +-echo "configure:90468: checking for __dn_skipname" >&5 +-if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < @@ -43104,9 +42513,37 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __dn_skipname(); -- + -int main() { -- ++ ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" ++ echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 ++ ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff=" ++ $SYBASE_CT_LIBS ++ " ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi + -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ @@ -43115,64 +42552,86 @@ -#else -__dn_skipname(); -#endif -- ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac + -; return 0; } -+#include - EOF +-EOF -if { (eval echo configure:90496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:96892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - rm -rf conftest* +- rm -rf conftest* - eval "ac_cv_func___dn_skipname=yes" -+ eval "ac_cv_header_$ac_safe=yes" - else -+ echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - eval "ac_cv_func___dn_skipname=no" -+ eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* - fi -- +-fi +-rm -f conftest* +-fi + -if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- echo "$ac_t""yes" 1>&6 - found=yes -+ : - else - echo "$ac_t""no" 1>&6 +-else +- echo "$ac_t""no" 1>&6 -found=no -fi - -+{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } -+ - fi +-fi ++ fi ++ ;; ++ esac - case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_DN_SKIPNAME 1 -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYSVMSG 1 - EOF +-EOF ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi - ac_cv_func_dn_skipname=yes - ;; ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ - *) -+ ext_builddir=ext/sysvmsg -+ ext_srcdir=$abs_srcdir/ext/sysvmsg -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYSVMSG_SHARED=no -+ - unset ac_cv_lib_resolv_dn_skipname - unset ac_cv_lib_resolv___dn_skipname @@ -43192,114 +42651,17 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dn_skipname(); -+ case ext/sysvmsg in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in sysvmsg.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<&6 -+ cat >>Makefile.objects<&6 -echo "configure:90573: checking for __dn_skipname in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 ++echo "configure:95812: checking for netg_errstr in -lsybtcl" >&5 ++ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" -LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if { (eval echo configure:95831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -90603,128 +95842,186 @@ LIBS="$ac_save_LIBS" + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -+ ;; -+ *) -+ -+ install_modules="install-modules" ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ ++ case sybtcl in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case sybtcl in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsybtcl $LIBS" ++ ;; ++ esac + -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvmsg.so '$ext_builddir'/sysvmsg.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVMSG, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD)' -+ ;; ++ ++ fi ++ ;; + esac ++ ++ ++ ++ + else + echo "$ac_t""no" 1>&6 +-found=no +-fi -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix" -+ fi ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_sybtcl_netg_errstr ++ ++ -fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" ++ case sybtcl in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case sybtcl in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsybtcl $LIBS" ++ ;; ++ esac -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes @@ -43433,60 +42808,111 @@ - found=no -fi -rm -fr conftest* --fi ++ fi ++ ;; ++ esac ++ ++ ++ ++ + fi - LIBS=$ac_libs -+ ;; -+ esac -+ cat >> confdefs.h <> confdefs.h <<\EOF +-#define HAVE_DN_SKIPNAME 1 +-EOF ++ fi ++ ;; ++ esac + +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBRESOLV 1 +-EOF + +- ac_cv_func_dn_skipname=yes ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii + else + ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ + + - -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_SKIPNAME 1 --EOF -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF - -- ac_cv_func_dn_skipname=yes -- else -- -+ old_IFS=$IFS -+ for ac_src in sysvmsg.c; do ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" - unset ac_cv_lib_bind_dn_skipname - unset ac_cv_lib_bind___dn_skipname @@ -43506,27 +42932,12 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dn_skipname(); -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ fi -int main() { -dn_skipname() -; return 0; } -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" @@ -43538,7 +42949,6 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ done -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -43546,84 +42956,77 @@ - found=yes -else - echo "$ac_t""no" 1>&6 ++ fi ++ ++ fi - echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 -echo "configure:90709: checking for __dn_skipname in -lbind" >&5 -ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 ++echo "configure:96006: checking for insck__getVdate in -linsck" >&5 ++ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" -LIBS="-lbind $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if { (eval echo configure:96025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -90739,128 +96036,159 @@ LIBS="$ac_save_LIBS" + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi - -+ old_IFS=$IFS -+ for ac_src in sysvmsg.c; do +- -fi -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ case insck in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" ++ else + -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ ++ case insck in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-linsck $LIBS" ++ ;; ++ esac -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - if test "$found" = "yes"; then - ac_libs=$LIBS @@ -43635,63 +43038,128 @@ -#line 90760 "configure" -#include "confdefs.h" -main() { return (0); } -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes --else ++ fi ++ ;; ++ esac ++ ++ ++ + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - found=no -fi -rm -fr conftest* --fi -+ done ++ echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_insck_insck__getVdate ++ ++ + fi - LIBS=$ac_libs -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" - fi ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff="-L$SYBASE_CT_LIBDIR" + ++ save_ext_shared=$ext_shared ++ ext_shared=yes + -+ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ + ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi - if test "$found" = "yes"; then -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sysvmsg - -- +- ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ + - case bind in -- c|c_r|pthread*) ;; -- *) ++ case $ac_ii in + c|c_r|pthread*) ;; + *) - LIBS="-lbind $LIBS" -- ;; -- esac -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" + ;; + esac -+ fi - cat >> confdefs.h <<\EOF -#define HAVE_DN_SKIPNAME 1 -EOF -+fi ++ fi ++ ;; ++ esac - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -EOF - ac_cv_func_dn_skipname=yes -- else -- -- ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii + else + ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + - unset ac_cv_lib_socket_dn_skipname - unset ac_cv_lib_socket___dn_skipname - unset found @@ -43710,6 +43178,7 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dn_skipname(); ++ fi -int main() { -dn_skipname() @@ -43718,15 +43187,7 @@ -if { (eval echo configure:90825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -+php_enable_sysvsem=no -+ -+echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 -+echo "configure:97219: checking whether to enable System V semaphore support" >&5 -+# Check whether --enable-sysvsem or --disable-sysvsem was given. -+if test "${enable_sysvsem+set}" = set; then -+ enableval="$enable_sysvsem" -+ PHP_SYSVSEM=$enableval - else +-else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* @@ -43734,78 +43195,83 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ -+ PHP_SYSVSEM=no -+ test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL - fi +-fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 ++ fi ++ ++ fi - echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 -echo "configure:90845: checking for __dn_skipname in -lsocket" >&5 -ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 ++echo "configure:96173: checking for bsd_tcp in -linsck" >&5 ++ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if { (eval echo configure:96192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -90875,257 +96203,258 @@ LIBS="$ac_save_LIBS" + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SYSVSEM in -+shared,*) -+ PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SYSVSEM=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - -- +- + -fi ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ case insck in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case insck in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-linsck $LIBS" ++ ;; ++ esac - if test "$found" = "yes"; then @@ -43822,7 +43288,13 @@ -if { (eval echo configure:90900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes --else ++ fi ++ ;; ++ esac ++ ++ ++ + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* @@ -43830,120 +43302,109 @@ -fi -rm -fr conftest* -fi -+echo "$ac_t""$ext_output" 1>&6 ++ echo "$ac_t""no" 1>&6 - LIBS=$ac_libs - fi ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_insck_bsd_tcp ++ ++ ++fi - if test "$found" = "yes"; then -+ -+ -+if test "$PHP_SYSVSEM" != "no"; then -+ -+ ext_builddir=ext/sysvsem -+ ext_srcdir=$abs_srcdir/ext/sysvsem -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYSVSEM_SHARED=no ++ else - case socket in -- c|c_r|pthread*) ;; -- *) ++ case cs in + c|c_r|pthread*) ;; + *) - LIBS="-lsocket $LIBS" -- ;; -+ case ext/sysvsem in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in sysvsem.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" ++ else + -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case cs in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lcs $LIBS" + ;; + esac -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - cat >> confdefs.h <<\EOF -#define HAVE_DN_SKIPNAME 1 -+ cat >>Makefile.objects<> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF - ac_cv_func_dn_skipname=yes -+ EXT_STATIC="$EXT_STATIC sysvsem" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" -+ fi - else -- +- else + - : - - fi -- -- -- fi -- + - - fi -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SYSVSEM_SHARED=yes ++ case ct in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" ++ else + -+ case ext/sysvsem in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + ++ case ct in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lct $LIBS" ++ ;; ++ esac + +- fi ++ ++ fi ++ ;; + esac ++ ++ ++ - ;; ++ case comn in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" ++ else ++ -- esac -- ++ case comn in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lcomn $LIBS" ++ ;; + esac -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo + ++ fi ++ ;; ++ esac - unset ac_cv_func_res_search - unset ac_cv_func___res_search - unset found -+ old_IFS=$IFS -+ for ac_src in sysvsem.c; do ++ - echo $ac_n "checking for res_search""... $ac_c" 1>&6 -echo "configure:90959: checking for res_search" >&5 @@ -43962,12 +43423,20 @@ -char res_search(); - -int main() { -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS ++ case intl in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" ++ else + -+ shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" ++ ++ case intl in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lintl $LIBS" ++ ;; ++ esac -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -43977,18 +43446,9 @@ -#else -res_search(); -#endif -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -; return 0; } -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_res_search=yes" @@ -44000,7 +43460,10 @@ -fi -rm -f conftest* -fi -- ++ fi ++ ;; ++ esac + -if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes @@ -44021,9 +43484,37 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __res_search(); -- + -int main() { -- ++ ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" ++ echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6 ++ ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff=" ++ $SYBASE_CT_LIBS ++ " ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi + -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ @@ -44032,7 +43523,26 @@ -#else -__res_search(); -#endif -+ done ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac -; return 0; } -EOF @@ -44047,10 +43557,6 @@ -fi -rm -f conftest* -fi -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" -if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 @@ -44061,43 +43567,43 @@ -fi - -fi -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)' -+ ;; ++ fi ++ ;; + esac -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" -+ fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF -+ cat >>Makefile.objects</dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi - ac_cv_func_res_search=yes - ;; -- ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ + - *) -- + - unset ac_cv_lib_resolv_res_search - unset ac_cv_lib_resolv___res_search - unset found @@ -44116,13 +43622,22 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char res_search(); -+$ext_builddir/phpsysvsem.$suffix: \$(shared_objects_sysvsem) \$(PHPSYSVSEM_SHARED_DEPENDENCIES) -+ $link_cmd ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi -int main() { -res_search() -; return 0; } - EOF +-EOF -if { (eval echo configure:91090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" @@ -44141,82 +43656,107 @@ - found=yes -else - echo "$ac_t""no" 1>&6 -+ ;; -+ *) -+ -+ install_modules="install-modules" ++ fi ++ ++ fi - echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:91110: checking for __res_search in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 ++echo "configure:96439: checking for netg_errstr in -ltcl" >&5 ++ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" -LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix" -+ fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if { (eval echo configure:96458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -91140,128 +96469,186 @@ LIBS="$ac_save_LIBS" + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - found=yes --else -- echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ ++ case tcl in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case tcl in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-ltcl $LIBS" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ++ + else + echo "$ac_t""no" 1>&6 -found=no -fi -+ cat >>Makefile.objects<> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes @@ -44243,54 +43779,100 @@ - found=no -fi -rm -fr conftest* --fi ++ fi ++ ;; ++ esac ++ ++ ++ ++ + fi - LIBS=$ac_libs -+ fi ++ ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff="-L$SYBASE_CT_LIBDIR" ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" fi - if test "$found" = "yes"; then - -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_SYSVSEM_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) -+ ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ - case resolv in -- c|c_r|pthread*) ;; -- *) ++ case $ac_ii in + c|c_r|pthread*) ;; + *) - LIBS="-lresolv $LIBS" -- ;; -+ case ext/sysvsem in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ + ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" + ;; + esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF -- ++ fi ++ ;; ++ esac + - cat >> confdefs.h <<\EOF -#define HAVE_LIBRESOLV 1 -EOF - ac_cv_func_res_search=yes -- else -- -+ old_IFS=$IFS -+ for ac_src in sysvsem.c; do ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii + else + ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ - unset ac_cv_lib_bind_res_search - unset ac_cv_lib_bind___res_search @@ -44310,27 +43892,23 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char res_search(); -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi -int main() { -res_search() -; return 0; } -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" @@ -44342,7 +43920,6 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ done -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -44350,84 +43927,77 @@ - found=yes -else - echo "$ac_t""no" 1>&6 ++ fi ++ ++ fi - echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 -echo "configure:91246: checking for __res_search in -lbind" >&5 -ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 ++echo "configure:96633: checking for insck__getVdate in -linsck" >&5 ++ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" -LIBS="-lbind $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if { (eval echo configure:96652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -91276,128 +96663,159 @@ LIBS="$ac_save_LIBS" + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi - -+ old_IFS=$IFS -+ for ac_src in sysvsem.c; do +- -fi -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ case insck in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" ++ else + -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ ++ case insck in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-linsck $LIBS" ++ ;; ++ esac -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - if test "$found" = "yes"; then - ac_libs=$LIBS @@ -44439,63 +44009,104 @@ -#line 91297 "configure" -#include "confdefs.h" -main() { return (0); } -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes --else ++ fi ++ ;; ++ esac ++ ++ ++ + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - found=no -fi -rm -fr conftest* --fi -+ done ++ echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_insck_insck__getVdate ++ ++ + fi - LIBS=$ac_libs -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff="-L$SYBASE_CT_LIBDIR" ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" fi -- + - if test "$found" = "yes"; then - ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ - case bind in -- c|c_r|pthread*) ;; -- *) ++ case $ac_ii in + c|c_r|pthread*) ;; + *) - LIBS="-lbind $LIBS" -- ;; -- esac -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ + ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" + ;; + esac - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sysvsem -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ fi ++ ;; ++ esac - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYSVSEM 1 - EOF +-EOF - ac_cv_func_res_search=yes -- else -- ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii + else + - - unset ac_cv_lib_socket_res_search - unset ac_cv_lib_socket___res_search @@ -44504,127 +44115,119 @@ -echo "configure:91343: checking for res_search in -lsocket" >&5 -ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "checking for union semun""... $ac_c" 1>&6 -+echo "configure:97557: checking for union semun" >&5 -+if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else +- echo $ac_n "(cached) $ac_c" 1>&6 +-else - ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < -+#include -+#include -+ - int main() { +-int main() { -res_search() -+union semun x; - ; return 0; } - EOF +-; return 0; } +-EOF -if { (eval echo configure:91362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:97573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +- rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -+ -+ php_cv_semun=yes -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -+ -+ php_cv_semun=no -+ - fi - rm -f conftest* +-fi +-rm -f conftest* -LIBS="$ac_save_LIBS" -- -+ - fi + +-fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 ++ fi ++ ++ fi - echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 -echo "configure:91382: checking for __res_search in -lsocket" >&5 -ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 ++echo "configure:96800: checking for bsd_tcp in -linsck" >&5 ++ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&6 -+ if test "$php_cv_semun" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_SEMUN 1 -+EOF ++char bsd_tcp(); --int main() { + int main() { -__res_search() --; return 0; } -+ else -+ cat >> confdefs.h <<\EOF -+#define HAVE_SEMUN 0 ++bsd_tcp() + ; return 0; } EOF -if { (eval echo configure:91401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - -+ fi ++if { (eval echo configure:96819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -91412,618 +96830,486 @@ LIBS="$ac_save_LIBS" fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi - -+ -+ -+php_enable_sysvshm=no -+ -+echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 -+echo "configure:97609: checking whether to enable System V shared memory support" >&5 -+# Check whether --enable-sysvshm or --disable-sysvshm was given. -+if test "${enable_sysvshm+set}" = set; then -+ enableval="$enable_sysvshm" -+ PHP_SYSVSHM=$enableval -+else +- -+ PHP_SYSVSHM=no -+ test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL -+ - fi - - +-fi +- +- - if test "$found" = "yes"; then - ac_libs=$LIBS - LIBS="$LIBS -lsocket" @@ -44635,37 +44238,7 @@ -#line 91433 "configure" -#include "confdefs.h" -main() { return (0); } -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SYSVSHM in -+shared,*) -+ PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SYSVSHM=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SYSVSHM" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYSVSHM 1 - EOF +-EOF -if { (eval echo configure:91437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes @@ -44677,144 +44250,99 @@ -fi -rm -fr conftest* -fi - +- - LIBS=$ac_libs - fi -+ -+ ext_builddir=ext/sysvshm -+ ext_srcdir=$abs_srcdir/ext/sysvshm - +- - if test "$found" = "yes"; then -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYSVSHM_SHARED=no ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared - case socket in -- c|c_r|pthread*) ;; -- *) ++ case insck in + c|c_r|pthread*) ;; + *) - LIBS="-lsocket $LIBS" -- ;; -+ case ext/sysvshm in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" ++ else ++ + ++ case insck in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-linsck $LIBS" + ;; + esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF - +- - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF -+ old_IFS=$IFS -+ for ac_src in sysvshm.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ fi ++ ;; ++ esac - ac_cv_func_res_search=yes - else - - : -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- fi -- -+ cat >>Makefile.objects<&6 - fi -+ EXT_STATIC="$EXT_STATIC sysvshm" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" -+ fi -+ else -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SYSVSHM_SHARED=yes -+ -+ case ext/sysvshm in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_insck_bsd_tcp ++ ++fi + + fi +- - ;; - +- - esac -+ -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo ++fi -echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 -echo "configure:91490: checking whether atof() accepts NAN" >&5 -if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 --else -- --if test "$cross_compiling" = yes; then -+ old_IFS=$IFS -+ for ac_src in sysvshm.c; do ++ ++php_enable_sysvmsg=no ++ ++echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 ++echo "configure:96879: checking whether to enable System V IPC support" >&5 ++# Check whether --enable-sysvmsg or --disable-sysvmsg was given. ++if test "${enable_sysvmsg+set}" = set; then ++ enableval="$enable_sysvmsg" ++ PHP_SYSVMSG=$enableval + else +-if test "$cross_compiling" = yes; then +- - ac_cv_atof_accept_nan=no -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" ++ PHP_SYSVMSG=no ++ test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL -else - cat > conftest.$ac_ext < -#include -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" -+ fi - +- - ac_cv_atof_accept_nan=yes -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -+ cat >>Makefile.objects<>Makefile.objects<&6 -fi -+$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES) -+ $link_cmd -echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 -if test "$ac_cv_atof_accept_nan" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ATOF_ACCEPTS_NAN 1 - EOF +-EOF -fi -+ ;; -+ esac -+ cat >> confdefs.h <&6 -echo "configure:91548: checking whether atof() accepts INF" >&5 -if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then ++if test "$PHP_SYSVMSG" != "no"; then ++ ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 ++echo "configure:96922: checking for sys/msg.h" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- +-if test "$cross_compiling" = yes; then +- +- ac_cv_atof_accept_inf=no +- +-else + cat > conftest.$ac_ext < +-#include +- +-#ifdef HAVE_ISINF +-#define zend_isinf(a) isinf(a) +-#elif defined(INFINITY) +-/* Might not work, but is required by ISO C99 */ +-#define zend_isinf(a) (((a)==INFINITY)?1:0) +-#elif defined(HAVE_FPCLASS) +-#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) +-#else +-#define zend_isinf(a) 0 +-#endif +- +-int main(int argc, char** argv) +-{ +- return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; +-} +- ++#include + EOF +-if { (eval echo configure:91582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- +- ac_cv_atof_accept_inf=yes +- ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:96932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" + else ++ echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* +- +- ac_cv_atof_accept_inf=no +- ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" + fi +-rm -fr conftest* ++rm -f conftest* + fi +- ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ : ++else ++ echo "$ac_t""no" 1>&6 ++{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } ++ + fi + +-echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 +-if test "$ac_cv_atof_accept_inf" = "yes"; then ++ + cat >> confdefs.h <<\EOF +-#define HAVE_ATOF_ACCEPTS_INF 1 ++#define HAVE_SYSVMSG 1 + EOF + +-fi ++ ++ ext_builddir=ext/sysvmsg ++ ext_srcdir=$abs_srcdir/ext/sysvmsg + +-echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 +-echo "configure:91609: checking whether HUGE_VAL == INF" >&5 +-if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -+ fi -+ fi ++ ac_extra= + -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_SYSVSHM_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) -+ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_SYSVMSG_SHARED=no ++ + -+ case ext/sysvshm in ++ case ext/sysvmsg in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -if test "$cross_compiling" = yes; then -- ac_cv_atof_accept_inf=no +- ac_cv_huge_val_inf=yes -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:91643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - -- ac_cv_atof_accept_inf=yes +- ac_cv_huge_val_inf=yes + done -else @@ -45010,46 +44575,49 @@ - cat conftest.$ac_ext >&5 - rm -fr conftest* + -+ EXT_STATIC="$EXT_STATIC sysvshm" -+ ;; -+ *) -+ -+ -+ case ext/sysvshm in ++ EXT_STATIC="$EXT_STATIC sysvmsg" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" ++ fi ++ else ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_SYSVMSG_SHARED=yes ++ ++ case ext/sysvmsg in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + -- ac_cv_atof_accept_inf=no +- ac_cv_huge_val_inf=no -fi -rm -fr conftest* -fi -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo -fi --echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 --if test "$ac_cv_atof_accept_inf" = "yes"; then +-echo "$ac_t""$ac_cv_huge_val_inf" 1>&6 +-if test "$ac_cv_huge_val_inf" = "yes"; then - cat >> confdefs.h <<\EOF --#define HAVE_ATOF_ACCEPTS_INF 1 +-#define HAVE_HUGE_VAL_INF 1 + old_IFS=$IFS -+ for ac_src in sysvshm.c; do ++ for ac_src in sysvmsg.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -45065,108 +44633,10 @@ + done -fi - --echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 --echo "configure:91609: checking whether HUGE_VAL == INF" >&5 --if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" -+ fi - --if test "$cross_compiling" = yes; then - -- ac_cv_huge_val_inf=yes -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ - --else -- cat > conftest.$ac_ext < --#include -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sysvshm -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - --#ifdef HAVE_ISINF --#define zend_isinf(a) isinf(a) --#elif defined(INFINITY) --/* Might not work, but is required by ISO C99 */ --#define zend_isinf(a) (((a)==INFINITY)?1:0) --#elif defined(HAVE_FPCLASS) --#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) --#else --#define zend_isinf(a) 0 --#endif -+ fi - --int main(int argc, char** argv) --{ -- return zend_isinf(HUGE_VAL) ? 0 : 1; --} -+fi - --EOF --if { (eval echo configure:91643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_huge_val_inf=yes - -+ -+php_with_tidy=no -+ -+echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 -+echo "configure:97953: checking for TIDY support" >&5 -+# Check whether --with-tidy or --without-tidy was given. -+if test "${with_tidy+set}" = set; then -+ withval="$with_tidy" -+ PHP_TIDY=$withval - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* - -- ac_cv_huge_val_inf=no -+ PHP_TIDY=no -+ test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL - - fi --rm -fr conftest* --fi - --fi - --echo "$ac_t""$ac_cv_huge_val_inf" 1>&6 --if test "$ac_cv_huge_val_inf" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_HUGE_VAL_INF 1 --EOF - --fi -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_TIDY in -+shared,*) -+ PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_TIDY=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac ++ case $host_alias in ++ *netware*) ++ ++ install_modules="install-modules" -echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 -echo "configure:91670: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 @@ -45175,17 +44645,42 @@ -else - -if test "$cross_compiling" = yes; then -- ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvmsg.so '$ext_builddir'/phpsysvmsg.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD)' ++ ;; ++ esac ++ ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix" ++ fi + - ac_cv_huge_val_nan=yes ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" -else - cat > conftest.$ac_ext <>Makefile.objects< -#include -+echo "$ac_t""$ext_output" 1>&6 ++$ext_builddir/phpsysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(PHPSYSVMSG_SHARED_DEPENDENCIES) ++ $link_cmd -#ifdef HAVE_ISNAN -#define zend_isnan(a) isnan(a) @@ -45194,6 +44689,7 @@ -#else -#define zend_isnan(a) 0 -#endif ++EOF -int main(int argc, char** argv) -{ @@ -45204,12 +44700,76 @@ - return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; -#endif -} ++ ;; ++ *) ++ ++ install_modules="install-modules" ++ ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvmsg.so '$ext_builddir'/sysvmsg.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVMSG, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD)' ++ ;; ++ esac ++ ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix" ++ fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" ++ ++ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then -- ++ ++ ;; ++ esac ++ cat >> confdefs.h <&5 @@ -45217,125 +44777,123 @@ - rm -fr conftest* - - ac_cv_huge_val_nan=no -+if test "$PHP_TIDY" != "no"; then -fi -rm -fr conftest* -fi -+ if test "$PHP_TIDY" != "yes"; then -+ TIDY_SEARCH_DIRS=$PHP_TIDY -+ else -+ TIDY_SEARCH_DIRS="/usr/local /usr" -+ fi ++ old_IFS=$IFS ++ for ac_src in sysvmsg.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -fi -+ for i in $TIDY_SEARCH_DIRS; do -+ if test -f $i/include/tidy/tidy.h; then -+ TIDY_DIR=$i -+ TIDY_INCDIR=$i/include/tidy -+ elif test -f $i/include/tidy.h; then -+ TIDY_DIR=$i -+ TIDY_INCDIR=$i/include -+ fi -+ done ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac -echo "$ac_t""$ac_cv_huge_val_nan" 1>&6 -if test "$ac_cv_huge_val_nan" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_HUGE_VAL_NAN 1 --EOF -+ if test -z "$TIDY_DIR"; then -+ { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } -+ fi ++ cat >>Makefile.objects<&6 -echo "configure:91733: checking whether strptime() declaration fails" >&5 -if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else ++ EXT_STATIC="$EXT_STATIC sysvmsg" ++ ;; ++ *) ++ ++ ++ case ext/sysvmsg in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac ++ -cat > conftest.$ac_ext < - -int main() { -- + -#ifndef HAVE_STRPTIME -#error no strptime() on this platform -#else -/* use invalid strptime() declaration to see if it fails to compile */ -int strptime(const char *s, const char *format, struct tm *tm); -#endif -+ if test "$ext_shared" = "yes"; then -+ TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" -+ if test -n "$TIDY_LIBDIR"; then -+ -+ if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$TIDY_LIBDIR -+ else -+ -+ ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -+ fi ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo -; return 0; } -EOF -if { (eval echo configure:91755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* -+ -+ if test "$ext_shared" = "yes"; then -+ TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" -+ else -+ - +- - ac_cv_strptime_decl_fails=no -- + -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ++ old_IFS=$IFS ++ for ac_src in sysvmsg.c; do - ac_cv_strptime_decl_fails=yes -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -fi -rm -f conftest* -fi ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac -echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 -if test "$ac_cv_strptime_decl_fails" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_STRPTIME_DECL_FAILS 1 --EOF -+ fi -+ -+ fi ++ cat >>Makefile.objects<&6 -fi -done -+ if test -n "$TIDY_LIBDIR"; then -+ -+ if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$TIDY_LIBDIR -+ else -+ -+ ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -+ fi -for ac_func in mblen -do @@ -45406,21 +44951,14 @@ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); -+ -+ -+ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" ++ fi + -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ BUILD_DIR="$BUILD_DIR $ext_builddir" + -+ fi -int main() { @@ -45432,8 +44970,10 @@ -#else -$ac_func(); -#endif ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=sysvmsg + -+ fi ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -; return 0; } -EOF @@ -45449,14 +44989,6 @@ -rm -f conftest* -fi + fi -+ -+ -+ case tidy in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-ltidy $LIBS" -+ ;; -+ esac -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 @@ -45467,7 +44999,7 @@ - -else - echo "$ac_t""no" 1>&6 --fi + fi -done -for ac_func in mbrlen mbsinit @@ -45498,14 +45030,20 @@ -#else -$ac_func(); -#endif -+ fi ++php_enable_sysvsem=no -; return 0; } -EOF -if { (eval echo configure:91905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" --else ++echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 ++echo "configure:97259: checking whether to enable System V semaphore support" >&5 ++# Check whether --enable-sysvsem or --disable-sysvsem was given. ++if test "${enable_sysvsem+set}" = set; then ++ enableval="$enable_sysvsem" ++ PHP_SYSVSEM=$enableval + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* @@ -45513,6 +45051,9 @@ -fi -rm -f conftest* -fi ++ ++ PHP_SYSVSEM=no ++ test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 @@ -45523,148 +45064,59 @@ - -else - echo "$ac_t""no" 1>&6 --fi + fi -done -+ -+ if test "$TIDY_INCDIR" != "/usr/include"; then -+ -+ if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$TIDY_INCDIR -+ else -+ -+ ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" -+ fi -echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:91930: checking for mbstate_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -+ - +- -cat > conftest.$ac_ext < -#endif -+ fi -int main() { ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SYSVSEM in ++shared,*) ++ PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SYSVSEM=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac -int __tmp__() { mbstate_t a; } -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -; return 0; } -EOF -if { (eval echo configure:91949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - +- - ac_cv_type_mbstate_t=yes -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" - +- - ac_cv_type_mbstate_t=no -+ fi ++echo "$ac_t""$ext_output" 1>&6 -fi -rm -f conftest* @@ -45675,14 +45127,8 @@ - cat >> confdefs.h <<\EOF -#define HAVE_MBSTATE_T 1 -EOF -+ fi -+ -+ fi -fi -+ ;; -+ esac -+ done -for ac_hdr in atomic.h -do @@ -45690,104 +45136,251 @@ -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:91977: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 -+echo "configure:98242: checking for tidyOptGetDoc in -ltidy" >&5 -+ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else +- echo $ac_n "(cached) $ac_c" 1>&6 +-else - cat > conftest.$ac_ext < conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char tidyOptGetDoc(); -+ -+int main() { -+tidyOptGetDoc() -+; return 0; } - EOF +-EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:91987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then -+if { (eval echo configure:98261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +- rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -+ eval "ac_cv_lib_$ac_lib_var=yes" - else +-else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -+LIBS="$ac_save_LIBS" -+ - fi +-fi +-rm -f conftest* +-fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_TIDYOPTGETDOC 1 - EOF -- -+ -+ -+ - else - echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_tidy_tidyOptGetDoc -+ -+ - fi +-EOF ++if test "$PHP_SYSVSEM" != "no"; then + +-else +- echo "$ac_t""no" 1>&6 +-fi -done - - - +- +- +- - ext_builddir=ext/standard - ext_srcdir=$abs_srcdir/ext/standard -+ -+ ext_builddir=ext/tidy -+ ext_srcdir=$abs_srcdir/ext/tidy ++ ext_builddir=ext/sysvsem ++ ext_srcdir=$abs_srcdir/ext/sysvsem ac_extra= - if test "" != "shared" && test "" != "yes" && test "" != "cli"; then - PHP_STANDARD_SHARED=no + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_TIDY_SHARED=no ++ PHP_SYSVSEM_SHARED=no - case ext/standard in -+ case ext/tidy in ++ case ext/sysvsem in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -92038,17 +97324,7 @@ done + + + old_IFS=$IFS +- for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ +- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ +- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ +- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ +- microtime.c pack.c pageinfo.c quot_print.c rand.c \ +- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ +- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ +- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ +- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ +- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ +- filters.c proc_open.c streamsfuncs.c http.c; do ++ for ac_src in sysvsem.c; do + + IFS=. + set $ac_src +@@ -92071,18 +97347,18 @@ EOF + done + + +- EXT_STATIC="$EXT_STATIC standard" +- if test "" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC standard" ++ EXT_STATIC="$EXT_STATIC sysvsem" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" + fi + else +- if test "" = "shared" || test "" = "yes"; then +- PHP_STANDARD_SHARED=yes ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_SYSVSEM_SHARED=yes + +- case ext/standard in ++ case ext/sysvsem in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -92097,24 +97373,14 @@ EOF + + + old_IFS=$IFS +- for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ +- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ +- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ +- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ +- microtime.c pack.c pageinfo.c quot_print.c rand.c \ +- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ +- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ +- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ +- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ +- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ +- filters.c proc_open.c streamsfuncs.c http.c; do ++ for ac_src in sysvsem.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + +- shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" ++ shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +@@ -92137,31 +97403,31 @@ EOF + case $host_alias in + *aix*) + suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so' + ;; + *netware*) + suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)' + ;; + esac + + if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix" + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" + fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" + + cat >>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <<\EOF ++#define HAVE_SYSVSEM 1 ++EOF + ++ echo $ac_n "checking for union semun""... $ac_c" 1>&6 ++echo "configure:97597: checking for union semun" >&5 ++if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext <> Makefile.fragments +- +- +- +- for header_file in ext/standard/; do +- ++#include ++#include ++#include ++ ++int main() { ++union semun x; ++; return 0; } ++EOF ++if { (eval echo configure:97613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* + +- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` ++ php_cv_semun=yes ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* + +- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INSTALLHEADERS$unique=set" +- +- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" +- +- fi ++ php_cv_semun=no ++ ++fi ++rm -f conftest* ++ ++fi + +- done +- ++echo "$ac_t""$php_cv_semun" 1>&6 ++ if test "$php_cv_semun" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_SEMUN 1 ++EOF ++ ++ else ++ cat >> confdefs.h <<\EOF ++#define HAVE_SEMUN 0 ++EOF + ++ fi ++fi + + + +-php_with_sybase_ct=no ++php_enable_sysvshm=no + +-echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 +-echo "configure:92377: checking for Sybase-CT support" >&5 +-# Check whether --with-sybase-ct or --without-sybase-ct was given. +-if test "${with_sybase_ct+set}" = set; then +- withval="$with_sybase_ct" +- PHP_SYBASE_CT=$withval ++echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 ++echo "configure:97649: checking whether to enable System V shared memory support" >&5 ++# Check whether --enable-sysvshm or --disable-sysvshm was given. ++if test "${enable_sysvshm+set}" = set; then ++ enableval="$enable_sysvshm" ++ PHP_SYSVSHM=$enableval + else + +- PHP_SYBASE_CT=no +- test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL ++ PHP_SYSVSHM=no ++ test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL + + fi + +@@ -92389,12 +97661,12 @@ fi + + ext_output="yes, shared" + ext_shared=yes +-case $PHP_SYBASE_CT in ++case $PHP_SYSVSHM in + shared,*) +- PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'` ++ PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` + ;; + shared) +- PHP_SYBASE_CT=yes ++ PHP_SYSVSHM=yes + ;; + no) + ext_output=no +@@ -92413,30 +97685,25 @@ echo "$ac_t""$ext_output" 1>&6 + + + +-if test "$PHP_SYBASE_CT" != "no"; then +- +- if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then +- { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } +- fi +- ++if test "$PHP_SYSVSHM" != "no"; then + cat >> confdefs.h <<\EOF +-#define HAVE_SYBASE_CT 1 ++#define HAVE_SYSVSHM 1 + EOF + + +- ext_builddir=ext/sybase_ct +- ext_srcdir=$abs_srcdir/ext/sybase_ct ++ ext_builddir=ext/sysvshm ++ ext_srcdir=$abs_srcdir/ext/sysvshm + + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SYBASE_CT_SHARED=no ++ PHP_SYSVSHM_SHARED=no + + +- case ext/sybase_ct in ++ case ext/sysvshm in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -92451,7 +97718,7 @@ EOF + + + old_IFS=$IFS +- for ac_src in php_sybase_ct.c; do ++ for ac_src in sysvshm.c; do + + IFS=. + set $ac_src +@@ -92474,18 +97741,18 @@ EOF + done + + +- EXT_STATIC="$EXT_STATIC sybase_ct" ++ EXT_STATIC="$EXT_STATIC sysvshm" + if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" + fi + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_SYBASE_CT_SHARED=yes ++ PHP_SYSVSHM_SHARED=yes + +- case ext/sybase_ct in ++ case ext/sysvshm in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -92500,14 +97767,14 @@ EOF + + + old_IFS=$IFS +- for ac_src in php_sybase_ct.c; do ++ for ac_src in sysvshm.c; do IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS -- shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" -+ shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" +- shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo" ++ shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -92137,31 +98401,31 @@ EOF +@@ -92530,31 +97797,31 @@ EOF case $host_alias in *aix*) suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvshm.so '$ext_builddir'/phpsysvshm.so' ;; *netware*) suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)' ;; *) suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 +-echo "configure:92732: checking size of long int" >&5 +-if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_long_int=4 +-else +- cat > conftest.$ac_ext < +-#include +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(long int)); +- exit(0); +-} +-EOF +-if { (eval echo configure:92752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- ac_cv_sizeof_long_int=`cat conftestval` +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_sizeof_long_int=0 +-fi +-rm -fr conftest* +-fi +- +-fi +-echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 +-cat >> confdefs.h <&6 +-echo "configure:92772: checking checking if we're on a 64-bit platform" >&5 +- if test "$ac_cv_sizeof_long_int" = "4"; then +- echo "$ac_t""no" 1>&6 +- PHP_SYBASE_64=no +- else +- echo "$ac_t""yes" 1>&6 +- PHP_SYBASE_64=yes +- fi +- +- +- echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 +-echo "configure:92783: checking Checking for ctpublic.h" >&5 +- if test -f $SYBASE_CT_INCDIR/ctpublic.h; then +- echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 +- +- if test "$SYBASE_CT_INCDIR" != "/usr/include"; then +- +- if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then +- ai_p=$SYBASE_CT_INCDIR +- else +- +- ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" +- fi +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi +- +- fi +- +- else +- { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } +- fi +- +- echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 +-echo "configure:92822: checking Checking Sybase libdir" >&5 +- echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 +- +- echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 +-echo "configure:92826: checking Checking for Sybase platform libraries" >&5 - +- +- if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then +- +- if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$SYBASE_CT_LIBDIR +- else +- +- ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" +- fi - -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments +- +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +- +- fi - - +- fi +- +- fi +- +- if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then +- - -- for header_file in ext/standard/; do +- case ct in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" +- else - - -- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" +- case ct in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lct $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" +- echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 +- elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then - -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" +- +- case sybcs64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" +- else - -- fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" - -- done - -+ cat >> confdefs.h <<\EOF -+#define HAVE_TIDY 1 -+EOF - -+fi - - - --php_with_sybase_ct=no - --echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 --echo "configure:92377: checking for Sybase-CT support" >&5 --# Check whether --with-sybase-ct or --without-sybase-ct was given. --if test "${with_sybase_ct+set}" = set; then -- withval="$with_sybase_ct" -- PHP_SYBASE_CT=$withval -+php_enable_tokenizer=yes -+ -+echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 -+echo "configure:98605: checking whether to enable tokenizer support" >&5 -+# Check whether --enable-tokenizer or --disable-tokenizer was given. -+if test "${enable_tokenizer+set}" = set; then -+ enableval="$enable_tokenizer" -+ PHP_TOKENIZER=$enableval - else - -- PHP_SYBASE_CT=no -- test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL -+ PHP_TOKENIZER=yes -+ test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL - - fi - -@@ -92389,12 +98617,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_SYBASE_CT in -+case $PHP_TOKENIZER in - shared,*) -- PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'` -+ PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'` - ;; - shared) -- PHP_SYBASE_CT=yes -+ PHP_TOKENIZER=yes - ;; - no) - ext_output=no -@@ -92413,30 +98641,21 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test "$PHP_SYBASE_CT" != "no"; then +- case sybcs64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybcs64 $LIBS" +- ;; +- esac - -- if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then -- { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } +- +- fi +- ;; +- esac +- +- +- +- +- case sybct64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case sybct64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybct64 $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- +- +- case sybcomn64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case sybcomn64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybcomn64 $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- +- +- case sybintl64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case sybintl64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybintl64 $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- +- ac_solid_uname_s=`uname -s 2>/dev/null` +- case $ac_solid_uname_s in +- *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define +- *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # +- esac +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" +- echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 +- +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- $SYBASE_CT_LIBS +- " +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" +- else +- +- +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- cat >> confdefs.h <<\EOF --#define HAVE_SYBASE_CT 1 --EOF +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -l$ac_ii" +- else +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- LIBS="$LIBS -l$ac_ii" +- ;; +- esac - -+if test "$PHP_TOKENIZER" != "no"; then - -- ext_builddir=ext/sybase_ct -- ext_srcdir=$abs_srcdir/ext/sybase_ct -+ ext_builddir=ext/tokenizer -+ ext_srcdir=$abs_srcdir/ext/tokenizer - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYBASE_CT_SHARED=no -+ PHP_TOKENIZER_SHARED=no - +- +- fi +- ;; +- esac +- +- +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- fi +- +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- +- ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" ++ fi -- case ext/sybase_ct in -+ case ext/tokenizer in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" ++ BUILD_DIR="$BUILD_DIR $ext_builddir" -@@ -92451,7 +98670,7 @@ EOF - +- fi - old_IFS=$IFS -- for ac_src in php_sybase_ct.c; do -+ for ac_src in tokenizer.c tokenizer_data.c; do - - IFS=. - set $ac_src -@@ -92474,18 +98693,18 @@ EOF - done +- fi ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=sysvshm + ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ + fi -- EXT_STATIC="$EXT_STATIC sybase_ct" -+ EXT_STATIC="$EXT_STATIC tokenizer" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYBASE_CT_SHARED=yes -+ PHP_TOKENIZER_SHARED=yes - -- case ext/sybase_ct in -+ case ext/tokenizer in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -92500,14 +98719,14 @@ EOF +- ;; +- esac +- done ++fi +- echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 +-echo "configure:93092: checking for netg_errstr in -lsybtcl64" >&5 +-ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsybtcl64 $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++ ++php_with_tidy=no ++ ++echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 ++echo "configure:97993: checking for TIDY support" >&5 ++# Check whether --with-tidy or --without-tidy was given. ++if test "${with_tidy+set}" = set; then ++ withval="$with_tidy" ++ PHP_TIDY=$withval + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++ ++ PHP_TIDY=no ++ test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -92530,31 +98749,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)' - ;; - esac + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- +- +- +- case sybtcl64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case sybtcl64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybtcl64 $LIBS" +- ;; +- esac - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" - cat >>Makefile.objects<&6 - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_sybtcl64_netg_errstr +- +- +- +- case sybtcl64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case sybtcl64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybtcl64 $LIBS" +- ;; +- esac - cat >>Makefile.objects<&6 --$ext_builddir/sybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(SYBASE_CT_SHARED_DEPENDENCIES) -+$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES) - $link_cmd +- fi +- ;; +- esac - EOF -@@ -92599,22 +98818,22 @@ EOF - ;; - esac - cat >> confdefs.h <&2; exit 1; } ++ fi +- fi +- ;; +- esac ++ TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR -- EXT_STATIC="$EXT_STATIC sybase_ct" -+ EXT_STATIC="$EXT_STATIC tokenizer" - ;; - *) - - -- case ext/sybase_ct in -+ case ext/tokenizer in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -92675,7 +98894,7 @@ EOF ++ +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` ++ if test "$ext_shared" = "yes"; then ++ TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" ++ if test -n "$TIDY_LIBDIR"; then + +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then + +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii ++ if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$TIDY_LIBDIR + else + +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" + fi - old_IFS=$IFS -- for ac_src in php_sybase_ct.c; do -+ for ac_src in tokenizer.c tokenizer_data.c; do + + if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" + else + - IFS=. - set $ac_src -@@ -92699,311 +98918,165 @@ EOF - +@@ -93277,154 +98096,26 @@ fi + + fi - ;; +- ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" -- fi -- -- -- BUILD_DIR="$BUILD_DIR $ext_builddir" -- -- -- -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=sybase_ct -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -- fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" -- -- -- if test "$PHP_SYBASE_CT" = "yes"; then -- SYBASE_CT_INCDIR=/home/sybase/include -- SYBASE_CT_LIBDIR=/home/sybase/lib -- else -- SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include -- SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib -- fi +- done - -- echo $ac_n "checking size of long int""... $ac_c" 1>&6 --echo "configure:92732: checking size of long int" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then +- echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 +-echo "configure:93286: checking for insck__getVdate in -linsck64" >&5 +-ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long_int=4 --else -- cat > conftest.$ac_ext < conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long int)); -- exit(0); --} +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char insck__getVdate(); +- +-int main() { +-insck__getVdate() +-; return 0; } -EOF --if { (eval echo configure:92752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_cv_sizeof_long_int=`cat conftestval` +-if { (eval echo configure:93305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long_int=0 --fi --rm -fr conftest* +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" -fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" - -fi --echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 --cat >> confdefs.h <&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- +- +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck64 $LIBS" +- ;; +- esac - - -- echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 --echo "configure:92772: checking checking if we're on a 64-bit platform" >&5 -- if test "$ac_cv_sizeof_long_int" = "4"; then -- echo "$ac_t""no" 1>&6 -- PHP_SYBASE_64=no -- else -- echo "$ac_t""yes" 1>&6 -- PHP_SYBASE_64=yes -- fi + fi +- ;; +- esac - - -- echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 --echo "configure:92783: checking Checking for ctpublic.h" >&5 -- if test -f $SYBASE_CT_INCDIR/ctpublic.h; then -- echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 -- -- if test "$SYBASE_CT_INCDIR" != "/usr/include"; then -- -- if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$SYBASE_CT_INCDIR -- else -- -- ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" -- fi +- +-else +- echo "$ac_t""no" 1>&6 - -- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck64_insck__getVdate ++ else + - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +-fi + ++ if test -n "$TIDY_LIBDIR"; then + +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="-L$SYBASE_CT_LIBDIR" - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" - else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- +- +- +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- fi +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -l$ac_ii" +- else +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- LIBS="$LIBS -l$ac_ii" +- ;; +- esac - -- else -- { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } -- fi -- -- echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 --echo "configure:92822: checking Checking Sybase libdir" >&5 -- echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 -- -- echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 --echo "configure:92826: checking Checking for Sybase platform libraries" >&5 - -- -- if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SYBASE_CT_LIBDIR -- else -- -- ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" -- fi +- fi +- ;; +- esac +- +- +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then + +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii ++ if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$TIDY_LIBDIR + else + +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" + fi + + +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- ++ + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +@@ -93440,188 +98131,60 @@ fi + fi + + +- fi + + fi + +- ;; +- esac +- done +- +- echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 +-echo "configure:93453: checking for bsd_tcp in -linsck64" >&5 +-ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck64 $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" - +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared - -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD" -- else -- - +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" +- else +- - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck64 $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" +-else +- echo "$ac_t""no" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck64_bsd_tcp - -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" - -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" - fi -+ -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ - - -- fi -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=tokenizer - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ - fi - -- if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then +-fi +- +- elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then - - -- case ct in +- case sybcs in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" - else - - -- case ct in +- +- case sybcs in - c|c_r|pthread*) ;; - *) -- LIBS="-lct $LIBS" +- LIBS="-lsybcs $LIBS" - ;; - esac -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+ -+fi - - +- +- - fi - ;; - esac - -+php_enable_wddx=no - -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" -- echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 -- elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then +- +- - - -- case sybcs64 in +- case sybct in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" - else - -+echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 -+echo "configure:98951: checking whether to enable WDDX support" >&5 -+# Check whether --enable-wddx or --disable-wddx was given. -+if test "${enable_wddx+set}" = set; then -+ enableval="$enable_wddx" -+ PHP_WDDX=$enableval -+else - -- case sybcs64 in +- +- case sybct in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybcs64 $LIBS" +- LIBS="-lsybct $LIBS" - ;; - esac -+ PHP_WDDX=no -+ test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL -+ -+fi - - +- +- - fi - ;; - esac - -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_WDDX in -+shared,*) -+ PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_WDDX=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - +- +- - - -- case sybct64 in +- case sybcomn in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" - else - - -- case sybct64 in +- case sybcomn in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybct64 $LIBS" +- LIBS="-lsybcomn $LIBS" +- ;; +- esac +- +- +- fi - ;; - esac +- +- +- +- +- case sybintl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" +- else +- ++ fi + +- case sybintl in ++ ++ case tidy in + c|c_r|pthread*) ;; + *) +- LIBS="-lsybintl $LIBS" ++ LIBS="-ltidy $LIBS" + ;; + esac - fi - ;; - esac -+echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ fi -- + +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" +- echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 ++ if test "$TIDY_INCDIR" != "/usr/include"; then ++ ++ if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then ++ ai_p=$TIDY_INCDIR ++ else ++ ++ ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" ++ fi ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi + ++ fi ++ ++ fi + + -+if test -z "$PHP_LIBXML_DIR"; then ++ + save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- $SYBASE_CT_LIBS +- " ++ ac_stuff="" -- case sybcomn64 in + save_ext_shared=$ext_shared + ext_shared=yes +@@ -93714,27 +98277,27 @@ fi + esac + done + +- echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 +-echo "configure:93719: checking for netg_errstr in -lsybtcl" >&5 +-ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 ++echo "configure:98282: checking for tidyOptGetDoc in -ltidy" >&5 ++ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lsybtcl $LIBS" ++LIBS="-ltidy $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:98301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -93753,705 +98316,807 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + +- +- +- case sybtcl in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" - else - -+php_with_libxml_dir=no -+ -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:98996: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval -+else +- +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybtcl $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- ++ cat >> confdefs.h <<\EOF ++#define HAVE_TIDYOPTGETDOC 1 ++EOF + +- + -+ PHP_LIBXML_DIR=no -- case sybcomn64 in + else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared +- unset ac_cv_lib_sybtcl_netg_errstr +- +- +- +- case sybtcl in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybcomn64 $LIBS" +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" +- else +- ++ unset ac_cv_lib_tidy_tidyOptGetDoc ++ + +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybtcl $LIBS" - ;; - esac - +- +fi - fi - ;; - esac -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 - + +-fi ++ ext_builddir=ext/tidy ++ ext_srcdir=$abs_srcdir/ext/tidy + +- ++ ac_extra= + ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_TIDY_SHARED=no + +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="-L$SYBASE_CT_LIBDIR" + +- save_ext_shared=$ext_shared +- ext_shared=yes ++ case ext/tidy in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" +- else +- + +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + -+fi ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo ++ ++ ++ old_IFS=$IFS ++ for ac_src in tidy.c; do + +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<&6 -+echo "configure:99020: checking libexpat dir for WDDX" >&5 -+# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -+if test "${with_libexpat_dir+set}" = set; then -+ withval="$with_libexpat_dir" -+ PHP_LIBEXPAT_DIR=$withval -+else - -- case sybintl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" -- else -- -+ PHP_LIBEXPAT_DIR=no - -- case sybintl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybintl64 $LIBS" -- ;; -- esac - -+fi ++ ;; ++ esac ++ cat >> confdefs.h <&6 +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` ++ old_IFS=$IFS ++ for ac_src in tidy.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- fi ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- ac_solid_uname_s=`uname -s 2>/dev/null` -- case $ac_solid_uname_s in -- *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define -- *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # -- esac -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" -- echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 -- -+ -+ -+if test "$PHP_WDDX" != "no"; then -+ -+ if test "$PHP_LIBEXPAT_DIR" = "no"; then -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac + - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:99048: checking for xml2-config path" >&5 -+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- for ac_i in $ac_stuff; do -+ for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ if test -x "$i/bin/xml2-config"; then -+ ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ break -+ fi ++ cat >>Makefile.objects<&6 + -+ if test -x "$ac_cv_php_xml2_config_path"; then -+ XML2_CONFIG="$ac_cv_php_xml2_config_path" -+ libxml_full_version=`$XML2_CONFIG --version` -+ ac_IFS=$IFS -+ IFS="." -+ set $libxml_full_version -+ IFS=$ac_IFS -+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXML_VERSION" -ge "2006011"; then -+ LIBXML_LIBS=`$XML2_CONFIG --libs` -+ LIBXML_INCS=`$XML2_CONFIG --cflags` -+ -+ for ac_i in $LIBXML_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" - else ++ EXT_STATIC="$EXT_STATIC tidy" ++ ;; ++ *) -@@ -93025,7 +99098,7 @@ echo "configure:92826: checking Checking - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" - else - ++ case ext/tidy in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac -@@ -93060,8 +99133,8 @@ echo "configure:92826: checking Checking - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" - else - +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -93087,175 +99160,236 @@ echo "configure:92826: checking Checking - esac - done - -- echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 --echo "configure:93092: checking for netg_errstr in -lsybtcl64" >&5 --ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ -+ for ac_i in $LIBXML_INCS; do -+ case $ac_i in -+ -I*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/include"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" + -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + -+ fi + -+ ;; -+ esac ++ old_IFS=$IFS ++ for ac_src in tidy.c; do + ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&6 -+echo "configure:99206: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-lsybtcl64 $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&6 +-echo "configure:93913: checking for insck__getVdate in -linsck" >&5 +-ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck $LIBS" +-cat > conftest.$ac_ext <> confdefs.h <<\EOF ++#define HAVE_TIDY 1 EOF --if { (eval echo configure:93111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:93932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -+if { (eval echo configure:99233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -- --fi + + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -+ rm -fr conftest* - +- - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -+ LIBS=$old_LIBS - -- -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ - -- case sybtcl64 in +- +- +- case insck in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" - else -+fi -+rm -fr conftest* -+fi +- + + - -- -- case sybtcl64 in ++ ++ ++php_enable_tokenizer=yes ++ ++echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 ++echo "configure:98645: checking whether to enable tokenizer support" >&5 ++# Check whether --enable-tokenizer or --disable-tokenizer was given. ++if test "${enable_tokenizer+set}" = set; then ++ enableval="$enable_tokenizer" ++ PHP_TOKENIZER=$enableval ++else + +- case insck in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybtcl64 $LIBS" +- LIBS="-linsck $LIBS" - ;; - esac ++ PHP_TOKENIZER=yes ++ test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL ++ +fi ++ ++ ++ ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_TOKENIZER in ++shared,*) ++ PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_TOKENIZER=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 -+EOF - fi - ;; -+ fi -+ -+ if test "$PHP_XML" = "no"; then -+ -+ -+ case ext/xml in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ -+ +- esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo ++echo "$ac_t""$ext_output" 1>&6 -- - -else - echo "$ac_t""no" 1>&6 - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_sybtcl64_netg_errstr -- -- -+ old_IFS=$IFS -+ for ac_src in compat.c; do - -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -- else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl64 $LIBS" -- ;; -- esac -- -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- fi -- ;; -- esac -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -+ cat >>Makefile.objects<&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -+ -+ fi -+ - fi +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi -+ if test "$PHP_LIBEXPAT_DIR" != "no"; then -+ for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do -+ if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then -+ EXPAT_DIR=$i -+ break - fi +- fi - ;; - -l*) - ac_ii=`echo $ac_i|cut -c 3-` - -+ done -+ -+ if test -z "$EXPAT_DIR"; then -+ { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } -+ fi ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + -+ -+ if test "$EXPAT_DIR/include" != "/usr/include"; then -+ -+ if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/include -+ else -+ -+ ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -+ fi + -+ ++ old_IFS=$IFS ++ for ac_src in tokenizer.c tokenizer_data.c; do - case $ac_ii in - c|c_r|pthread*) ;; @@ -47112,100 +47468,140 @@ - if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" - else -- -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + +- - case $ac_ii in - c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" - ;; - esac -- -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac - fi - ;; - esac -+ fi ++ cat >>Makefile.objects</dev/null ; then - ai_p=$ac_ii -+ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/$PHP_LIBDIR ++ EXT_STATIC="$EXT_STATIC tokenizer" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" ++ fi else - +- - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then +- fi +- +- +- if test "$ext_shared" = "yes"; then - LDFLAGS="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" - else - +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_TOKENIZER_SHARED=yes ++ ++ case ext/tokenizer in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac -@@ -93277,360 +99411,522 @@ fi - - fi +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" + +- fi + ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo + +- fi +- +- fi - ;; - esac - done -- -- echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 --echo "configure:93286: checking for insck__getVdate in -linsck64" >&5 --ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'` ++ old_IFS=$IFS ++ for ac_src in tokenizer.c tokenizer_data.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" + +- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 +-echo "configure:94080: checking for bsd_tcp in -linsck" >&5 +-ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-linsck64 $LIBS" +-LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -47216,121 +47612,194 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -+ -+ if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ fi ++ done -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -+ -+ - +- - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" - -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" - -- case insck64 in +- +- +- case insck in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" - else - -+ fi -+ -+ -+ -+ fi +- +- case insck in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck $LIBS" +- ;; ++ case $host_alias in ++ *netware*) ++ ++ install_modules="install-modules" + -+ fi - -- case insck64 in -+ -+ case expat in - c|c_r|pthread*) ;; - *) -- LIBS="-linsck64 $LIBS" -+ LIBS="-lexpat $LIBS" - ;; ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)' ++ ;; esac ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" ++ fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" - fi - ;; - esac ++ cat >>Makefile.objects<&6 -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBEXPAT 1 -+EOF -+ -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_WDDX 1 +EOF - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_insck64_insck__getVdate +- unset ac_cv_lib_insck_bsd_tcp - - +- -fi -+ ext_builddir=ext/wddx -+ ext_srcdir=$abs_srcdir/ext/wddx ++ ;; ++ *) ++ ++ install_modules="install-modules" -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_WDDX_SHARED=no - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" +- else +- +- +- case cs in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case cs in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lcs $LIBS" +- ;; ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(TOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tokenizer.so '$ext_builddir'/tokenizer.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TOKENIZER, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(TOKENIZER_SHARED_LIBADD)' ++ ;; + esac + ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix" ++ fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" + +- fi +- ;; +- esac ++ cat >>Makefile.objects<> confdefs.h <>Makefile.objects<&6 +- +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- $SYBASE_CT_LIBS +- " +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" +- else ++ EXT_STATIC="$EXT_STATIC tokenizer" ++ ;; ++ *) + + +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi +- +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- ++ case ext/tokenizer in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac - case $ac_ii in @@ -47393,143 +47899,19 @@ - if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" - else -+ -+ -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in wddx.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -+ shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> Makefile.fragments -- echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 --echo "configure:93453: checking for bsd_tcp in -linsck64" >&5 --ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 +-echo "configure:94346: checking for netg_errstr in -ltcl" >&5 +-ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-linsck64 $LIBS" +-LIBS="-ltcl $LIBS" -cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-EOF +-if { (eval echo configure:94365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" --else ++ ++ ++php_enable_wddx=no ++ ++echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 ++echo "configure:98991: checking whether to enable WDDX support" >&5 ++# Check whether --enable-wddx or --disable-wddx was given. ++if test "${enable_wddx+set}" = set; then ++ enableval="$enable_wddx" ++ PHP_WDDX=$enableval + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* @@ -47670,125 +48044,24 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ done ++ ++ PHP_WDDX=no ++ test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL --fi + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" -+ fi - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ -+ -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=wddx - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ -+ fi + -+ -+ am_i_shared=$PHP_WDDX_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension wddx to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build wddx shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension wddx, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } -+ fi - -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -- else -- - -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck64 $LIBS" -- ;; -- esac -+ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" - -+fi - -- fi -- ;; -- esac - - -- --else -- echo "$ac_t""no" 1>&6 -+php_enable_xml=yes - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck64_bsd_tcp -- -+echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 -+echo "configure:99800: checking whether to enable XML support" >&5 -+# Check whether --enable-xml or --disable-xml was given. -+if test "${enable_xml+set}" = set; then -+ enableval="$enable_xml" -+ PHP_XML=$enableval -+else - -+ PHP_XML=yes -+ test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL + - fi - -- elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then -- -- -- case sybcs in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybcs in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcs $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac +ext_output="yes, shared" +ext_shared=yes -+case $PHP_XML in ++case $PHP_WDDX in +shared,*) -+ PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'` ++ PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` + ;; +shared) -+ PHP_XML=yes ++ PHP_WDDX=yes + ;; +no) + ext_output=no @@ -47799,59 +48072,43 @@ + ext_shared=no + ;; +esac - - -- -- -- case sybct in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybct in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybct $LIBS" -- ;; -- esac - ++ ++ ++ +echo "$ac_t""$ext_output" 1>&6 - -- fi -- ;; -- esac - - -- ++ ++ ++ + +if test -z "$PHP_LIBXML_DIR"; then -- case sybcomn in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" -- else +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- - +php_with_libxml_dir=no + +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:99845: checking libxml2 install dir" >&5 ++echo "configure:99036: checking libxml2 install dir" >&5 +# Check whether --with-libxml-dir or --without-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" + PHP_LIBXML_DIR=$withval +else -+ + +- case tcl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" +- else +- + PHP_LIBXML_DIR=no -- case sybcomn in +- case tcl in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybcomn $LIBS" +- LIBS="-ltcl $LIBS" - ;; - esac @@ -47866,42 +48123,43 @@ - - -- case sybintl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybintl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybintl $LIBS" -- ;; -- esac - +-else +- echo "$ac_t""no" 1>&6 -- fi -- ;; -- esac +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_tcl_netg_errstr +- +- ++ +fi - - ++ ++ +php_with_libexpat_dir=no + -+echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 -+echo "configure:99869: checking libexpat install dir" >&5 ++echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 ++echo "configure:99060: checking libexpat dir for WDDX" >&5 +# Check whether --with-libexpat-dir or --without-libexpat-dir was given. +if test "${with_libexpat_dir+set}" = set; then + withval="$with_libexpat_dir" + PHP_LIBEXPAT_DIR=$withval +else -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" -- echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" +- else +- + PHP_LIBEXPAT_DIR=no +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybtcl $LIBS" +- ;; +- esac + +fi + @@ -47909,32 +48167,26 @@ +ext_output=$PHP_LIBEXPAT_DIR +echo "$ac_t""$ext_output" 1>&6 + -+ -+ -+ -+if test "$PHP_XML" != "no"; then + + +- fi +- ;; +- esac + ++if test "$PHP_WDDX" != "no"; then + + if test "$PHP_LIBEXPAT_DIR" = "no"; then -+ + if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } ++ { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + fi -+ + -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:99898: checking for xml2-config path" >&5 ++echo "configure:99088: checking for xml2-config path" >&5 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -- for ac_i in $ac_stuff; do + for i in $PHP_LIBXML_DIR /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -47942,8 +48194,17 @@ + fi + done + -+fi -+ + fi + +- +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="-L$SYBASE_CT_LIBDIR" +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 + + if test -x "$ac_cv_php_xml2_config_path"; then @@ -47963,55 +48224,55 @@ -pthread) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -pthread" -+ XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" ++ WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" else -@@ -93652,7 +99948,7 @@ fi +@@ -94473,7 +99138,7 @@ fi c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" -+ XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" ++ WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" else -@@ -93687,8 +99983,8 @@ fi +@@ -94508,8 +99173,8 @@ fi if test "$ext_shared" = "yes"; then - LDFLAGS="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" ++ WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" else -@@ -93714,160 +100010,13 @@ fi +@@ -94535,133 +99200,13 @@ fi esac done -- echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 --echo "configure:93719: checking for netg_errstr in -lsybtcl" >&5 --ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 +-echo "configure:94540: checking for insck__getVdate in -linsck" >&5 +-ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" --LIBS="-lsybtcl $LIBS" +-LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:94559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -48030,20 +48291,19 @@ - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- - -- case sybtcl in +- case insck in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" - else -- + - -- case sybtcl in +- case insck in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybtcl $LIBS" +- LIBS="-linsck $LIBS" - ;; - esac - @@ -48053,43 +48313,17 @@ - esac - - -- - -else - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_sybtcl_netg_errstr -- -- -- -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -- else - -- -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- +- unset ac_cv_lib_insck_insck__getVdate - - -fi - -- - - save_old_LDFLAGS=$LDFLAGS - ac_stuff="-L$SYBASE_CT_LIBDIR" @@ -48151,7 +48385,7 @@ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ai_p=$ac_ii -@@ -93880,176 +100029,187 @@ fi +@@ -94674,209 +99219,98 @@ fi fi @@ -48191,54 +48425,164 @@ esac done -- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 --echo "configure:93913: checking for insck__getVdate in -linsck" >&5 --ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 +-echo "configure:94707: checking for bsd_tcp in -linsck" >&5 +-ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:100056: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else +- echo $ac_n "(cached) $ac_c" 1>&6 +-else - ac_save_LIBS="$LIBS" -LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 ++echo "configure:99246: checking whether libxml build works" >&5 ++if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- + +- case insck in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- else +- + + old_LIBS=$LIBS + LIBS=" -+ $XML_SHARED_LIBADD ++ $WDDX_SHARED_LIBADD + $LIBS" + if test "$cross_compiling" = yes; then -+ + +- case insck in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- + LIBS=$old_LIBS -+ -+else + + else +- echo "$ac_t""no" 1>&6 + cat > conftest.$ac_ext <&6 +-echo "configure:94786: checking whether to enable System V IPC support" >&5 +-# Check whether --enable-sysvmsg or --disable-sysvmsg was given. +-if test "${enable_sysvmsg+set}" = set; then +- enableval="$enable_sysvmsg" +- PHP_SYSVMSG=$enableval +-else +- +- PHP_SYSVMSG=no +- test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL +- +-fi +- +- +- +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_SYSVMSG in +-shared,*) +- PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_SYSVMSG=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac +- +- +- +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +-if test "$PHP_SYSVMSG" != "no"; then +- ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 +-echo "configure:94829: checking for sys/msg.h" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < EOF --if { (eval echo configure:93932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:94839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" -+if { (eval echo configure:100083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +- eval "ac_cv_header_$ac_safe=yes" ++if { (eval echo configure:99273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + LIBS=$old_LIBS @@ -48247,92 +48591,233 @@ + + else +- echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" +- eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* --LIBS="$ac_save_LIBS" -- -fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- : +-else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } + rm -fr conftest* - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared ++ + LIBS=$old_LIBS - ++ + echo "$ac_t""no" 1>&6 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } + -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else -+fi + fi +rm -fr conftest* +fi -+ -+ - + + +- cat >> confdefs.h <<\EOF +-#define HAVE_SYSVMSG 1 +-EOF +- - -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac +- ext_builddir=ext/sysvmsg +- ext_srcdir=$abs_srcdir/ext/sysvmsg ++ +fi +- ac_extra= +echo "$ac_t""$php_cv_libxml_build_works" 1>&6 + if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBXML 1 +EOF +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SYSVMSG_SHARED=no +- + fi + -+ xml_extra_sources="compat.c" -+ -+ am_i_shared=$PHP_XML_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension xml to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build xml shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension xml, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ ++ if test "$PHP_XML" = "no"; then ++ + +- case ext/sysvmsg in ++ case ext/xml in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -94891,7 +99325,7 @@ EOF + + + old_IFS=$IFS +- for ac_src in sysvmsg.c; do ++ for ac_src in compat.c; do + + IFS=. + set $ac_src +@@ -94901,10 +99335,10 @@ EOF + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac + + cat >>Makefile.objects<>Makefile.objects<&2; exit 1; } - fi -- ;; -- esac -- ++ fi +else + { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } + -+ fi + fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" +- +- cat >>Makefile.objects<&6 +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix" + fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" +- +- cat >>Makefile.objects<> confdefs.h <&2; exit 1; } -+ fi - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_insck__getVdate - -- --fi + fi ++ ++ + if test "$EXPAT_DIR/include" != "/usr/include"; then + + if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then @@ -48361,145 +48841,153 @@ + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -+ fi + fi - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_SYSVMSG_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) - - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" - fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; +- case ext/sysvmsg in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -- ++ + ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi + + fi -- fi -- ;; -- esac +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo + fi + -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` +- old_IFS=$IFS +- for ac_src in sysvmsg.c; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS + if test "$ext_shared" = "yes"; then -+ XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" ++ WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac +- +- cat >>Makefile.objects</dev/null ; then -- ai_p=$ac_ii ++ + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$EXPAT_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ else ++ + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" - fi ++ fi - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" - else +- EXT_STATIC="$EXT_STATIC sysvmsg" +- ;; +- *) ++ ++ if test "$ext_shared" = "yes"; then ++ WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" ++ else -@@ -94071,554 +100231,496 @@ fi - - fi +- case ext/sysvmsg in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +- +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- +- +- old_IFS=$IFS +- for ac_src in sysvmsg.c; do ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ fi -- ;; -- esac +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + +- cat >>Makefile.objects<&6 --echo "configure:94080: checking for bsd_tcp in -linsck" >&5 --ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then + + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then @@ -48512,690 +49000,397 @@ + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ fi - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 + fi ++ + + -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -+ + +- BUILD_DIR="$BUILD_DIR $ext_builddir" + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + +- +- +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=sysvmsg + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +- + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" - -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else -- -+ fi -+ -+ -+ -+ fi -+ -+ fi - -- case insck in + -+ case expat in - c|c_r|pthread*) ;; - *) -- LIBS="-linsck $LIBS" -+ LIBS="-lexpat $LIBS" - ;; - esac - - -- fi -- ;; -- esac - - -- --else -- echo "$ac_t""no" 1>&6 -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBEXPAT 1 -+EOF -+ -+ fi + fi -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_bsd_tcp -- - -fi -+ ext_builddir=ext/xml -+ ext_srcdir=$abs_srcdir/ext/xml - -- else -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_XML_SHARED=no - - -- case cs in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case cs in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lcs $LIBS" -- ;; -+ case ext/xml in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ -+ - - -- fi -- ;; -- esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - - -- -+ old_IFS=$IFS -+ for ac_src in xml.c $xml_extra_sources; do - -- case ct in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -- else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- -- case ct in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lct $LIBS" -- ;; -- esac -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<&6 -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+EOF +- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -+ ;; -+ *) -+ -+ install_modules="install-modules" -+ -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(XML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xml.so '$ext_builddir'/xml.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XML, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(XML_SHARED_LIBADD)' -+ ;; - esac +-php_enable_sysvsem=no ++ ++ fi -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xml.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/xml.$suffix" +-echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 +-echo "configure:95166: checking whether to enable System V semaphore support" >&5 +-# Check whether --enable-sysvsem or --disable-sysvsem was given. +-if test "${enable_sysvsem+set}" = set; then +- enableval="$enable_sysvsem" +- PHP_SYSVSEM=$enableval +-else + fi + +- PHP_SYSVSEM=no +- test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL +- +-fi +- + -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" -+ -+ cat >>Makefile.objects<> confdefs.h <&6 + ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBEXPAT 1 +EOF - fi -- ;; + fi -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_XML_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) -+ + ++ cat >> confdefs.h <<\EOF ++#define HAVE_WDDX 1 ++EOF + +-if test "$PHP_SYSVSEM" != "no"; then +- +- ext_builddir=ext/sysvsem +- ext_srcdir=$abs_srcdir/ext/sysvsem + -+ case ext/xml in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ ext_builddir=ext/wddx ++ ext_srcdir=$abs_srcdir/ext/wddx + + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SYSVSEM_SHARED=no ++ PHP_WDDX_SHARED=no + + +- case ext/sysvsem in ++ case ext/wddx in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -+ -+ + + +@@ -95231,7 +99543,7 @@ if test "$PHP_SYSVSEM" != "no"; then -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -+ -+ old_IFS=$IFS -+ for ac_src in xml.c $xml_extra_sources; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<&6 --echo "configure:94346: checking for netg_errstr in -ltcl" >&5 --ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-ltcl $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ done +@@ -95347,31 +99659,31 @@ EOF + case $host_alias in + *aix*) + suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(SYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvsem.so '$ext_builddir'/sysvsem.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/wddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(WDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/wddx.so '$ext_builddir'/wddx.so' + ;; + *netware*) + suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSEM, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(WDDX, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(SYSVSEM_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(WDDX_SHARED_LIBADD)' + ;; + esac --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xml" -+ fi + if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/wddx.$suffix" + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/wddx.$suffix" + fi -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" + + cat >>Makefile.objects<> confdefs.h <&6 -+ PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD" +- case ext/sysvsem in ++ case ext/wddx in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -95455,7 +99767,7 @@ EOF -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_tcl_netg_errstr -- -+ -+ -+ for header_file in ext/xml/; do - + + old_IFS=$IFS +- for ac_src in sysvsem.c; do ++ for ac_src in wddx.c; do -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -- else -+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` + IFS=. + set $ac_src +@@ -95480,7 +99792,7 @@ EOF + + ;; + esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" + fi + + +@@ -95489,128 +99801,550 @@ EOF + + + if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=sysvsem ++ PHP_PECL_EXTENSION=wddx + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + + fi + +- cat >> confdefs.h <<\EOF +-#define HAVE_SYSVSEM 1 +-EOF + -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - ++ am_i_shared=$PHP_WDDX_SHARED ++ is_it_shared=$PHP_LIBXML_SHARED ++ is_it_enabled=$PHP_LIBXML ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension wddx to build statically, but it ++depends on extension libxml, which you've configured to build shared. ++You either need to build wddx shared or build libxml statically for the ++build to be successful. ++" 1>&2; exit 1; } + fi -+ -+ done - -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl $LIBS" -- ;; -- esac ++ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension wddx, which depends on extension libxml, ++but you've either not enabled libxml, or have disabled it. ++" 1>&2; exit 1; } ++ fi ++ ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -+ cat >> confdefs.h <<\EOF -+#define HAVE_XML 1 -+EOF -+ +- echo $ac_n "checking for union semun""... $ac_c" 1>&6 +-echo "configure:95504: checking for union semun" >&5 +-if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then +fi - -- fi -- ;; -- esac - - -- -+php_enable_xmlreader=yes + -+echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 -+echo "configure:100619: checking whether to enable XMLReader support" >&5 -+# Check whether --enable-xmlreader or --disable-xmlreader was given. -+if test "${enable_xmlreader+set}" = set; then -+ enableval="$enable_xmlreader" -+ PHP_XMLREADER=$enableval ++ ++ ++php_enable_xml=yes ++ ++echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 ++echo "configure:99840: checking whether to enable XML support" >&5 ++# Check whether --enable-xml or --disable-xml was given. ++if test "${enable_xml+set}" = set; then ++ enableval="$enable_xml" ++ PHP_XML=$enableval +else - -+ PHP_XMLREADER=yes -+ test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL ++ ++ PHP_XML=yes ++ test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL ++ ++fi ++ ++ + - fi - -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac - +ext_output="yes, shared" +ext_shared=yes -+case $PHP_XMLREADER in ++case $PHP_XML in +shared,*) -+ PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` ++ PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'` + ;; +shared) -+ PHP_XMLREADER=yes ++ PHP_XML=yes + ;; +no) + ext_output=no @@ -49206,153 +49401,77 @@ + ext_shared=no + ;; +esac - -- fi -- ;; -- esac - - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi ++ ++ ++ +echo "$ac_t""$ext_output" 1>&6 - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- ++ + + + +if test -z "$PHP_LIBXML_DIR"; then - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ +php_with_libxml_dir=no + +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:100664: checking libxml2 install dir" >&5 ++echo "configure:99885: checking libxml2 install dir" >&5 +# Check whether --with-libxml-dir or --without-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" + PHP_LIBXML_DIR=$withval +else - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" ++ + PHP_LIBXML_DIR=no - -- fi - ++ ++ +fi - -- fi -- -- fi - -- ;; -- esac -- done ++ ++ +ext_output=$PHP_LIBXML_DIR +echo "$ac_t""$ext_output" 1>&6 - -- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 --echo "configure:94540: checking for insck__getVdate in -linsck" >&5 --ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac -- - -- fi -- ;; -- esac -+if test "$PHP_XMLREADER" != "no"; then - -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi - - ++ ++ ++ ++fi ++ ++ ++php_with_libexpat_dir=no ++ ++echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 ++echo "configure:99909: checking libexpat install dir" >&5 ++# Check whether --with-libexpat-dir or --without-libexpat-dir was given. ++if test "${with_libexpat_dir+set}" = set; then ++ withval="$with_libexpat_dir" ++ PHP_LIBEXPAT_DIR=$withval ++else ++ ++ PHP_LIBEXPAT_DIR=no ++ ++ ++fi ++ ++ ++ext_output=$PHP_LIBEXPAT_DIR ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++if test "$PHP_XML" != "no"; then ++ ++ if test "$PHP_LIBEXPAT_DIR" = "no"; then ++ ++ if test "$PHP_LIBXML" = "no"; then ++ { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } ++ fi ++ ++ +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:100692: checking for xml2-config path" >&5 ++echo "configure:99938: checking for xml2-config path" >&5 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 - else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_insck__getVdate -- - ++else ++ + for i in $PHP_LIBXML_DIR /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -49360,16 +49479,8 @@ + fi + done + - fi - -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do ++fi ++ +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 + + if test -x "$ac_cv_php_xml2_config_path"; then @@ -49385,158 +49496,101 @@ + LIBXML_INCS=`$XML2_CONFIG --cflags` + + for ac_i in $LIBXML_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" - else - - -@@ -94640,7 +100742,7 @@ fi - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" - else - - -@@ -94675,8 +100777,8 @@ fi - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" - else - - -@@ -94702,181 +100804,128 @@ fi - esac - done - -- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 --echo "configure:94707: checking for bsd_tcp in -linsck" >&5 --ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else - -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_bsd_tcp -+ for ac_i in $LIBXML_INCS; do + case $ac_i in -+ -I*) ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi ++ ++ fi ++ ;; ++ -l*) + ac_ii=`echo $ac_i|cut -c 3-` + -+ if test "$ac_ii" != "/usr/include"; then - -- --fi -- -- fi --fi -- -- -- --php_enable_sysvmsg=no -- --echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 --echo "configure:94786: checking whether to enable System V IPC support" >&5 --# Check whether --enable-sysvmsg or --disable-sysvmsg was given. --if test "${enable_sysvmsg+set}" = set; then -- enableval="$enable_sysvmsg" -- PHP_SYSVMSG=$enableval --else -- -- PHP_SYSVMSG=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_SYSVMSG in --shared,*) -- PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SYSVMSG=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ ;; ++ esac ++ done ++ ++ ++ for ac_i in $LIBXML_INCS; do ++ case $ac_i in ++ -I*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/include"; then ++ + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else @@ -49546,8 +49600,7 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi - --echo "$ac_t""$ext_output" 1>&6 ++ + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` @@ -49563,21 +49616,16 @@ + fi + + fi - ++ + fi - ++ + ;; + esac + done - - --if test "$PHP_SYSVMSG" != "no"; then -- ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 --echo "configure:94829: checking for sys/msg.h" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ ++ + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:100850: checking whether libxml build works" >&5 ++echo "configure:100096: checking whether libxml build works" >&5 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -49585,7 +49633,7 @@ + + old_LIBS=$LIBS + LIBS=" -+ $XMLREADER_SHARED_LIBADD ++ $XML_SHARED_LIBADD + $LIBS" + if test "$cross_compiling" = yes; then + @@ -49593,11 +49641,17 @@ + +else cat > conftest.$ac_ext < -+ + +-#include +-#include +-#include +- +-int main() { +-union semun x; +-; return 0; } + + char xmlInitParser(); + int main() { @@ -49606,26 +49660,22 @@ + } + EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:94839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then +-if { (eval echo configure:95520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+if { (eval echo configure:100877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:100123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + LIBS=$old_LIBS + + php_cv_libxml_build_works=yes + -+ + +- php_cv_semun=yes +- else -- echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" + rm -fr conftest* + + LIBS=$old_LIBS @@ -49633,592 +49683,755 @@ + echo "$ac_t""no" 1>&6 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } + -+ + +- php_cv_semun=no +- fi -rm -f conftest* +- +rm -fr conftest* fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 --{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } -- -+ -+ -+ - fi +-echo "$ac_t""$php_cv_semun" 1>&6 +- if test "$php_cv_semun" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_SEMUN 1 +-EOF + +- else +- cat >> confdefs.h <<\EOF +-#define HAVE_SEMUN 0 ++ ++fi ++ +echo "$ac_t""$php_cv_libxml_build_works" 1>&6 + if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBXML 1 -+EOF + EOF -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVMSG 1 +- fi +-fi ++ fi ++ ++ xml_extra_sources="compat.c" ++ ++ am_i_shared=$PHP_XML_SHARED ++ is_it_shared=$PHP_LIBXML_SHARED ++ is_it_enabled=$PHP_LIBXML ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension xml to build statically, but it ++depends on extension libxml, which you've configured to build shared. ++You either need to build xml shared or build libxml statically for the ++build to be successful. ++" 1>&2; exit 1; } ++ fi ++ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension xml, which depends on extension libxml, ++but you've either not enabled libxml, or have disabled it. ++" 1>&2; exit 1; } ++ fi ++ ++ ++ else ++ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } ++ fi ++else ++ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } ++ ++ fi + ++ fi ++ ++ if test "$PHP_LIBEXPAT_DIR" != "no"; then ++ for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do ++ if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then ++ EXPAT_DIR=$i ++ break ++ fi ++ done + ++ if test -z "$EXPAT_DIR"; then ++ { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } ++ fi + +-php_enable_sysvshm=no ++ ++ if test "$EXPAT_DIR/include" != "/usr/include"; then ++ ++ if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then ++ ai_p=$EXPAT_DIR/include ++ else ++ ++ ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" ++ fi + +-echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 +-echo "configure:95556: checking whether to enable System V shared memory support" >&5 +-# Check whether --enable-sysvshm or --disable-sysvshm was given. +-if test "${enable_sysvshm+set}" = set; then +- enableval="$enable_sysvshm" +- PHP_SYSVSHM=$enableval +-else ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi ++ ++ fi ++ ++ ++ ++ if test "$ext_shared" = "yes"; then ++ XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" ++ if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then ++ ++ if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$EXPAT_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ + fi ++ ++ fi ++ ++ fi ++ else ++ ++ ++ if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then ++ ++ if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$EXPAT_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" ++ fi ++ ++ + ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + +- PHP_SYSVSHM=no +- test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL +- +-fi +- ++ fi + + +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_SYSVSHM in +-shared,*) +- PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_SYSVSHM=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac ++ ++ fi + ++ fi ++ ++ ++ case expat in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lexpat $LIBS" ++ ;; ++ esac + + +-echo "$ac_t""$ext_output" 1>&6 + + ++ fi + + +-if test "$PHP_SYSVSHM" != "no"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_SYSVSHM 1 + cat >> confdefs.h <<\EOF -+#define HAVE_XMLREADER 1 ++#define HAVE_LIBEXPAT 1 EOF -- -- ext_builddir=ext/sysvmsg -- ext_srcdir=$abs_srcdir/ext/sysvmsg -+ -+ ext_builddir=ext/xmlreader -+ ext_srcdir=$abs_srcdir/ext/xmlreader ++ fi ++ + +- ext_builddir=ext/sysvshm +- ext_srcdir=$abs_srcdir/ext/sysvshm ++ ext_builddir=ext/xml ++ ext_srcdir=$abs_srcdir/ext/xml ac_extra= if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVMSG_SHARED=no -+ PHP_XMLREADER_SHARED=no +- PHP_SYSVSHM_SHARED=no ++ PHP_XML_SHARED=no -- case ext/sysvmsg in -+ case ext/xmlreader in +- case ext/sysvshm in ++ case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -94891,7 +100940,7 @@ EOF +@@ -95625,7 +100359,7 @@ EOF old_IFS=$IFS -- for ac_src in sysvmsg.c; do -+ for ac_src in php_xmlreader.c; do +- for ac_src in sysvshm.c; do ++ for ac_src in xml.c $xml_extra_sources; do IFS=. set $ac_src -@@ -94914,18 +100963,18 @@ EOF +@@ -95648,18 +100382,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC sysvmsg" -+ EXT_STATIC="$EXT_STATIC xmlreader" +- EXT_STATIC="$EXT_STATIC sysvshm" ++ EXT_STATIC="$EXT_STATIC xml" if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" +- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC xml" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYSVMSG_SHARED=yes -+ PHP_XMLREADER_SHARED=yes +- PHP_SYSVSHM_SHARED=yes ++ PHP_XML_SHARED=yes -- case ext/sysvmsg in -+ case ext/xmlreader in +- case ext/sysvshm in ++ case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -94940,14 +100989,14 @@ EOF +@@ -95674,14 +100408,14 @@ EOF old_IFS=$IFS -- for ac_src in sysvmsg.c; do -+ for ac_src in php_xmlreader.c; do +- for ac_src in sysvshm.c; do ++ for ac_src in xml.c $xml_extra_sources; do IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS -- shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo" -+ shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" +- shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" ++ shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -94970,31 +101019,31 @@ EOF +@@ -95704,31 +100438,31 @@ EOF case $host_alias in *aix*) suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvmsg.so '$ext_builddir'/phpsysvmsg.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvshm.so '$ext_builddir'/phpsysvshm.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so' ;; *netware*) suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' ;; *) suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension xmlreader, which depends on extension dom, -+but you've either not enabled dom, or have disabled it. -+" 1>&2; exit 1; } -+ fi + ++ PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD" ++ ++ ++ ++ for header_file in ext/xml/; do ++ ++ ++ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INSTALLHEADERS$unique=set" + -+ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" ++ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" ++ ++ fi + ++ done + -+ else -+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -+ -+ fi ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_XML 1 ++EOF + fi -+# Local macros for automake & autoconf --php_enable_sysvsem=no +-php_with_tidy=no ++php_enable_xmlreader=yes --echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 --echo "configure:95166: checking whether to enable System V semaphore support" >&5 --# Check whether --enable-sysvsem or --disable-sysvsem was given. --if test "${enable_sysvsem+set}" = set; then -- enableval="$enable_sysvsem" -- PHP_SYSVSEM=$enableval -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+php_with_xmlrpc=no -+ -+echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 -+echo "configure:101259: checking for XMLRPC-EPI support" >&5 -+# Check whether --with-xmlrpc or --without-xmlrpc was given. -+if test "${with_xmlrpc+set}" = set; then -+ withval="$with_xmlrpc" -+ PHP_XMLRPC=$withval +-echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 +-echo "configure:95900: checking for TIDY support" >&5 +-# Check whether --with-tidy or --without-tidy was given. +-if test "${with_tidy+set}" = set; then +- withval="$with_tidy" +- PHP_TIDY=$withval ++echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 ++echo "configure:100659: checking whether to enable XMLReader support" >&5 ++# Check whether --enable-xmlreader or --disable-xmlreader was given. ++if test "${enable_xmlreader+set}" = set; then ++ enableval="$enable_xmlreader" ++ PHP_XMLREADER=$enableval else -- PHP_SYSVSEM=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL -+ PHP_XMLRPC=no -+ test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL +- PHP_TIDY=no +- test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL ++ PHP_XMLREADER=yes ++ test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL fi -@@ -95178,12 +101271,12 @@ fi +@@ -95912,12 +100671,12 @@ fi ext_output="yes, shared" ext_shared=yes --case $PHP_SYSVSEM in -+case $PHP_XMLRPC in +-case $PHP_TIDY in ++case $PHP_XMLREADER in shared,*) -- PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'` -+ PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` +- PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'` ++ PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` ;; shared) -- PHP_SYSVSEM=yes -+ PHP_XMLRPC=yes +- PHP_TIDY=yes ++ PHP_XMLREADER=yes ;; no) ext_output=no -@@ -95202,245 +101295,341 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -95936,171 +100695,72 @@ echo "$ac_t""$ext_output" 1>&6 --if test "$PHP_SYSVSEM" != "no"; then -- -- ext_builddir=ext/sysvsem -- ext_srcdir=$abs_srcdir/ext/sysvsem +-if test "$PHP_TIDY" != "no"; then - -- ac_extra= +- if test "$PHP_TIDY" != "yes"; then +- TIDY_SEARCH_DIRS=$PHP_TIDY +- else +- TIDY_SEARCH_DIRS="/usr/local /usr" +- fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVSEM_SHARED=no +- for i in $TIDY_SEARCH_DIRS; do +- if test -f $i/include/tidy/tidy.h; then +- TIDY_DIR=$i +- TIDY_INCDIR=$i/include/tidy +- elif test -f $i/include/tidy.h; then +- TIDY_DIR=$i +- TIDY_INCDIR=$i/include +- fi +- done +- +- if test -z "$TIDY_DIR"; then +- { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } +- fi +- +- TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR +- +- +- +- if test "$ext_shared" = "yes"; then +- TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" +- if test -n "$TIDY_LIBDIR"; then +- +- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then +- +- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$TIDY_LIBDIR +- else +- +- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" +- fi +- +- +- if test "$ext_shared" = "yes"; then +- TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" - +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +if test -z "$PHP_LIBXML_DIR"; then -- case ext/sysvsem in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac +- fi +- +- +- fi +- +- fi +- +- fi +- else +- +- +- if test -n "$TIDY_LIBDIR"; then +- +- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then +- +- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$TIDY_LIBDIR +- else +- +- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" +- fi +php_with_libxml_dir=no -+ + +- +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:101304: checking libxml2 install dir" >&5 ++echo "configure:100704: checking libxml2 install dir" >&5 +# Check whether --with-libxml-dir or --without-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" + PHP_LIBXML_DIR=$withval +else +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" + PHP_LIBXML_DIR=no +- fi +- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo +- +- fi +fi - -- old_IFS=$IFS -- for ac_src in sysvsem.c; do +- fi - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- +- case tidy in +- c|c_r|pthread*) ;; +- *) +- LIBS="-ltidy $LIBS" +- ;; +- esac + +ext_output=$PHP_LIBXML_DIR +echo "$ac_t""$ext_output" 1>&6 -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- cat >>Makefile.objects<&6 -+echo "configure:101328: checking libexpat dir for XMLRPC-EPI" >&5 -+# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -+if test "${with_libexpat_dir+set}" = set; then -+ withval="$with_libexpat_dir" -+ PHP_LIBEXPAT_DIR=$withval -+else - -+ PHP_LIBEXPAT_DIR=no - - -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -+fi ++if test "$PHP_XMLREADER" != "no"; then +- +- if test "$TIDY_INCDIR" != "/usr/include"; then +- +- if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then +- ai_p=$TIDY_INCDIR +- else +- +- ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" ++ if test "$PHP_LIBXML" = "no"; then ++ { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + fi -- old_IFS=$IFS -- for ac_src in sysvsem.c; do -+ext_output=$PHP_LIBEXPAT_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_with_iconv_dir=no -+ -+echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 -+echo "configure:101351: checking iconv dir for XMLRPC-EPI" >&5 -+# Check whether --with-iconv-dir or --without-iconv-dir was given. -+if test "${with_iconv_dir+set}" = set; then -+ withval="$with_iconv_dir" -+ PHP_ICONV_DIR=$withval -+else -+ -+ PHP_ICONV_DIR=no +- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+fi - -- cat >>Makefile.objects<&6 -+ -+ -+ -+ -+if test "$PHP_XMLRPC" != "no"; then -+ -+ -+ am_i_shared=$PHP_XMLRPC_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension xmlrpc to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build xmlrpc shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension xmlrpc, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_XMLRPC 1 - EOF -+ -+ -+ if test "$PHP_LIBEXPAT_DIR" = "no"; then -+ -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi -+ -+ +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:101407: checking for xml2-config path" >&5 ++echo "configure:100732: checking for xml2-config path" >&5 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ + +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi + for i in $PHP_LIBXML_DIR /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" + break + fi - done ++ done -- case $host_alias in -- *netware*) -- -- install_modules="install-modules" +- fi +fi -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)' -- ;; +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ + +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="" +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do + if test -x "$ac_cv_php_xml2_config_path"; then + XML2_CONFIG="$ac_cv_php_xml2_config_path" + libxml_full_version=`$XML2_CONFIG --version` @@ -50232,125 +50445,42 @@ + LIBXML_INCS=`$XML2_CONFIG --cflags` + + for ac_i in $LIBXML_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; - esac - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix" -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - -- cat >>Makefile.objects<&6 +-echo "configure:96189: checking for tidyOptGetDoc in -ltidy" >&5 +-ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + + for ac_i in $LIBXML_INCS; do + case $ac_i in @@ -50361,20 +50491,14 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix" ++ else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - -- cat >>Makefile.objects<> confdefs.h <&6 -+echo "configure:101565: checking whether libxml build works" >&5 ++echo "configure:100890: checking whether libxml build works" >&5 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-ltidy $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" + + + old_LIBS=$LIBS + LIBS=" -+ $XMLRPC_SHARED_LIBADD ++ $XMLREADER_SHARED_LIBADD + $LIBS" + if test "$cross_compiling" = yes; then + + LIBS=$old_LIBS + -+else + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + cat > conftest.$ac_ext <&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared + +- cat >> confdefs.h <<\EOF +-#define HAVE_TIDYOPTGETDOC 1 + char xmlInitParser(); + int main() { + xmlInitParser(); + return 0; + } + -+EOF -+if { (eval echo configure:101592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + EOF +- ++if { (eval echo configure:100917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then -+ + + LIBS=$old_LIBS + + php_cv_libxml_build_works=yes - ++ -- case ext/sysvsem in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+else + else +- echo "$ac_t""no" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_tidy_tidyOptGetDoc + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* - ++ + LIBS=$old_LIBS -+ + + echo "$ac_t""no" 1>&6 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } + -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+fi + fi +rm -fr conftest* +fi -- old_IFS=$IFS -- for ac_src in sysvsem.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac ++ +fi -- cat >>Makefile.objects<&6 + if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBXML 1 - EOF -- done -- - -- EXT_STATIC="$EXT_STATIC sysvsem" -- ;; -- *) ++EOF ++ + fi + -+ if test "$PHP_XML" = "no"; then - ++ cat >> confdefs.h <<\EOF ++#define HAVE_XMLREADER 1 ++EOF ++ ++ ++ ext_builddir=ext/xmlreader ++ ext_srcdir=$abs_srcdir/ext/xmlreader + + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_TIDY_SHARED=no ++ PHP_XMLREADER_SHARED=no + -- case ext/sysvsem in -+ case ext/xml in +- case ext/tidy in ++ case ext/xmlreader in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -95455,20 +101644,20 @@ EOF +@@ -96269,7 +100980,7 @@ fi old_IFS=$IFS -- for ac_src in sysvsem.c; do -+ for ac_src in compat.c; do +- for ac_src in tidy.c; do ++ for ac_src in php_xmlreader.c; do + + IFS=. + set $ac_src +@@ -96292,18 +101003,18 @@ EOF + done + + +- EXT_STATIC="$EXT_STATIC tidy" ++ EXT_STATIC="$EXT_STATIC xmlreader" + if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" + fi + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_TIDY_SHARED=yes ++ PHP_XMLREADER_SHARED=yes + +- case ext/tidy in ++ case ext/xmlreader in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -96318,14 +101029,14 @@ EOF + + + old_IFS=$IFS +- for ac_src in tidy.c; do ++ for ac_src in php_xmlreader.c; do IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" ++ shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +@@ -96348,31 +101059,31 @@ EOF + case $host_alias in + *aix*) + suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so' + ;; + *netware*) + suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)' + ;; + esac - cat >>Makefile.objects<>Makefile.objects<&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- + EOF +@@ -96385,31 +101096,31 @@ EOF + case $host_alias in + *aix*) + suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tidy.so '$ext_builddir'/tidy.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(XMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlreader.so '$ext_builddir'/xmlreader.so' + ;; + *netware*) + suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLREADER, 3)_SHARED_LIBADD)' + ;; + *) + suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(XMLREADER_SHARED_LIBADD)' + ;; + esac + + if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlreader.$suffix" + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix" fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVSEM 1 -+ else -+ testval=no -+ for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do -+ if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBEXPAT 1 + cat >>Makefile.objects<> confdefs.h <&6 --echo "configure:95504: checking for union semun" >&5 --if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --#include --#include -- --int main() { --union semun x; --; return 0; } --EOF --if { (eval echo configure:95520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" -+ if test -n "$i/$PHP_LIBDIR"; then -+ -+ if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$i/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -+ else -+ + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_TIDY_SHARED=no ++ PHP_XMLREADER_SHARED=no + case "$PHP_SAPI" in + cgi|embed) + -- php_cv_semun=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* +- case ext/tidy in ++ case ext/xmlreader in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -- php_cv_semun=no -- --fi --rm -f conftest* -- --fi -- --echo "$ac_t""$php_cv_semun" 1>&6 -- if test "$php_cv_semun" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_SEMUN 1 --EOF -- -- else -- cat >> confdefs.h <<\EOF --#define HAVE_SEMUN 0 --EOF -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi + +@@ -96447,7 +101158,7 @@ EOF -- fi --fi -+ fi -+ -+ fi + old_IFS=$IFS +- for ac_src in tidy.c; do ++ for ac_src in php_xmlreader.c; do + + IFS=. + set $ac_src +@@ -96470,15 +101181,15 @@ EOF + done -+ fi -+ else -+ --php_enable_sysvshm=no -+ if test -n "$i/$PHP_LIBDIR"; then -+ -+ if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$i/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" -+ fi +- EXT_STATIC="$EXT_STATIC tidy" ++ EXT_STATIC="$EXT_STATIC xmlreader" + ;; + *) + + +- case ext/tidy in ++ case ext/xmlreader in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -96493,7 +101204,7 @@ EOF --echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 --echo "configure:95556: checking whether to enable System V shared memory support" >&5 --# Check whether --enable-sysvshm or --disable-sysvshm was given. --if test "${enable_sysvshm+set}" = set; then -- enableval="$enable_sysvshm" -- PHP_SYSVSHM=$enableval --else -+ -+ + + old_IFS=$IFS +- for ac_src in tidy.c; do ++ for ac_src in php_xmlreader.c; do + + IFS=. + set $ac_src +@@ -96518,7 +101229,7 @@ EOF + + ;; + esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" + fi -- PHP_SYSVSHM=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi + +@@ -96527,36 +101238,72 @@ EOF --fi + + if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=tidy ++ PHP_PECL_EXTENSION=xmlreader + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + + fi + ++ am_i_shared=$PHP_XMLREADER_SHARED ++ is_it_shared=$PHP_DOM_SHARED ++ is_it_enabled=$PHP_DOM ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension xmlreader to build statically, but it ++depends on extension dom, which you've configured to build shared. ++You either need to build xmlreader shared or build dom statically for the ++build to be successful. ++" 1>&2; exit 1; } + fi - ++ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension xmlreader, which depends on extension dom, ++but you've either not enabled dom, or have disabled it. ++" 1>&2; exit 1; } + fi + +- PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" + +- cat >> confdefs.h <<\EOF +-#define HAVE_TIDY 1 +-EOF + ++ else ++ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } ++ fi ++else ++ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } + -+ case expat in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lexpat $LIBS" -+ ;; -+ esac ++ fi --ext_output="yes, shared" --ext_shared=yes --case $PHP_SYSVSHM in --shared,*) -- PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SYSVSHM=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac + fi ++# Local macros for automake & autoconf --echo "$ac_t""$ext_output" 1>&6 -+ fi +-php_enable_tokenizer=yes -+ -+ if test "$i/include" != "/usr/include"; then -+ -+ if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then -+ ai_p=$i/include -+ else -+ -+ ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$i/include\"`" -+ fi +-echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 +-echo "configure:96552: checking whether to enable tokenizer support" >&5 +-# Check whether --enable-tokenizer or --disable-tokenizer was given. +-if test "${enable_tokenizer+set}" = set; then +- enableval="$enable_tokenizer" +- PHP_TOKENIZER=$enableval ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++php_with_xmlrpc=no ++ ++echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 ++echo "configure:101299: checking for XMLRPC-EPI support" >&5 ++# Check whether --with-xmlrpc or --without-xmlrpc was given. ++if test "${with_xmlrpc+set}" = set; then ++ withval="$with_xmlrpc" ++ PHP_XMLRPC=$withval + else + +- PHP_TOKENIZER=yes +- test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL ++ PHP_XMLRPC=no ++ test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi + fi + +@@ -96564,12 +101311,12 @@ fi + + ext_output="yes, shared" + ext_shared=yes +-case $PHP_TOKENIZER in ++case $PHP_XMLRPC in + shared,*) +- PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'` ++ PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` + ;; + shared) +- PHP_TOKENIZER=yes ++ PHP_XMLRPC=yes + ;; + no) + ext_output=no +@@ -96588,199 +101335,341 @@ echo "$ac_t""$ext_output" 1>&6 --if test "$PHP_SYSVSHM" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVSHM 1 --EOF -+ fi -- -- ext_builddir=ext/sysvshm -- ext_srcdir=$abs_srcdir/ext/sysvshm -+ testval=yes -+ break -+ fi -+ done +-if test "$PHP_TOKENIZER" != "no"; then ++if test -z "$PHP_LIBXML_DIR"; then + +- ext_builddir=ext/tokenizer +- ext_srcdir=$abs_srcdir/ext/tokenizer +- - ac_extra= -+ if test "$testval" = "no"; then -+ { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } -+ fi -+ fi ++php_with_libxml_dir=no - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVSHM_SHARED=no +- PHP_TOKENIZER_SHARED=no - - -- case ext/sysvshm in +- case ext/tokenizer in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then -+ -+ if test "$PHP_ICONV_DIR" != "no"; then -+ PHP_ICONV=$PHP_ICONV_DIR -+ fi ++echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 ++echo "configure:101344: checking libxml2 install dir" >&5 ++# Check whether --with-libxml-dir or --without-libxml-dir was given. ++if test "${with_libxml_dir+set}" = set; then ++ withval="$with_libxml_dir" ++ PHP_LIBXML_DIR=$withval ++else -+ if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then -+ PHP_ICONV=yes -+ fi ++ PHP_LIBXML_DIR=no -+ -+ found_iconv=no -+ unset ICONV_DIR - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre @@ -50840,21 +51002,11 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -+ # Create the directories for a VPATH build: -+ $php_shtool mkdir -p ext/iconv ++fi -+ echo > ext/iconv/php_have_bsd_iconv.h -+ echo > ext/iconv/php_have_ibm_iconv.h -+ echo > ext/iconv/php_have_glibc_iconv.h -+ echo > ext/iconv/php_have_libiconv.h -+ echo > ext/iconv/php_have_iconv.h -+ echo > ext/iconv/php_php_iconv_impl.h -+ echo > ext/iconv/php_iconv_aliased_libiconv.h -+ echo > ext/iconv/php_php_iconv_h_path.h -+ echo > ext/iconv/php_iconv_supports_errno.h - old_IFS=$IFS -- for ac_src in sysvshm.c; do +- for ac_src in tokenizer.c tokenizer_data.c; do - - IFS=. - set $ac_src @@ -50862,22 +51014,8 @@ - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ if test "$PHP_ICONV" = "yes"; then -+ echo $ac_n "checking for iconv""... $ac_c" 1>&6 -+echo "configure:101861: checking for iconv" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char iconv(); ++ext_output=$PHP_LIBXML_DIR ++echo "$ac_t""$ext_output" 1>&6 - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -50885,57 +51023,41 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_iconv) || defined (__stub___iconv) -+choke me -+#else -+iconv(); -+#endif - cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_iconv=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_iconv=no" -+fi -+rm -f conftest* + +fi -- EXT_STATIC="$EXT_STATIC sysvshm" +- EXT_STATIC="$EXT_STATIC tokenizer" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" +- EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYSVSHM_SHARED=yes +- PHP_TOKENIZER_SHARED=yes - -- case ext/sysvshm in +- case ext/tokenizer in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -- -+if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -+ found_iconv=yes -+ ++ ++php_with_libexpat_dir=no ++ ++echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 ++echo "configure:101368: checking libexpat dir for XMLRPC-EPI" >&5 ++# Check whether --with-libexpat-dir or --without-libexpat-dir was given. ++if test "${with_libexpat_dir+set}" = set; then ++ withval="$with_libexpat_dir" ++ PHP_LIBEXPAT_DIR=$withval +else -+ echo "$ac_t""no" 1>&6 + ++ PHP_LIBEXPAT_DIR=no + - b_c_pre=$shared_c_pre - b_cxx_pre=$shared_cxx_pre @@ -50944,33 +51066,36 @@ - b_c_post=$shared_c_post - b_cxx_post=$shared_cxx_post - b_lo=$shared_lo -- -+ echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -+echo "configure:101910: checking for libiconv" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char libiconv(); ++fi + - old_IFS=$IFS -- for ac_src in sysvshm.c; do -- +- for ac_src in tokenizer.c tokenizer_data.c; do ++ext_output=$PHP_LIBEXPAT_DIR ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++ ++php_with_iconv_dir=no ++ ++echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 ++echo "configure:101391: checking iconv dir for XMLRPC-EPI" >&5 ++# Check whether --with-iconv-dir or --without-iconv-dir was given. ++if test "${with_iconv_dir+set}" = set; then ++ withval="$with_iconv_dir" ++ PHP_ICONV_DIR=$withval ++else ++ ++ PHP_ICONV_DIR=no + - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" -+int main() { +- shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -50978,173 +51103,105 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_libiconv) || defined (__stub___libiconv) -+choke me -+#else -+libiconv(); -+#endif ++fi - cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_libiconv=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_libiconv=no" -+fi -+rm -f conftest* -+fi - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" -- fi -+if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" -- -- cat >>Makefile.objects< ext/iconv/php_have_libiconv.h - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBICONV 1 ++ ++ext_output=$PHP_ICONV_DIR ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++if test "$PHP_XMLRPC" != "no"; then ++ ++ ++ am_i_shared=$PHP_XMLRPC_SHARED ++ is_it_shared=$PHP_LIBXML_SHARED ++ is_it_enabled=$PHP_LIBXML ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension xmlrpc to build statically, but it ++depends on extension libxml, which you've configured to build shared. ++You either need to build xmlrpc shared or build libxml statically for the ++build to be successful. ++" 1>&2; exit 1; } ++ fi ++ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension xmlrpc, which depends on extension libxml, ++but you've either not enabled libxml, or have disabled it. ++" 1>&2; exit 1; } ++ fi ++ ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_XMLRPC 1 EOF - -- ;; -- *) -- -- install_modules="install-modules" -+ found_iconv=yes -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(SYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvshm.so '$ext_builddir'/sysvshm.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSHM, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(SYSVSHM_SHARED_LIBADD)' -- ;; -- esac ++ ++ ++ if test "$PHP_LIBEXPAT_DIR" = "no"; then ++ ++ if test "$PHP_LIBXML" = "no"; then ++ { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } ++ fi ++ + -+fi - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvshm.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvshm.$suffix" - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" -- -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_GICONV_H 1 - EOF - -- ;; -- esac -- cat >> confdefs.h <&6 ++echo "configure:101447: checking for xml2-config path" >&5 ++if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ++ for i in $PHP_LIBXML_DIR /usr/local /usr; do ++ if test -x "$i/bin/xml2-config"; then ++ ac_cv_php_xml2_config_path="$i/bin/xml2-config" ++ break ++ fi + done -+ if test -z "$ICONV_DIR"; then -+ { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } - fi -- fi -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SYSVSHM_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- - -- case ext/sysvshm in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || -+ test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME -+ then +- case $host_alias in +- *netware*) +- +- install_modules="install-modules" ++fi + +- case $host_alias in +- *aix*) +- suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so' +- ;; +- *netware*) +- suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' +- ;; +- *) +- suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)' +- ;; ++echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 ++ ++ if test -x "$ac_cv_php_xml2_config_path"; then ++ XML2_CONFIG="$ac_cv_php_xml2_config_path" ++ libxml_full_version=`$XML2_CONFIG --version` ++ ac_IFS=$IFS ++ IFS="." ++ set $libxml_full_version ++ IFS=$ac_IFS ++ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` ++ if test "$LIBXML_VERSION" -ge "2006011"; then ++ LIBXML_LIBS=`$XML2_CONFIG --libs` ++ LIBXML_INCS=`$XML2_CONFIG --cflags` + -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$ICONV_DIR/$PHP_LIBDIR -+ " - -+ save_ext_shared=$ext_shared -+ ext_shared=yes - -+ for ac_i in $ac_stuff; do ++ for ac_i in $LIBXML_LIBS; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" ++ XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" + else + + @@ -51155,64 +51212,36 @@ + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in sysvshm.c; do ++ + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS ++ + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" ++ XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" + else - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac + esac -- cat >>Makefile.objects</dev/null ; then + ai_p=$ac_ii -+ else + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi + fi + + + if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" + else - - -- case ext/sysvshm in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac ++ +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" ++ + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" @@ -51251,223 +51277,284 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" - ++ + fi -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo +- cat >>Makefile.objects<&6 -+echo "configure:102094: checking for libiconv in -l$iconv_lib_name" >&5 -+ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- ;; +- *) +- +- install_modules="install-modules" ++ ++ for ac_i in $LIBXML_INCS; do ++ case $ac_i in ++ -I*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/include"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi + +- case $host_alias in +- *aix*) +- suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(TOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tokenizer.so '$ext_builddir'/tokenizer.so' +- ;; +- *netware*) +- suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TOKENIZER, 3)_SHARED_LIBADD)' +- ;; +- *) +- suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(TOKENIZER_SHARED_LIBADD)' +- ;; +- esac ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix" + fi ++ ++ ;; ++ esac ++ done ++ ++ ++ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 ++echo "configure:101605: checking whether libxml build works" >&5 ++if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ ac_save_LIBS="$LIBS" -+LIBS="-l$iconv_lib_name $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" +- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ LIBS=$old_LIBS ++ ++ php_cv_libxml_build_works=yes ++ ++ +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ rm -fr conftest* ++ ++ LIBS=$old_LIBS ++ ++ echo "$ac_t""no" 1>&6 ++ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } ++ ++ +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" -- fi -- -- -- BUILD_DIR="$BUILD_DIR $ext_builddir" ++rm -fr conftest* +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -- -- -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=sysvshm -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ found_iconv=yes -+ -+ echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h -- fi -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBICONV 1 -+EOF +-$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES) +- $link_cmd --fi -+ -+ echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h +-EOF ++ ++fi +- ;; +- esac +- cat >> confdefs.h <&6 ++ if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF -+#define ICONV_ALIASED_LIBICONV 1 -+EOF ++#define HAVE_LIBXML 1 + EOF +- fi +- fi +- +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_TOKENIZER_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) ++ fi + -+ -+else -+ echo "$ac_t""no" 1>&6 ++ if test "$PHP_XML" = "no"; then + + +- case ext/tokenizer in ++ case ext/xml in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -96795,7 +101684,7 @@ EOF --php_with_tidy=no -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_$iconv_lib_name_libiconv -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$ICONV_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi --echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 --echo "configure:95900: checking for TIDY support" >&5 --# Check whether --with-tidy or --without-tidy was given. --if test "${with_tidy+set}" = set; then -- withval="$with_tidy" -- PHP_TIDY=$withval --else -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ + old_IFS=$IFS +- for ac_src in tokenizer.c tokenizer_data.c; do ++ for ac_src in compat.c; do -- PHP_TIDY=no -- test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac + IFS=. + set $ac_src +@@ -96805,10 +101694,10 @@ EOF + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" --fi + case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac + + cat >>Makefile.objects<&2; exit 1; } + fi -+ ;; -+ esac ++else ++ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } ++ ++ fi ++ else ++ testval=no ++ for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do ++ if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBEXPAT 1 ++EOF --ext_output="yes, shared" --ext_shared=yes --case $PHP_TIDY in --shared,*) -- PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_TIDY=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- old_IFS=$IFS +- for ac_src in tokenizer.c tokenizer_data.c; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS ++ ++ ++ if test "$ext_shared" = "yes"; then ++ XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" ++ if test -n "$i/$PHP_LIBDIR"; then + +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then + -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii ++ if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$i/$PHP_LIBDIR + else + -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" + fi -+ + +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac + + if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" + else + + @@ -51484,206 +51571,96 @@ + + fi +- cat >>Makefile.objects<&6 -+ ;; -+ esac -+ done - -+ echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -+echo "configure:102254: checking for iconv in -l$iconv_lib_name" >&5 -+ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-l$iconv_lib_name $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared ++ ++ fi ++ else + -+ found_iconv=yes -+ -+ -+else -+ echo "$ac_t""no" 1>&6 --if test "$PHP_TIDY" != "no"; then -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_$iconv_lib_name_iconv +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" ++ if test -n "$i/$PHP_LIBDIR"; then + -+ -+fi - -- if test "$PHP_TIDY" != "yes"; then -- TIDY_SEARCH_DIRS=$PHP_TIDY -- else -- TIDY_SEARCH_DIRS="/usr/local /usr" -- fi -+ -+ -+fi - -- for i in $TIDY_SEARCH_DIRS; do -- if test -f $i/include/tidy/tidy.h; then -- TIDY_DIR=$i -- TIDY_INCDIR=$i/include/tidy -- elif test -f $i/include/tidy.h; then -- TIDY_DIR=$i -- TIDY_INCDIR=$i/include - fi -- done -- -- if test -z "$TIDY_DIR"; then -- { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } - fi - -- TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR -+ if test "$found_iconv" = "yes"; then ++ if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then + -+ echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h - -- -+ cat >> confdefs.h <<\EOF -+#define HAVE_ICONV 1 -+EOF ++ if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$i/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" + fi + -+ if test -n "$ICONV_DIR"; then ++ + - - if test "$ext_shared" = "yes"; then -- TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" -- if test -n "$TIDY_LIBDIR"; then -+ XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" -+ if test -n "$ICONV_DIR/$PHP_LIBDIR"; then - -- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -+ if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_LIBDIR -+ if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ICONV_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" -+ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" - else - -@@ -96007,18 +102364,18 @@ if test "$PHP_TIDY" != "no"; then - else - + +- BUILD_DIR="$BUILD_DIR $ext_builddir" ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + ++ fi -- if test -n "$TIDY_LIBDIR"; then -+ if test -n "$ICONV_DIR/$PHP_LIBDIR"; then - -- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -+ if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_LIBDIR -+ if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ICONV_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" - fi +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=tokenizer -@@ -96041,220 +102398,639 @@ if test "$PHP_TIDY" != "no"; then - - fi - -- fi -- -- -- case tidy in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ltidy $LIBS" -- ;; -- esac +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ fi ++ + fi + + -+ case $iconv_lib_name in ++ case expat in + c|c_r|pthread*) ;; + *) -+ LIBS="-l$iconv_lib_name $LIBS" ++ LIBS="-lexpat $LIBS" + ;; + esac -+ + + + + + fi + + -+ -+ if test "$ICONV_DIR/include" != "/usr/include"; then ++ ++ if test "$i/include" != "/usr/include"; then + -+ if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$ICONV_DIR/include ++ if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then ++ ai_p=$i/include + else + -+ ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" -+ fi -+ ++ ai_p="$ep_realdir/`basename \"$i/include\"`" + fi + + -+ + +- src=$ext_srcdir/Makefile.frag +- ac_srcdir=$ext_srcdir +- ac_builddir=$ext_builddir +- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" @@ -51700,1140 +51677,621 @@ + + fi + -+ fi -+ -+else -+ { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } -+ -+ fi -+ -+ fi -+fi ++ testval=yes ++ break ++ fi ++ done + -+if test "$PHP_XMLRPC" = "yes"; then -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:102463: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="ranlib" -+ break ++ if test "$testval" = "no"; then ++ { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } + fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -+fi -+fi -+RANLIB="$ac_cv_prog_RANLIB" -+if test -n "$RANLIB"; then -+ echo "$ac_t""$RANLIB" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+echo $ac_n "checking for inline""... $ac_c" 1>&6 -+echo "configure:102491: checking for inline" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_cv_c_inline=no -+for ac_kw in inline __inline__ __inline; do -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_c_inline=$ac_kw; break -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi -+rm -f conftest* -+done -+ -+fi -+ -+echo "$ac_t""$ac_cv_c_inline" 1>&6 -+case "$ac_cv_c_inline" in -+ inline | yes) ;; -+ no) cat >> confdefs.h <<\EOF -+#define inline -+EOF -+ ;; -+ *) cat >> confdefs.h <> confdefs.h <<\EOF -+#define UNDEF_THREADS_HACK -+EOF -+ -+ -+ -+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -+echo "configure:102543: checking for ANSI C header files" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#include -+#include -+#include -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:102556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ ac_cv_header_stdc=yes -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "memchr" >/dev/null 2>&1; then -+ : -+else -+ rm -rf conftest* -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "free" >/dev/null 2>&1; then -+ : -+else -+ rm -rf conftest* -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+if test "$cross_compiling" = yes; then -+ : -+else -+ cat > conftest.$ac_ext < -+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int main () { int i; for (i = 0; i < 256; i++) -+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -+exit (0); } -+ -+EOF -+if { (eval echo configure:102623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_header_stdc=no -+fi -+rm -fr conftest* -+fi -+ -+fi -+fi -+ -+echo "$ac_t""$ac_cv_header_stdc" 1>&6 -+if test $ac_cv_header_stdc = yes; then -+ cat >> confdefs.h <<\EOF -+#define STDC_HEADERS 1 -+EOF -+ -+fi -+ -+for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:102650: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:102660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ -+ -+ -+ -+ -+echo $ac_n "checking size of char""... $ac_c" 1>&6 -+echo "configure:102692: checking size of char" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_char=1 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(char)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:102712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_char=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_char=0 -+fi -+rm -fr conftest* -+fi -+ -+fi -+echo "$ac_t""$ac_cv_sizeof_char" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:102733: checking size of int" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_int=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(int)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:102753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_int=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_int=0 -+fi -+rm -fr conftest* -+fi ++ if test "$PHP_ICONV_DIR" != "no"; then ++ PHP_ICONV=$PHP_ICONV_DIR ++ fi ++ ++ if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then ++ PHP_ICONV=yes ++ fi ++ ++ ++ found_iconv=no ++ unset ICONV_DIR + -+fi -+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -+cat >> confdefs.h < ext/iconv/php_have_bsd_iconv.h ++ echo > ext/iconv/php_have_ibm_iconv.h ++ echo > ext/iconv/php_have_glibc_iconv.h ++ echo > ext/iconv/php_have_libiconv.h ++ echo > ext/iconv/php_have_iconv.h ++ echo > ext/iconv/php_php_iconv_impl.h ++ echo > ext/iconv/php_iconv_aliased_libiconv.h ++ echo > ext/iconv/php_php_iconv_h_path.h ++ echo > ext/iconv/php_iconv_supports_errno.h + -+echo $ac_n "checking size of long""... $ac_c" 1>&6 -+echo "configure:102773: checking size of long" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then ++ if test "$PHP_ICONV" = "yes"; then ++ echo $ac_n "checking for iconv""... $ac_c" 1>&6 ++echo "configure:101901: checking for iconv" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_long=4 -+else + cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:102793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_long=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_long=0 -+fi -+rm -fr conftest* -+fi ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char iconv(); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char iconv(); + -+fi -+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:102813: checking size of long long" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_long_long=8 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long long)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:102833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_long_long=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_long_long=0 -+fi -+rm -fr conftest* -+fi - -+fi -+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:102853: checking for size_t" >&5 -+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#if STDC_HEADERS -+#include -+#include ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_iconv) || defined (__stub___iconv) ++choke me ++#else ++iconv(); +#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_size_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_size_t=no -+fi -+rm -f conftest* - -+fi -+echo "$ac_t""$ac_cv_type_size_t" 1>&6 -+if test $ac_cv_type_size_t = no; then -+ cat >> confdefs.h <<\EOF -+#define size_t unsigned -+EOF - -- -- if test "$TIDY_INCDIR" != "/usr/include"; then -- -- if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_INCDIR -- else -- -- ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" -- fi -+fi -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -+echo "configure:102886: checking whether time.h and sys/time.h may both be included" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#include -+#include -+int main() { -+struct tm *tp; +; return 0; } +EOF -+if { (eval echo configure:102900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:101929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ ac_cv_header_time=yes ++ eval "ac_cv_func_iconv=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ ac_cv_header_time=no ++ eval "ac_cv_func_iconv=no" +fi +rm -f conftest* -+fi - -- fi -+echo "$ac_t""$ac_cv_header_time" 1>&6 -+if test $ac_cv_header_time = yes; then -+ cat >> confdefs.h <<\EOF -+#define TIME_WITH_SYS_TIME 1 -+EOF - -+fi + fi -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -+echo "configure:102921: checking for uid_t in sys/types.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then ++if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ++ found_iconv=yes ++ ++else ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for libiconv""... $ac_c" 1>&6 ++echo "configure:101950: checking for libiconv" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "uid_t" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_uid_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_uid_t=no -+fi -+rm -f conftest* - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -+fi - -+echo "$ac_t""$ac_cv_type_uid_t" 1>&6 -+if test $ac_cv_type_uid_t = no; then -+ cat >> confdefs.h <<\EOF -+#define uid_t int -+EOF - -- fi -- ;; -- esac -+ cat >> confdefs.h <<\EOF -+#define gid_t int -+EOF - -+fi - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi - - -- fi -- -- fi - -- ;; -- esac -- done - -- echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 --echo "configure:96189: checking for tidyOptGetDoc in -ltidy" >&5 --ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+# Standard XMLRPC list -+for ac_func in \ -+ strtoul strtoull snprintf \ -+ strstr strpbrk strerror\ -+ memcpy memmove -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:102966: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-ltidy $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char tidyOptGetDoc(); -+char $ac_func(); ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char libiconv(); - int main() { --tidyOptGetDoc() -+ ++int main() { + +-php_enable_wddx=no +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined (__stub_libiconv) || defined (__stub___libiconv) +choke me +#else -+$ac_func(); ++libiconv(); +#endif -+ - ; return 0; } - EOF --if { (eval echo configure:96208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:102994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" -+ eval "ac_cv_func_$ac_func=yes" + +-echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 +-echo "configure:96898: checking whether to enable WDDX support" >&5 +-# Check whether --enable-wddx or --disable-wddx was given. +-if test "${enable_wddx+set}" = set; then +- enableval="$enable_wddx" +- PHP_WDDX=$enableval ++; return 0; } ++EOF ++if { (eval echo configure:101978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_libiconv=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ eval "ac_cv_func_$ac_func=no" - fi - rm -f conftest* --LIBS="$ac_save_LIBS" -- - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_libiconv=no" ++fi ++rm -f conftest* ++fi + -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- cat >> confdefs.h <<\EOF --#define HAVE_TIDYOPTGETDOC 1 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_tidy_tidyOptGetDoc -- -- - fi -+done ++if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 + +- PHP_WDDX=no +- test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL ++ ++ echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h + ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBICONV 1 ++EOF ++ found_iconv=yes ++ ++else ++ echo "$ac_t""no" 1>&6 + fi ++ ++fi - -- ext_builddir=ext/tidy -- ext_srcdir=$abs_srcdir/ext/tidy -+ ext_builddir=ext/xmlrpc -+ ext_srcdir=$abs_srcdir/ext/xmlrpc - -- ac_extra= -+ ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_TIDY_SHARED=no -+ PHP_XMLRPC_SHARED=no - - -- case ext/tidy in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96269,7 +103045,12 @@ fi ++ fi +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_WDDX in +-shared,*) +- PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_WDDX=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac ++ if test "$found_iconv" = "no"; then - old_IFS=$IFS -- for ac_src in tidy.c; do -+ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -+ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -+ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -+ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -+ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -+ libxmlrpc/xml_to_soap.c; do - - IFS=. - set $ac_src -@@ -96292,18 +103073,18 @@ EOF - done ++ for i in $PHP_ICONV /usr/local /usr; do ++ if test -r $i/include/giconv.h; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_GICONV_H 1 ++EOF ++ ICONV_DIR=$i ++ iconv_lib_name=giconv ++ break ++ elif test -r $i/include/iconv.h; then ++ ICONV_DIR=$i ++ iconv_lib_name=iconv ++ break ++ fi ++ done -- EXT_STATIC="$EXT_STATIC tidy" -+ EXT_STATIC="$EXT_STATIC xmlrpc" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_TIDY_SHARED=yes -+ PHP_XMLRPC_SHARED=yes - -- case ext/tidy in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96318,14 +103099,19 @@ EOF +-echo "$ac_t""$ext_output" 1>&6 ++ if test -z "$ICONV_DIR"; then ++ { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } ++ fi ++ ++ if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || ++ test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME ++ then ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff=" ++ -L$ICONV_DIR/$PHP_LIBDIR ++ " ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi ++ ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac - old_IFS=$IFS -- for ac_src in tidy.c; do -+ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -+ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -+ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -+ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -+ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -+ libxmlrpc/xml_to_soap.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" -+ shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" ++ fi ++ ;; ++ esac - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -96348,31 +103134,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' - ;; - esac - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" - fi +-if test -z "$PHP_LIBXML_DIR"; then ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" +-php_with_libxml_dir=no +- +-echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:96943: checking libxml2 install dir" >&5 +-# Check whether --with-libxml-dir or --without-libxml-dir was given. +-if test "${with_libxml_dir+set}" = set; then +- withval="$with_libxml_dir" +- PHP_LIBXML_DIR=$withval +-else + +- PHP_LIBXML_DIR=no ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi - cat >>Makefile.objects<&6 +- +- +- +-fi --$ext_builddir/phptidy.$suffix: \$(shared_objects_tidy) \$(PHPTIDY_SHARED_DEPENDENCIES) -+$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES) - $link_cmd ++ fi ++ ++ fi - EOF -@@ -96385,31 +103171,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tidy.so '$ext_builddir'/tidy.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD)' - ;; - esac +-php_with_libexpat_dir=no ++ ;; ++ esac ++ done - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" +-echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 +-echo "configure:96967: checking libexpat dir for WDDX" >&5 +-# Check whether --with-libexpat-dir or --without-libexpat-dir was given. +-if test "${with_libexpat_dir+set}" = set; then +- withval="$with_libexpat_dir" +- PHP_LIBEXPAT_DIR=$withval ++ echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 ++echo "configure:102134: checking for libiconv in -l$iconv_lib_name" >&5 ++ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 + else +- +- PHP_LIBEXPAT_DIR=no +- ++ ac_save_LIBS="$LIBS" ++LIBS="-l$iconv_lib_name $LIBS" ++cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" + fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" --$ext_builddir/tidy.$suffix: \$(shared_objects_tidy) \$(TIDY_SHARED_DEPENDENCIES) -+$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES) - $link_cmd ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ found_iconv=yes ++ ++ echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - EOF -@@ -96417,22 +103203,22 @@ EOF - ;; - esac - cat >> confdefs.h <&6 +- +- ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBICONV 1 ++EOF - fi - fi ++ ++ echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_TIDY_SHARED=no -+ PHP_XMLRPC_SHARED=no - case "$PHP_SAPI" in - cgi|embed) - - -- case ext/tidy in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96447,7 +103233,12 @@ EOF +-if test "$PHP_WDDX" != "no"; then ++ cat >> confdefs.h <<\EOF ++#define ICONV_ALIASED_LIBICONV 1 ++EOF +- if test "$PHP_LIBEXPAT_DIR" = "no"; then +- if test "$PHP_LIBXML" = "no"; then +- { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } +- fi ++ ++ ++else ++ echo "$ac_t""no" 1>&6 - old_IFS=$IFS -- for ac_src in tidy.c; do -+ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -+ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -+ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -+ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -+ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -+ libxmlrpc/xml_to_soap.c; do ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_$iconv_lib_name_libiconv + +-echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:96995: checking for xml2-config path" >&5 +-if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff=" ++ -L$ICONV_DIR/$PHP_LIBDIR ++ " - IFS=. - set $ac_src -@@ -96470,15 +103261,15 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC tidy" -+ EXT_STATIC="$EXT_STATIC xmlrpc" - ;; - *) +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done +- +-fi +- +-echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +- +- if test -x "$ac_cv_php_xml2_config_path"; then +- XML2_CONFIG="$ac_cv_php_xml2_config_path" +- libxml_full_version=`$XML2_CONFIG --version` +- ac_IFS=$IFS +- IFS="." +- set $libxml_full_version +- IFS=$ac_IFS +- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` +- if test "$LIBXML_VERSION" -ge "2006011"; then +- LIBXML_LIBS=`$XML2_CONFIG --libs` +- LIBXML_INCS=`$XML2_CONFIG --cflags` +- +- for ac_i in $LIBXML_LIBS; do ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then +- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" ++ LDFLAGS="$LDFLAGS -pthread" + else -- case ext/tidy in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96493,7 +103284,12 @@ EOF - - - old_IFS=$IFS -- for ac_src in tidy.c; do -+ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -+ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -+ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -+ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -+ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -+ libxmlrpc/xml_to_soap.c; do +@@ -97045,7 +102227,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then +- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" ++ LDFLAGS="$LDFLAGS -l$ac_ii" + else + - IFS=. - set $ac_src -@@ -96518,91 +103314,193 @@ EOF +@@ -97080,8 +102262,123 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" -+ fi + + if test "$ext_shared" = "yes"; then +- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ else ++ + + -+ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + -+ -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=xmlrpc ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" + -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ -+ fi -+ -+ -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" + ++ fi + -+ XMLRPC_MODULE_TYPE=builtin -+ -+elif test "$PHP_XMLRPC" != "no"; then + -+ if test -r $PHP_XMLRPC/include/xmlrpc.h; then -+ XMLRPC_DIR=$PHP_XMLRPC/include -+ elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then -+ XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi -+ else -+ echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 -+echo "configure:103348: checking for XMLRPC-EPI in default path" >&5 -+ for i in /usr/local /usr; do -+ if test -r $i/include/xmlrpc.h; then -+ XMLRPC_DIR=$i/include -+ echo "$ac_t""found in $i" 1>&6 -+ break + fi -+ done ++ + fi + -+ if test -z "$XMLRPC_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } -+ fi ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 ++echo "configure:102294: checking for iconv in -l$iconv_lib_name" >&5 ++ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-l$iconv_lib_name $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 + -+ if test "$XMLRPC_DIR" != "/usr/include"; then -+ -+ if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then -+ ai_p=$XMLRPC_DIR -+ else -+ -+ ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" -+ fi ++ found_iconv=yes ++ ++ ++else ++ echo "$ac_t""no" 1>&6 + ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_$iconv_lib_name_iconv + + -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++fi ++ ++ + -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi ++fi + ++ fi + fi + -+ ++ if test "$found_iconv" = "yes"; then ++ ++ echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_ICONV 1 ++EOF ++ ++ if test -n "$ICONV_DIR"; then ++ + + if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" -+ if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then ++ XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" ++ if test -n "$ICONV_DIR/$PHP_LIBDIR"; then + -+ if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then + -+ if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$XMLRPC_DIR/$PHP_LIBDIR ++ if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$ICONV_DIR/$PHP_LIBDIR + else + -+ ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" - fi ++ ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" ++ fi + + + if test "$ext_shared" = "yes"; then + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -+ else -+ - - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- -- -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=tidy -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -- fi -- -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" + else + -- PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" -- -- cat >> confdefs.h <<\EOF --#define HAVE_TIDY 1 --EOF -- --fi -+ fi +@@ -97099,343 +102396,681 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + fi +- fi +- +- fi + fi + + fi - ++ + fi + else + - --php_enable_tokenizer=yes -+ if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then ++ ++ if test -n "$ICONV_DIR/$PHP_LIBDIR"; then + -+ if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then + -+ if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$XMLRPC_DIR/$PHP_LIBDIR ++ if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$ICONV_DIR/$PHP_LIBDIR + else + -+ ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" + fi - --echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 --echo "configure:96552: checking whether to enable tokenizer support" >&5 --# Check whether --enable-tokenizer or --disable-tokenizer was given. --if test "${enable_tokenizer+set}" = set; then -- enableval="$enable_tokenizer" -- PHP_TOKENIZER=$enableval --else ++ + + - -- PHP_TOKENIZER=yes -- test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL -- --fi -- ++ + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + @@ -52846,426 +52304,274 @@ + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi - - --ext_output="yes, shared" --ext_shared=yes --case $PHP_TOKENIZER in --shared,*) -- PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_TOKENIZER=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac ++ ++ + + fi - ++ + fi + + -+ case xmlrpc in ++ case $iconv_lib_name in + c|c_r|pthread*) ;; + *) -+ LIBS="-lxmlrpc $LIBS" ++ LIBS="-l$iconv_lib_name $LIBS" + ;; + esac - - --echo "$ac_t""$ext_output" 1>&6 - - ++ ++ ++ ++ + fi - - --if test "$PHP_TOKENIZER" != "no"; then - -- ext_builddir=ext/tokenizer -- ext_srcdir=$abs_srcdir/ext/tokenizer -+ ext_builddir=ext/xmlrpc -+ ext_srcdir=$abs_srcdir/ext/xmlrpc - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_TOKENIZER_SHARED=no -+ PHP_XMLRPC_SHARED=no - - -- case ext/tokenizer in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96617,7 +103515,7 @@ if test "$PHP_TOKENIZER" != "no"; then - - - old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do -+ for ac_src in xmlrpc-epi-php.c; do - - IFS=. - set $ac_src -@@ -96640,18 +103538,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC tokenizer" -+ EXT_STATIC="$EXT_STATIC xmlrpc" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_TOKENIZER_SHARED=yes -+ PHP_XMLRPC_SHARED=yes - -- case ext/tokenizer in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96666,14 +103564,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do -+ for ac_src in xmlrpc-epi-php.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" -+ shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -96696,31 +103594,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <> Makefile.fragments -- -+ XMLRPC_MODULE_TYPE=external - fi - - - --php_enable_wddx=no -+php_enable_xmlwriter=yes - --echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 --echo "configure:96898: checking whether to enable WDDX support" >&5 --# Check whether --enable-wddx or --disable-wddx was given. --if test "${enable_wddx+set}" = set; then -- enableval="$enable_wddx" -- PHP_WDDX=$enableval -+echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 -+echo "configure:103791: checking whether to enable XMLWriter support" >&5 -+# Check whether --enable-xmlwriter or --disable-xmlwriter was given. -+if test "${enable_xmlwriter+set}" = set; then -+ enableval="$enable_xmlwriter" -+ PHP_XMLWRITER=$enableval - else - -- PHP_WDDX=no -- test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL -+ PHP_XMLWRITER=yes -+ test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL - - fi - -@@ -96910,12 +103803,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_WDDX in -+case $PHP_XMLWRITER in - shared,*) -- PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` -+ PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'` - ;; - shared) -- PHP_WDDX=yes -+ PHP_XMLWRITER=yes - ;; - no) - ext_output=no -@@ -96939,7 +103832,7 @@ if test -z "$PHP_LIBXML_DIR"; then - php_with_libxml_dir=no - - echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:96943: checking libxml2 install dir" >&5 -+echo "configure:103836: checking libxml2 install dir" >&5 - # Check whether --with-libxml-dir or --without-libxml-dir was given. - if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" -@@ -96959,39 +103852,15 @@ echo "$ac_t""$ext_output" 1>&6 - - fi - -+if test "$PHP_XMLWRITER" != "no"; then - --php_with_libexpat_dir=no -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } ++ ++ ++ ++ if test "$ICONV_DIR/include" != "/usr/include"; then ++ ++ if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then ++ ai_p=$ICONV_DIR/include ++ else ++ ++ ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" ++ fi ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi ++ ++ fi ++ ++ fi ++ ++else ++ { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } ++ ++ fi ++ + fi ++fi ++ ++if test "$PHP_XMLRPC" = "yes"; then ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:102503: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test -n "$RANLIB"; then ++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ++else ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_prog_RANLIB="ranlib" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" ++fi ++fi ++RANLIB="$ac_cv_prog_RANLIB" ++if test -n "$RANLIB"; then ++ echo "$ac_t""$RANLIB" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++echo $ac_n "checking for inline""... $ac_c" 1>&6 ++echo "configure:102531: checking for inline" >&5 ++if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_cv_c_inline=no ++for ac_kw in inline __inline__ __inline; do ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_c_inline=$ac_kw; break ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++done ++ ++fi ++ ++echo "$ac_t""$ac_cv_c_inline" 1>&6 ++case "$ac_cv_c_inline" in ++ inline | yes) ;; ++ no) cat >> confdefs.h <<\EOF ++#define inline ++EOF ++ ;; ++ *) cat >> confdefs.h <> confdefs.h <<\EOF ++#define UNDEF_THREADS_HACK ++EOF ++ ++ ++ ++echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ++echo "configure:102583: checking for ANSI C header files" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++#include ++#include ++#include ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:102596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ ac_cv_header_stdc=yes ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++cat > conftest.$ac_ext < ++EOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ egrep "memchr" >/dev/null 2>&1; then ++ : ++else ++ rm -rf conftest* ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++cat > conftest.$ac_ext < ++EOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ egrep "free" >/dev/null 2>&1; then ++ : ++else ++ rm -rf conftest* ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++if test "$cross_compiling" = yes; then ++ : ++else ++ cat > conftest.$ac_ext < ++#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int main () { int i; for (i = 0; i < 256; i++) ++if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ++exit (0); } ++ ++EOF ++if { (eval echo configure:102663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ : ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ac_cv_header_stdc=no ++fi ++rm -fr conftest* ++fi ++ ++fi ++fi --echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 --echo "configure:96967: checking libexpat dir for WDDX" >&5 --# Check whether --with-libexpat-dir or --without-libexpat-dir was given. --if test "${with_libexpat_dir+set}" = set; then -- withval="$with_libexpat_dir" -- PHP_LIBEXPAT_DIR=$withval --else -- -- PHP_LIBEXPAT_DIR=no - -- --fi -- -- --ext_output=$PHP_LIBEXPAT_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_WDDX" != "no"; then -- -- if test "$PHP_LIBEXPAT_DIR" = "no"; then -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -- -- - echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:96995: checking for xml2-config path" >&5 -+echo "configure:103864: checking for xml2-config path" >&5 - if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -97023,7 +103892,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" -+ XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" - else - - -@@ -97045,7 +103914,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" -+ XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" - else - - -@@ -97080,8 +103949,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +- ;; +- esac +- done ++echo "$ac_t""$ac_cv_header_stdc" 1>&6 ++if test $ac_cv_header_stdc = yes; then ++ cat >> confdefs.h <<\EOF ++#define STDC_HEADERS 1 ++EOF - - if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" -+ XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" - else - - -@@ -97125,317 +103994,110 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi +- +- for ac_i in $LIBXML_INCS; do +- case $ac_i in +- -I*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/include"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- fi ++fi - - @@ -53282,33 +52588,79 @@ - fi - - fi -- ++for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:102690: checking for $ac_hdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:102700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++ cat >> confdefs.h <&6 ++fi ++done + - fi -- + - ;; - esac - done -- -- + + - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:97153: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else ++ ++ ++echo $ac_n "checking size of char""... $ac_c" 1>&6 ++echo "configure:102732: checking size of char" >&5 ++if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else - - - old_LIBS=$LIBS - LIBS=" - $WDDX_SHARED_LIBADD - $LIBS" -- if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then - - LIBS=$old_LIBS - --else -- cat > conftest.$ac_ext < conftest.$ac_ext < ++#include ++main() ++{ ++ FILE *f=fopen("conftestval", "w"); ++ if (!f) exit(1); ++ fprintf(f, "%d\n", sizeof(char)); ++ exit(0); ++} + EOF -if { (eval echo configure:97180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then ++if { (eval echo configure:102752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then - - LIBS=$old_LIBS - - php_cv_libxml_build_works=yes - - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* ++ ac_cv_sizeof_char=`cat conftestval` + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* - - LIBS=$old_LIBS - @@ -53337,20 +52700,24 @@ - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - --fi --rm -fr conftest* --fi -- ++ ac_cv_sizeof_char=0 + fi + rm -fr conftest* + fi + - - --fi + fi - -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 - if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 --EOF -- ++echo "$ac_t""$ac_cv_sizeof_char" 1>&6 ++cat >> confdefs.h <&6 ++echo "configure:102773: checking size of int" >&5 ++if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_sizeof_int=4 ++else ++ cat > conftest.$ac_ext < ++#include ++main() ++{ ++ FILE *f=fopen("conftestval", "w"); ++ if (!f) exit(1); ++ fprintf(f, "%d\n", sizeof(int)); ++ exit(0); ++} ++EOF ++if { (eval echo configure:102793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ac_cv_sizeof_int=`cat conftestval` ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ac_cv_sizeof_int=0 ++fi ++rm -fr conftest* ++fi + - cat >>Makefile.objects<&6 ++cat >> confdefs.h <&6 ++echo "configure:102813: checking size of long" >&5 ++if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_sizeof_long=4 ++else ++ cat > conftest.$ac_ext < ++#include ++main() ++{ ++ FILE *f=fopen("conftestval", "w"); ++ if (!f) exit(1); ++ fprintf(f, "%d\n", sizeof(long)); ++ exit(0); ++} ++EOF ++if { (eval echo configure:102833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ac_cv_sizeof_long=`cat conftestval` ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ac_cv_sizeof_long=0 ++fi ++rm -fr conftest* ++fi + - fi - - else @@ -53411,9 +52846,14 @@ - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } - - fi -- ++fi ++echo "$ac_t""$ac_cv_sizeof_long" 1>&6 ++cat >> confdefs.h <&6 ++echo "configure:102853: checking size of long long" >&5 ++if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_sizeof_long_long=8 ++else ++ cat > conftest.$ac_ext < ++#include ++main() ++{ ++ FILE *f=fopen("conftestval", "w"); ++ if (!f) exit(1); ++ fprintf(f, "%d\n", sizeof(long long)); ++ exit(0); ++} ++EOF ++if { (eval echo configure:102873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ac_cv_sizeof_long_long=`cat conftestval` ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ac_cv_sizeof_long_long=0 ++fi ++rm -fr conftest* ++fi + - if test -z "$EXPAT_DIR"; then - { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } - fi -- ++fi ++echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 ++cat >> confdefs.h <&6 ++echo "configure:102893: checking for size_t" >&5 ++if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++#if STDC_HEADERS ++#include ++#include ++#endif ++EOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then ++ rm -rf conftest* ++ ac_cv_type_size_t=yes ++else ++ rm -rf conftest* ++ ac_cv_type_size_t=no ++fi ++rm -f conftest* + - fi -- ++fi ++echo "$ac_t""$ac_cv_type_size_t" 1>&6 ++if test $ac_cv_type_size_t = no; then ++ cat >> confdefs.h <<\EOF ++#define size_t unsigned ++EOF + - -- ++fi + - if test "$ext_shared" = "yes"; then - WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then @@ -53474,7 +52981,33 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" - fi -- ++echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ++echo "configure:102926: checking whether time.h and sys/time.h may both be included" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++#include ++#include ++int main() { ++struct tm *tp; ++; return 0; } ++EOF ++if { (eval echo configure:102940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_header_time=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ ac_cv_header_time=no ++fi ++rm -f conftest* ++fi + - - if test "$ext_shared" = "yes"; then - WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" @@ -53494,16 +53027,42 @@ - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi -- -- ++echo "$ac_t""$ac_cv_header_time" 1>&6 ++if test $ac_cv_header_time = yes; then ++ cat >> confdefs.h <<\EOF ++#define TIME_WITH_SYS_TIME 1 ++EOF + ++fi + - fi - - fi -- ++echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 ++echo "configure:102961: checking for uid_t in sys/types.h" >&5 ++if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++EOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ egrep "uid_t" >/dev/null 2>&1; then ++ rm -rf conftest* ++ ac_cv_type_uid_t=yes ++else ++ rm -rf conftest* ++ ac_cv_type_uid_t=no ++fi ++rm -f conftest* + - fi - else - -- ++fi + - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then - - if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then @@ -53517,36 +53076,37 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" - fi -- ++echo "$ac_t""$ac_cv_type_uid_t" 1>&6 ++if test $ac_cv_type_uid_t = no; then ++ cat >> confdefs.h <<\EOF ++#define uid_t int ++EOF + - - - -+ - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then +- if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" -+ eval "INCLUDEPATH$unique=set" - +- - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi -- -- -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi - - fi ++ cat >> confdefs.h <<\EOF ++#define gid_t int ++EOF - fi ++fi + +- +- fi + +- fi - - - case expat in @@ -53556,149 +53116,152 @@ - ;; - esac -+ ;; -+ esac -+ done -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:104022: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + +- fi ++# Standard XMLRPC list ++for ac_func in \ ++ strtoul strtoull snprintf \ ++ strstr strpbrk strerror\ ++ memcpy memmove ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:103006: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ -+ -+ old_LIBS=$LIBS -+ LIBS=" -+ $XMLWRITER_SHARED_LIBADD -+ $LIBS" -+ if test "$cross_compiling" = yes; then -+ -+ LIBS=$old_LIBS -+ -+else + cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func(); -- fi -+ -+ char xmlInitParser(); -+ int main() { -+ xmlInitParser(); -+ return 0; -+ } -+ -+EOF -+if { (eval echo configure:104049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ -+ -+fi -+rm -fr conftest* -+fi - ++int main() { - cat >> confdefs.h <<\EOF -#define HAVE_LIBEXPAT 1 -EOF -+ -+fi ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif - fi -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 ++; return 0; } +EOF ++if { (eval echo configure:103034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi - cat >> confdefs.h <<\EOF -#define HAVE_WDDX 1 -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_XMLWRITER 1 ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <&6 ++fi ++done ++ ++ ++ -- + - ext_builddir=ext/wddx - ext_srcdir=$abs_srcdir/ext/wddx -+ -+ ext_builddir=ext/xmlwriter -+ ext_srcdir=$abs_srcdir/ext/xmlwriter ++ ext_builddir=ext/xmlrpc ++ ext_srcdir=$abs_srcdir/ext/xmlrpc - ac_extra= +- ac_extra= ++ ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_WDDX_SHARED=no -+ PHP_XMLWRITER_SHARED=no ++ PHP_XMLRPC_SHARED=no - case ext/wddx in -+ case ext/xmlwriter in ++ case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -97450,7 +104112,7 @@ EOF +@@ -97450,7 +103085,12 @@ EOF old_IFS=$IFS - for ac_src in wddx.c; do -+ for ac_src in php_xmlwriter.c; do ++ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ ++ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ ++ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ ++ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ ++ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ ++ libxmlrpc/xml_to_soap.c; do IFS=. set $ac_src -@@ -97473,18 +104135,18 @@ EOF +@@ -97473,18 +103113,18 @@ EOF done - EXT_STATIC="$EXT_STATIC wddx" -+ EXT_STATIC="$EXT_STATIC xmlwriter" ++ EXT_STATIC="$EXT_STATIC xmlrpc" if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_WDDX_SHARED=yes -+ PHP_XMLWRITER_SHARED=yes ++ PHP_XMLRPC_SHARED=yes - case ext/wddx in -+ case ext/xmlwriter in ++ case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -97499,14 +104161,14 @@ EOF +@@ -97499,14 +103139,19 @@ EOF old_IFS=$IFS - for ac_src in wddx.c; do -+ for ac_src in php_xmlwriter.c; do ++ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ ++ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ ++ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ ++ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ ++ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ ++ libxmlrpc/xml_to_soap.c; do IFS=. set $ac_src @@ -53706,182 +53269,207 @@ IFS=$old_IFS - shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo" -+ shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo" ++ shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -97529,31 +104191,31 @@ EOF +@@ -97529,31 +103174,31 @@ EOF case $host_alias in *aix*) suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpwddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpwddx.so '$ext_builddir'/phpwddx.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlwriter.so '$ext_builddir'/phpxmlwriter.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' ;; *) suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects<>Makefile.objects<&2; exit 1; } - fi - -+ else -+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - +- - PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -+ fi - - fi - - - +- +-fi +- +- +- -php_enable_xml=yes -+php_with_xsl=no - +- -echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 -echo "configure:97747: checking whether to enable XML support" >&5 -# Check whether --enable-xml or --disable-xml was given. -if test "${enable_xml+set}" = set; then - enableval="$enable_xml" - PHP_XML=$enableval -+echo $ac_n "checking for XSL support""... $ac_c" 1>&6 -+echo "configure:104399: checking for XSL support" >&5 -+# Check whether --with-xsl or --without-xsl was given. -+if test "${with_xsl+set}" = set; then -+ withval="$with_xsl" -+ PHP_XSL=$withval - else - +-else +- - PHP_XML=yes - test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL -+ PHP_XSL=no -+ test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL - - fi - -@@ -97759,12 +104411,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes +- +-fi +- +- +- +-ext_output="yes, shared" +-ext_shared=yes -case $PHP_XML in -+case $PHP_XSL in - shared,*) +-shared,*) - PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'` -+ PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'` - ;; - shared) +- ;; +-shared) - PHP_XML=yes -+ PHP_XSL=yes - ;; - no) - ext_output=no -@@ -97783,97 +104435,41 @@ echo "$ac_t""$ext_output" 1>&6 - - - +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac +- +- +- +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- -if test -z "$PHP_LIBXML_DIR"; then - -php_with_libxml_dir=no @@ -53984,8 +53565,7 @@ - - -php_with_libexpat_dir=no -+if test "$PHP_XSL" != "no"; then - +- -echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 -echo "configure:97816: checking libexpat install dir" >&5 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given. @@ -53995,14 +53575,8 @@ -else - - PHP_LIBEXPAT_DIR=no -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi - -+ if test "$PHP_DOM" = "no"; then -+ { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } -+ fi - +- +- -fi - - @@ -54030,13 +53604,10 @@ - for i in $PHP_LIBXML_DIR /usr/local /usr; do - if test -x "$i/bin/xml2-config"; then - ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ for i in $PHP_XSL /usr/local /usr; do -+ if test -x "$i/bin/xslt-config"; then -+ XSLT_CONFIG=$i/bin/xslt-config - break - fi - done - +- break +- fi +- done +- -fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 @@ -54044,133 +53615,315 @@ - if test -x "$ac_cv_php_xml2_config_path"; then - XML2_CONFIG="$ac_cv_php_xml2_config_path" - libxml_full_version=`$XML2_CONFIG --version` -+ if test -z "$XSLT_CONFIG"; then -+ { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } -+ else -+ libxslt_full_version=`$XSLT_CONFIG --version` - ac_IFS=$IFS - IFS="." +- ac_IFS=$IFS +- IFS="." - set $libxml_full_version -+ set $libxslt_full_version - IFS=$ac_IFS +- IFS=$ac_IFS - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` - if test "$LIBXML_VERSION" -ge "2006011"; then - LIBXML_LIBS=`$XML2_CONFIG --libs` - LIBXML_INCS=`$XML2_CONFIG --cflags` -+ LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXSLT_VERSION" -ge "1001000"; then -+ XSL_LIBS=`$XSLT_CONFIG --libs` -+ XSL_INCS=`$XSLT_CONFIG --cflags` - +- - for ac_i in $LIBXML_LIBS; do -+ for ac_i in $XSL_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then - XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" -+ XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread" - else - - -@@ -97895,7 +104491,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then +- else +- +- +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi +- +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then - XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" -+ XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" - else - - -@@ -97930,8 +104526,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - if test "$ext_shared" = "yes"; then +- else +- +- +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- LIBS="$LIBS -l$ac_ii" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- fi +- +- +- if test "$ext_shared" = "yes"; then - XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" - test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" -+ XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" - else - +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +- +- fi +- +- +- fi +- +- fi +- +- ;; +- esac +- done +- +- +- for ac_i in $LIBXML_INCS; do +- case $ac_i in +- -I*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/include"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii ++ ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" + else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" + fi +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -97958,7 +104554,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - done +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - -- for ac_i in $LIBXML_INCS; do -+ for ac_i in $XSL_INCS; do - case $ac_i in - -I*) - ac_ii=`echo $ac_i|cut -c 3-` -@@ -97997,166 +104593,41 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - esac - done +- fi ++ cat >>Makefile.objects<&6 -echo "configure:98003: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -- ++ ;; ++ esac ++ cat >> confdefs.h < conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - LIBS=$old_LIBS - - php_cv_libxml_build_works=yes -- -- ++ done ++ ++ ++ EXT_STATIC="$EXT_STATIC xmlrpc" ++ ;; ++ *) + + -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ++ case ext/xmlrpc in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac + - LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - -- + -fi -rm -fr conftest* -fi -- -- -- ++ ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + + ++ old_IFS=$IFS ++ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ ++ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ ++ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ ++ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ ++ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ ++ libxmlrpc/xml_to_soap.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + -fi -- ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" + -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 - if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 --EOF -- ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&2; exit 1; } -- fi -- -- ++ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" + fi + ++ ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ ++ ++ ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=xmlrpc + - else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } - fi @@ -54197,253 +53961,217 @@ - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } - - fi -- -- fi -- ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + + fi ++ + - if test "$PHP_LIBEXPAT_DIR" != "no"; then - for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do - if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then - EXPAT_DIR=$i -- break -- fi -- done -- ++ ++ BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" ++ ++ ++ XMLRPC_MODULE_TYPE=builtin ++ ++elif test "$PHP_XMLRPC" != "no"; then ++ ++ if test -r $PHP_XMLRPC/include/xmlrpc.h; then ++ XMLRPC_DIR=$PHP_XMLRPC/include ++ elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then ++ XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi ++ else ++ echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 ++echo "configure:103388: checking for XMLRPC-EPI in default path" >&5 ++ for i in /usr/local /usr; do ++ if test -r $i/include/xmlrpc.h; then ++ XMLRPC_DIR=$i/include ++ echo "$ac_t""found in $i" 1>&6 + break + fi + done ++ fi + - if test -z "$EXPAT_DIR"; then - { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } - fi -- -- ++ if test -z "$XMLRPC_DIR"; then ++ echo "$ac_t""not found" 1>&6 ++ { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } ++ fi + ++ ++ if test "$XMLRPC_DIR" != "/usr/include"; then + - if test "$EXPAT_DIR/include" != "/usr/include"; then - - if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then - ai_p=$EXPAT_DIR/include -- else -- ++ if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then ++ ai_p=$XMLRPC_DIR + else + - ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- -+ echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 -+echo "configure:104599: checking for EXSLT support" >&5 -+ for i in $PHP_XSL /usr/local /usr; do -+ if test -r "$i/include/libexslt/exslt.h"; then -+ PHP_XSL_EXSL_DIR=$i -+ break -+ fi -+ done -+ if test -z "$PHP_XSL_EXSL_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ else -+ echo "$ac_t""found" 1>&6 -+ ++ ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" ++ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" + fi + + +@@ -98135,28 +103430,28 @@ else + + fi + +- ++ if test "$ext_shared" = "yes"; then - XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -+ XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD" -+ if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then ++ XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" ++ if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then - if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then - ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR ++ if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$XMLRPC_DIR/$PHP_LIBDIR else - ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" fi if test "$ext_shared" = "yes"; then - XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" - test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" -+ XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" ++ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" else -@@ -98182,18 +104653,18 @@ else +@@ -98182,18 +103477,18 @@ else else - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -+ if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then ++ if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then - if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then - ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR ++ if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$XMLRPC_DIR/$PHP_LIBDIR else - ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" fi -@@ -98219,10 +104690,10 @@ else +@@ -98219,10 +103514,10 @@ else fi - case expat in -+ case exslt in ++ case xmlrpc in c|c_r|pthread*) ;; *) - LIBS="-lexpat $LIBS" -+ LIBS="-lexslt $LIBS" ++ LIBS="-lxmlrpc $LIBS" ;; esac -@@ -98232,26 +104703,67 @@ else +@@ -98232,26 +103527,20 @@ else fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBEXPAT 1 -+ -+ if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then -+ -+ if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_XSL_EXSL_DIR/include -+ else -+ -+ ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_XSL_EXSLT 1 - EOF - -+ fi -+ else -+ { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; } -+ fi -+ -+ - fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_XSL 1 -+EOF - +-EOF +- +- fi +- - ext_builddir=ext/xml - ext_srcdir=$abs_srcdir/ext/xml -+ ext_builddir=ext/xsl -+ ext_srcdir=$abs_srcdir/ext/xsl ++ ext_builddir=ext/xmlrpc ++ ext_srcdir=$abs_srcdir/ext/xmlrpc ac_extra= if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_XML_SHARED=no -+ PHP_XSL_SHARED=no ++ PHP_XMLRPC_SHARED=no - case ext/xml in -+ case ext/xsl in ++ case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98266,7 +104778,7 @@ EOF +@@ -98266,7 +103555,7 @@ EOF old_IFS=$IFS - for ac_src in xml.c $xml_extra_sources; do -+ for ac_src in php_xsl.c xsltprocessor.c; do ++ for ac_src in xmlrpc-epi-php.c; do IFS=. set $ac_src -@@ -98289,18 +104801,18 @@ EOF +@@ -98289,18 +103578,18 @@ EOF done - EXT_STATIC="$EXT_STATIC xml" -+ EXT_STATIC="$EXT_STATIC xsl" ++ EXT_STATIC="$EXT_STATIC xmlrpc" if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC xml" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xsl" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_XML_SHARED=yes -+ PHP_XSL_SHARED=yes ++ PHP_XMLRPC_SHARED=yes - case ext/xml in -+ case ext/xsl in ++ case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98315,14 +104827,14 @@ EOF +@@ -98315,14 +103604,14 @@ EOF old_IFS=$IFS - for ac_src in xml.c $xml_extra_sources; do -+ for ac_src in php_xsl.c xsltprocessor.c; do ++ for ac_src in xmlrpc-epi-php.c; do IFS=. set $ac_src @@ -54451,98 +54179,98 @@ IFS=$old_IFS - shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" -+ shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo" ++ shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -98345,31 +104857,31 @@ EOF +@@ -98345,31 +103634,31 @@ EOF case $host_alias in *aix*) suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(PHPXSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxsl.so '$ext_builddir'/phpxsl.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXSL, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' ;; *) suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(PHPXSL_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxsl.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension xsl, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } - fi +- fi - - done - +- - - cat >> confdefs.h <<\EOF -#define HAVE_XML 1 -EOF - ++ XMLRPC_MODULE_TYPE=external fi -php_enable_xmlreader=yes -+php_enable_zip=no ++php_enable_xmlwriter=yes -echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 -echo "configure:98566: checking whether to enable XMLReader support" >&5 @@ -54678,514 +54390,201 @@ -if test "${enable_xmlreader+set}" = set; then - enableval="$enable_xmlreader" - PHP_XMLREADER=$enableval -+echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 -+echo "configure:105075: checking for zip archive read/writesupport" >&5 -+# Check whether --enable-zip or --disable-zip was given. -+if test "${enable_zip+set}" = set; then -+ enableval="$enable_zip" -+ PHP_ZIP=$enableval ++echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 ++echo "configure:103831: checking whether to enable XMLWriter support" >&5 ++# Check whether --enable-xmlwriter or --disable-xmlwriter was given. ++if test "${enable_xmlwriter+set}" = set; then ++ enableval="$enable_xmlwriter" ++ PHP_XMLWRITER=$enableval else - PHP_XMLREADER=yes - test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL -+ PHP_ZIP=no -+ test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL ++ PHP_XMLWRITER=yes ++ test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL fi -@@ -98578,12 +105087,12 @@ fi +@@ -98578,12 +103843,12 @@ fi ext_output="yes, shared" ext_shared=yes -case $PHP_XMLREADER in -+case $PHP_ZIP in ++case $PHP_XMLWRITER in shared,*) - PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` -+ PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'` ++ PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'` ;; shared) - PHP_XMLREADER=yes -+ PHP_ZIP=yes ++ PHP_XMLWRITER=yes ;; no) ext_output=no -@@ -98602,132 +105111,147 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test -z "$PHP_LIBXML_DIR"; then -+if test -z "$PHP_ZLIB_DIR"; then - --php_with_libxml_dir=no -+php_with_zlib_dir=no +@@ -98607,7 +103872,7 @@ if test -z "$PHP_LIBXML_DIR"; then + php_with_libxml_dir=no --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:98611: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval -+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -+echo "configure:105120: checking for the location of libz" >&5 -+# Check whether --with-zlib-dir or --without-zlib-dir was given. -+if test "${with_zlib_dir+set}" = set; then -+ withval="$with_zlib_dir" -+ PHP_ZLIB_DIR=$withval - else - -- PHP_LIBXML_DIR=no -+ PHP_ZLIB_DIR=no - - - fi - - --ext_output=$PHP_LIBXML_DIR -+ext_output=$PHP_ZLIB_DIR - echo "$ac_t""$ext_output" 1>&6 - - ++echo "configure:103876: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -98627,15 +103892,15 @@ echo "$ac_t""$ext_output" 1>&6 fi -if test "$PHP_XMLREADER" != "no"; then ++if test "$PHP_XMLWRITER" != "no"; then -- if test "$PHP_LIBXML" = "no"; then + if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -+php_with_pcre_dir=no ++ { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + fi -- --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:98639: checking for xml2-config path" >&5 --if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 -+echo "configure:105144: checking pcre install prefix" >&5 -+# Check whether --with-pcre-dir or --without-pcre-dir was given. -+if test "${with_pcre_dir+set}" = set; then -+ withval="$with_pcre_dir" -+ PHP_PCRE_DIR=$withval ++echo "configure:103904: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ PHP_PCRE_DIR=no -+ - - fi - --echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 - -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -+ext_output=$PHP_PCRE_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_ZIP" != "no"; then -+ -+ if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then -+ if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then -+ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -+ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" -+ elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then -+ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -+ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" -+ else -+ { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } -+ fi -+ else -+ for i in /usr/local /usr; do -+ if test -f "$i/include/zlib/zlib.h"; then -+ PHP_ZLIB_DIR="$i" -+ PHP_ZLIB_INCDIR="$i/include/zlib" -+ elif test -f "$i/include/zlib.h"; then -+ PHP_ZLIB_DIR="$i" -+ PHP_ZLIB_INCDIR="$i/include" -+ fi -+ done -+ fi -+ -+ echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 -+echo "configure:105188: checking for the location of zlib" >&5 -+ if test "$PHP_ZLIB_DIR" = "no"; then -+ { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } -+ else -+ echo "$ac_t""$PHP_ZLIB_DIR" 1>&6 -+ -+ -+ if test "$ext_shared" = "yes"; then -+ ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" -+ if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - -- for ac_i in $LIBXML_LIBS; do -- case $ac_i in -- -pthread) -+ if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ +@@ -98667,7 +103932,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + case $ac_i in + -pthread) if test "$ext_shared" = "yes"; then - XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" -+ ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD" - else - - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ - fi - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac - -+ fi -+ -+ fi - - fi -- ;; -- esac -- -+ else -+ - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" - fi - - -- if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" -- else -- -+ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -98743,30 +105267,36 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - fi - - -- fi - - fi - -- ;; -- esac -- done -+ fi -+ -+ -+ case z in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lz $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ - -- -- for ac_i in $LIBXML_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then -+ -+ if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ZLIB_INCDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`" - fi ++ XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" + else + + +@@ -98689,7 +103954,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then +- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" ++ XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" + else + + +@@ -98724,8 +103989,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path -@@ -98787,92 +105317,97 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - fi - -- ;; -- esac -- done -+ fi + if test "$ext_shared" = "yes"; then +- XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" ++ XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" + else + + +@@ -98793,7 +104058,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ cat > conftest.$ac_ext <&6 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:98797: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -+#include
-+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif - -- -- old_LIBS=$LIBS -- LIBS=" ++echo "configure:104062: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -98801,7 +104066,7 @@ else + + old_LIBS=$LIBS + LIBS=" - $XMLREADER_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* ++ $XMLWRITER_SHARED_LIBADD + $LIBS" + if test "$cross_compiling" = yes; then -- LIBS=$old_LIBS -+ PHP_PCRE_REGEX=yes +@@ -98809,7 +104074,7 @@ else else -- cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -- char xmlInitParser(); -- int main() { -- xmlInitParser(); -- return 0; -- } -- +@@ -98820,7 +104085,7 @@ else + } + EOF -if { (eval echo configure:98824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* - -- LIBS=$old_LIBS -+ PHP_PCRE_REGEX=pecl - -- php_cv_libxml_build_works=yes -- -- - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ rm -rf conftest* ++if { (eval echo configure:104089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then -- LIBS=$old_LIBS -+ PHP_PCRE_REGEX=no - -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -- --fi --rm -fr conftest* - fi -+rm -f conftest* - -- -- -+ - fi -+rm -f conftest* - --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 --EOF -+ CPPFLAGS=$old_CPPFLAGS - -- fi -- -- cat >> confdefs.h <<\EOF + LIBS=$old_LIBS +@@ -98856,23 +104121,23 @@ EOF + fi + + cat >> confdefs.h <<\EOF -#define HAVE_XMLREADER 1 -+ PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \ -+ lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c \ -+ lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \ -+ lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \ -+ lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \ -+ lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \ -+ lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \ -+ lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \ -+ lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \ -+ lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \ -+ lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \ -+ lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \ -+ lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \ -+ lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \ -+ lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \ -+ lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \ -+ lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \ -+ lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \ -+ lib/zip_error_clear.c lib/zip_file_error_clear.c" -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_ZIP 1 ++#define HAVE_XMLWRITER 1 EOF -- + - ext_builddir=ext/xmlreader - ext_srcdir=$abs_srcdir/ext/xmlreader -+ -+ ext_builddir=ext/zip -+ ext_srcdir=$abs_srcdir/ext/zip ++ ext_builddir=ext/xmlwriter ++ ext_srcdir=$abs_srcdir/ext/xmlwriter ac_extra= if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_XMLREADER_SHARED=no -+ PHP_ZIP_SHARED=no ++ PHP_XMLWRITER_SHARED=no - case ext/xmlreader in -+ case ext/zip in ++ case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98887,7 +105422,7 @@ EOF +@@ -98887,7 +104152,7 @@ EOF old_IFS=$IFS - for ac_src in php_xmlreader.c; do -+ for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do ++ for ac_src in php_xmlwriter.c; do IFS=. set $ac_src -@@ -98910,18 +105445,18 @@ EOF +@@ -98910,18 +104175,18 @@ EOF done - EXT_STATIC="$EXT_STATIC xmlreader" -+ EXT_STATIC="$EXT_STATIC zip" ++ EXT_STATIC="$EXT_STATIC xmlwriter" if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC zip" ++ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_XMLREADER_SHARED=yes -+ PHP_ZIP_SHARED=yes ++ PHP_XMLWRITER_SHARED=yes - case ext/xmlreader in -+ case ext/zip in ++ case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98936,14 +105471,14 @@ EOF +@@ -98936,14 +104201,14 @@ EOF old_IFS=$IFS - for ac_src in php_xmlreader.c; do -+ for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do ++ for ac_src in php_xmlwriter.c; do IFS=. set $ac_src @@ -55193,207 +54592,179 @@ IFS=$old_IFS - shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" -+ shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo" ++ shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -98966,31 +105501,31 @@ EOF +@@ -98966,31 +104231,31 @@ EOF case $host_alias in *aix*) suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpzip.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(PHPZIP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpzip.so '$ext_builddir'/phpzip.so' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlwriter.so '$ext_builddir'/phpxmlwriter.so' ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZIP, 3)_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)' ;; *) suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(PHPZIP_SHARED_LIBADD)' ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpzip.$suffix" ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix" else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix" ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects<>Makefile.objects<&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -- -- fi -- --fi -- -- ++ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD" + + + else +@@ -99185,32 +104431,19 @@ else + fi + + -# Local macros for automake & autoconf - - @@ -55438,8 +54804,9 @@ - - - -- -- + ++php_with_xsl=no + - -php_with_xmlrpc=no - @@ -55449,41 +54816,41 @@ -if test "${with_xmlrpc+set}" = set; then - withval="$with_xmlrpc" - PHP_XMLRPC=$withval --else -- ++echo $ac_n "checking for XSL support""... $ac_c" 1>&6 ++echo "configure:104439: checking for XSL support" >&5 ++# Check whether --with-xsl or --without-xsl was given. ++if test "${with_xsl+set}" = set; then ++ withval="$with_xsl" ++ PHP_XSL=$withval + else + - PHP_XMLRPC=no - test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes ++ PHP_XSL=no ++ test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL + + fi + +@@ -99218,12 +104451,12 @@ fi + + ext_output="yes, shared" + ext_shared=yes -case $PHP_XMLRPC in --shared,*) ++case $PHP_XSL in + shared,*) - PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` -- ;; --shared) ++ PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'` + ;; + shared) - PHP_XMLRPC=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- ++ PHP_XSL=yes + ;; + no) + ext_output=no +@@ -99242,147 +104475,41 @@ echo "$ac_t""$ext_output" 1>&6 + + + -if test -z "$PHP_LIBXML_DIR"; then - -php_with_libxml_dir=no @@ -55556,7 +54923,8 @@ - - -if test "$PHP_XMLRPC" != "no"; then -- ++if test "$PHP_XSL" != "no"; then + - - am_i_shared=$PHP_XMLRPC_SHARED - is_it_shared=$PHP_LIBXML_SHARED @@ -55574,8 +54942,10 @@ -You've configured extension xmlrpc, which depends on extension libxml, -but you've either not enabled libxml, or have disabled it. -" 1>&2; exit 1; } -- fi -- ++ if test "$PHP_LIBXML" = "no"; then ++ { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + fi + - - PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" - @@ -55589,7 +54959,10 @@ - if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi -- ++ if test "$PHP_DOM" = "no"; then ++ { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } ++ fi + - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:99354: checking for xml2-config path" >&5 @@ -55600,10 +54973,13 @@ - for i in $PHP_LIBXML_DIR /usr/local /usr; do - if test -x "$i/bin/xml2-config"; then - ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -- ++ for i in $PHP_XSL /usr/local /usr; do ++ if test -x "$i/bin/xslt-config"; then ++ XSLT_CONFIG=$i/bin/xslt-config + break + fi + done + -fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 @@ -55611,166 +54987,362 @@ - if test -x "$ac_cv_php_xml2_config_path"; then - XML2_CONFIG="$ac_cv_php_xml2_config_path" - libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." ++ if test -z "$XSLT_CONFIG"; then ++ { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } ++ else ++ libxslt_full_version=`$XSLT_CONFIG --version` + ac_IFS=$IFS + IFS="." - set $libxml_full_version -- IFS=$ac_IFS ++ set $libxslt_full_version + IFS=$ac_IFS - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` - if test "$LIBXML_VERSION" -ge "2006011"; then - LIBXML_LIBS=`$XML2_CONFIG --libs` - LIBXML_INCS=`$XML2_CONFIG --cflags` -- ++ LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` ++ if test "$LIBXSLT_VERSION" -ge "1001000"; then ++ XSL_LIBS=`$XSLT_CONFIG --libs` ++ XSL_INCS=`$XSLT_CONFIG --cflags` + - for ac_i in $LIBXML_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then ++ for ac_i in $XSL_LIBS; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then ++ XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread" + else + + +@@ -99404,7 +104531,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then ++ XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" + else + + +@@ -99439,8 +104566,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + + + if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" - test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -- -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -- -- fi -- -- -- fi -- -- fi -- ++ XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" + else + + +@@ -99467,7 +104594,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + done + + +- for ac_i in $LIBXML_INCS; do ++ for ac_i in $XSL_INCS; do + case $ac_i in + -I*) + ac_ii=`echo $ac_i|cut -c 3-` +@@ -99502,81 +104629,359 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + + fi + - ;; - esac - done +- ++ ;; ++ esac ++ done ++ ++ ++ echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 ++echo "configure:104639: checking for EXSLT support" >&5 ++ for i in $PHP_XSL /usr/local /usr; do ++ if test -r "$i/include/libexslt/exslt.h"; then ++ PHP_XSL_EXSL_DIR=$i ++ break ++ fi ++ done ++ if test -z "$PHP_XSL_EXSL_DIR"; then ++ echo "$ac_t""not found" 1>&6 ++ else ++ echo "$ac_t""found" 1>&6 ++ ++ ++ if test "$ext_shared" = "yes"; then ++ XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD" ++ if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then ++ ++ if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ fi ++ else ++ ++ ++ if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then ++ ++ if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" ++ fi ++ ++ ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ ++ fi ++ ++ fi ++ ++ ++ case exslt in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lexslt $LIBS" ++ ;; ++ esac ++ ++ ++ ++ ++ fi ++ ++ ++ ++ if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then ++ ++ if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_XSL_EXSL_DIR/include ++ else ++ ++ ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`" ++ fi ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi ++ ++ fi ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_XSL_EXSLT 1 ++EOF ++ ++ fi ++ else ++ { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; } ++ fi ++ ++ ++ fi ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_XSL 1 ++EOF ++ ++ ++ ext_builddir=ext/xsl ++ ext_srcdir=$abs_srcdir/ext/xsl ++ ++ ac_extra= ++ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_XSL_SHARED=no ++ ++ ++ case ext/xsl in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac ++ ++ ++ ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo ++ ++ ++ old_IFS=$IFS ++ for ac_src in php_xsl.c xsltprocessor.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<>Makefile.objects</dev/null ; then -- ai_p=$ac_ii ++ + if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/zip.$suffix" - else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix" - fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" - -- ;; -- esac -- done ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxsl.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix" ++ fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" ++ + cat >>Makefile.objects<&6 -echo "configure:99512: checking whether libxml build works" >&5 @@ -55791,7 +55363,8 @@ - cat > conftest.$ac_ext <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then @@ -55811,106 +55380,104 @@ - LIBS=$old_LIBS - - php_cv_libxml_build_works=yes -+ -+ fi -+ fi -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_ZIP_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) - - +- +- -else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ case ext/zip in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- - LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - ++ ++ ;; ++ *) ++ ++ install_modules="install-modules" ++ ++ case $host_alias in ++ *aix*) ++ suffix=so ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(XSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xsl.so '$ext_builddir'/xsl.so' ++ ;; ++ *netware*) ++ suffix=nlm ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XSL, 3)_SHARED_LIBADD)' ++ ;; ++ *) ++ suffix=la ++ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(XSL_SHARED_LIBADD)' ++ ;; ++ esac ++ ++ if test "x" = "xyes"; then ++ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xsl.$suffix" ++ else ++ PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix" ++ fi -fi -rm -fr conftest* -fi ++ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" + -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo ++ cat >>Makefile.objects<&6 - if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ ;; + esac -+ -+ cat >>Makefile.objects<> confdefs.h <>Makefile.objects<" 1>&2; exit 1; } -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=zip - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ - fi +- +- fi ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo - else - testval=no @@ -55960,15 +55532,31 @@ - if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBEXPAT 1 --EOF -+ -+ -+ $php_shtool mkdir -p $ext_builddir/lib ++ ++ old_IFS=$IFS ++ for ac_src in php_xsl.c xsltprocessor.c; do + ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<> Makefile.fragments -+ -+fi -+ -+ -+ -+php_enable_http=no -+ -+echo $ac_n "checking whether to enable extended HTTP support""... $ac_c" 1>&6 -+echo "configure:105712: checking whether to enable extended HTTP support" >&5 -+# Check whether --enable-http or --disable-http was given. -+if test "${enable_http+set}" = set; then -+ enableval="$enable_http" -+ PHP_HTTP=$enableval -+else - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ PHP_HTTP=no -+ test "$PHP_ENABLE_ALL" && PHP_HTTP=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_HTTP in -+shared,*) -+ PHP_HTTP=`echo "$PHP_HTTP"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_HTTP=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+php_with_http_shared_deps=$PHP_HTTP -+ -+echo $ac_n "checking whether to depend on extensions which have been built shared""... $ac_c" 1>&6 -+echo "configure:105755: checking whether to depend on extensions which have been built shared" >&5 -+# Check whether --with-http-shared-deps or --without-http-shared-deps was given. -+if test "${with_http_shared_deps+set}" = set; then -+ withval="$with_http_shared_deps" -+ PHP_HTTP_SHARED_DEPS=$withval -+else - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then @@ -56063,21 +55594,21 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -+ PHP_HTTP_SHARED_DEPS=$PHP_HTTP ++ BUILD_DIR="$BUILD_DIR $ext_builddir" - fi -+fi - fi - - fi - +- - fi - else -- -+ext_output=$PHP_HTTP_SHARED_DEPS -+echo "$ac_t""$ext_output" 1>&6 ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=xsl + ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - if test -n "$i/$PHP_LIBDIR"; then - @@ -56091,44 +55622,13 @@ - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" -- fi + fi - - -+ -+ -+php_with_http_curl_requests=$PHP_HTTP -+ -+echo $ac_n "checking whether to enable cURL HTTP request support""... $ac_c" 1>&6 -+echo "configure:105777: checking whether to enable cURL HTTP request support" >&5 -+# Check whether --with-http-curl-requests or --without-http-curl-requests was given. -+if test "${with_http_curl_requests+set}" = set; then -+ withval="$with_http_curl_requests" -+ PHP_HTTP_CURL_REQUESTS=$withval -+else - -+ PHP_HTTP_CURL_REQUESTS=$PHP_HTTP - +- +- - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+fi -+ -+ -+ext_output=$PHP_HTTP_CURL_REQUESTS -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+php_with_http_curl_libevent=$PHP_HTTP_CURL_REQUESTS -+ -+echo $ac_n "checking whether to enable libevent support fur cURL""... $ac_c" 1>&6 -+echo "configure:105799: checking whether to enable libevent support fur cURL" >&5 -+# Check whether --with-http-curl-libevent or --without-http-curl-libevent was given. -+if test "${with_http_curl_libevent+set}" = set; then -+ withval="$with_http_curl_libevent" -+ PHP_HTTP_CURL_LIBEVENT=$withval -+else - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then @@ -56137,346 +55637,150 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -+ PHP_HTTP_CURL_LIBEVENT=$PHP_HTTP_CURL_REQUESTS - -- fi - -+fi - -- -- fi - -- fi -+ext_output=$PHP_HTTP_CURL_LIBEVENT -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+php_with_http_zlib_compression=$PHP_HTTP ++ PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD" + -+echo $ac_n "checking whether to enable zlib encodings support""... $ac_c" 1>&6 -+echo "configure:105821: checking whether to enable zlib encodings support" >&5 -+# Check whether --with-http-zlib-compression or --without-http-zlib-compression was given. -+if test "${with_http_zlib_compression+set}" = set; then -+ withval="$with_http_zlib_compression" -+ PHP_HTTP_ZLIB_COMPRESSION=$withval -+else -+ PHP_HTTP_ZLIB_COMPRESSION=$PHP_HTTP - -- case expat in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lexpat $LIBS" -- ;; -- esac - ++ am_i_shared=$PHP_XSL_SHARED ++ is_it_shared=$PHP_LIBXML_SHARED ++ is_it_enabled=$PHP_LIBXML ++ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then ++ { echo "configure: error: ++You've configured extension xsl to build statically, but it ++depends on extension libxml, which you've configured to build shared. ++You either need to build xsl shared or build libxml statically for the ++build to be successful. ++" 1>&2; exit 1; } ++ fi ++ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then ++ { echo "configure: error: ++You've configured extension xsl, which depends on extension libxml, ++but you've either not enabled libxml, or have disabled it. ++" 1>&2; exit 1; } + fi ++ +fi -+ext_output=$PHP_HTTP_ZLIB_COMPRESSION -+echo "$ac_t""$ext_output" 1>&6 - -- fi - - -- -- if test "$i/include" != "/usr/include"; then -- -- if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then -- ai_p=$i/include -- else -- -- ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" - -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$i/include\"`" - fi -- -+php_with_http_magic_mime="no" -+ -+echo $ac_n "checking whether to enable response content type guessing""... $ac_c" 1>&6 -+echo "configure:105843: checking whether to enable response content type guessing" >&5 -+# Check whether --with-http-magic-mime or --without-http-magic-mime was given. -+if test "${with_http_magic_mime+set}" = set; then -+ withval="$with_http_magic_mime" -+ PHP_HTTP_MAGIC_MIME=$withval -+else - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ PHP_HTTP_MAGIC_MIME="no" - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -+ -+fi -+ -+ -+ext_output=$PHP_HTTP_MAGIC_MIME -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_HTTP" != "no"; then -+ -+ -+ echo $ac_n "checking for egrep""... $ac_c" 1>&6 -+echo "configure:105866: checking for egrep" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_egrep" 1>&6 -+ EGREP=$ac_cv_prog_egrep -+ -+ -+ -+ -+ -+ echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 -+echo "configure:105884: checking for a sed that does not truncate output" >&5 -+if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if test -f "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi -- -+ done -+ done -+done -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break - fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+ -+fi -+ -+SED=$lt_cv_path_SED -+echo "$ac_t""$SED" 1>&6 +- fi +- ++php_enable_zip=no + -+ -+ -+ -+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:105943: checking how to run the C preprocessor" >&5 -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. -+ cat > conftest.$ac_ext < -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:105964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -E -traditional-cpp" -+ cat > conftest.$ac_ext < -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:105981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext < -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:105998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+ ac_cv_prog_CPP="$CPP" -+fi -+ CPP="$ac_cv_prog_CPP" ++echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 ++echo "configure:105115: checking for zip archive read/writesupport" >&5 ++# Check whether --enable-zip or --disable-zip was given. ++if test "${enable_zip+set}" = set; then ++ enableval="$enable_zip" ++ PHP_ZIP=$enableval +else -+ ac_cv_prog_CPP="$CPP" + +- case expat in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lexpat $LIBS" +- ;; +- esac ++ PHP_ZIP=no ++ test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL + +fi -+echo "$ac_t""$CPP" 1>&6 + + + +- fi ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_ZIP in ++shared,*) ++ PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_ZIP=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac + + +- +- if test "$i/include" != "/usr/include"; then +- +- if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then +- ai_p=$i/include +- else +- +- ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$i/include\"`" +- fi + +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi ++echo "$ac_t""$ext_output" 1>&6 - fi -+ -+ if test "$PHP_HTTP_SHARED_DEPS" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HTTP_SHARED_DEPS 1 -+EOF - testval=yes - break - fi - done -+ else -+ cat >> confdefs.h <<\EOF -+#define HTTP_SHARED_DEPS 0 -+EOF - if test "$testval" = "no"; then - { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } - fi - fi -+ fi -+ -+ -+ -+ -+ -+ if test "x$PHP_LIBDIR" = "x"; then -+ PHP_LIBDIR=lib -+ fi - if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then -+ for ac_hdr in netdb.h unistd.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:106047: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:106057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done ++if test -z "$PHP_ZLIB_DIR"; then ++ ++php_with_zlib_dir=no - if test "$PHP_ICONV_DIR" != "no"; then - PHP_ICONV=$PHP_ICONV_DIR - fi -- ++echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 ++echo "configure:105160: checking for the location of libz" >&5 ++# Check whether --with-zlib-dir or --without-zlib-dir was given. ++if test "${with_zlib_dir+set}" = set; then ++ withval="$with_zlib_dir" ++ PHP_ZLIB_DIR=$withval ++else + - if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then - PHP_ICONV=yes - fi -+ -+ unset ac_cv_func_gethostname -+ unset ac_cv_func___gethostname -+ unset found ++ PHP_ZLIB_DIR=no - - found_iconv=no - unset ICONV_DIR -- + - # Create the directories for a VPATH build: - $php_shtool mkdir -p ext/iconv -- ++fi + - echo > ext/iconv/php_have_bsd_iconv.h - echo > ext/iconv/php_have_ibm_iconv.h - echo > ext/iconv/php_have_glibc_iconv.h @@ -56486,158 +55790,205 @@ - echo > ext/iconv/php_iconv_aliased_libiconv.h - echo > ext/iconv/php_php_iconv_h_path.h - echo > ext/iconv/php_iconv_supports_errno.h -- + - if test "$PHP_ICONV" = "yes"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:99808: checking for iconv" >&5 -if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then -+ echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -+echo "configure:106089: checking for gethostname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 +-else +- cat > conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ +-#include +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ -char iconv(); -+char gethostname(); ++ext_output=$PHP_ZLIB_DIR ++echo "$ac_t""$ext_output" 1>&6 - int main() { +-int main() { - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ -#if defined (__stub_iconv) || defined (__stub___iconv) -+#if defined (__stub_gethostname) || defined (__stub___gethostname) - choke me - #else +-choke me +-#else -iconv(); -+gethostname(); - #endif +-#endif - ; return 0; } - EOF +-; return 0; } +-EOF -if { (eval echo configure:99836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +- rm -rf conftest* - eval "ac_cv_func_iconv=yes" -+ eval "ac_cv_func_gethostname=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - eval "ac_cv_func_iconv=no" -+ eval "ac_cv_func_gethostname=no" - fi - rm -f conftest* +-fi +-rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then -+if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- echo "$ac_t""yes" 1>&6 - - found_iconv=yes - -+ found=yes - else - echo "$ac_t""no" 1>&6 -- +-else +- echo "$ac_t""no" 1>&6 + - echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -echo "configure:99857: checking for libiconv" >&5 -if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then -+ echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 -+echo "configure:106135: checking for __gethostname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +- echo $ac_n "(cached) $ac_c" 1>&6 ++php_with_pcre_dir=no ++ ++echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 ++echo "configure:105184: checking pcre install prefix" >&5 ++# Check whether --with-pcre-dir or --without-pcre-dir was given. ++if test "${with_pcre_dir+set}" = set; then ++ withval="$with_pcre_dir" ++ PHP_PCRE_DIR=$withval else - cat > conftest.$ac_ext < conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ +-#include +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ -char libiconv(); -+char __gethostname(); ++ ++ PHP_PCRE_DIR=no ++ - int main() { +-int main() { ++fi - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ -#if defined (__stub_libiconv) || defined (__stub___libiconv) -+#if defined (__stub___gethostname) || defined (__stub_____gethostname) - choke me - #else +-choke me +-#else -libiconv(); -+__gethostname(); - #endif +-#endif - ; return 0; } - EOF +-; return 0; } +-EOF -if { (eval echo configure:99885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +- rm -rf conftest* - eval "ac_cv_func_libiconv=yes" -+ eval "ac_cv_func___gethostname=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - eval "ac_cv_func_libiconv=no" -+ eval "ac_cv_func___gethostname=no" - fi - rm -f conftest* - fi +-fi +-rm -f conftest* +-fi ++ext_output=$PHP_PCRE_DIR ++echo "$ac_t""$ext_output" 1>&6 -if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then -+if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then - echo "$ac_t""yes" 1>&6 +- echo "$ac_t""yes" 1>&6 - - - echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h -- + - cat >> confdefs.h <<\EOF -#define HAVE_LIBICONV 1 -EOF -- + - found_iconv=yes - -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no - fi -- -- -+ - fi +-else +- echo "$ac_t""no" 1>&6 +-fi + ++if test "$PHP_ZIP" != "no"; then ++ ++ if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then ++ if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then ++ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" ++ elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then ++ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" ++ else ++ { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } ++ fi ++ else ++ for i in /usr/local /usr; do ++ if test -f "$i/include/zlib/zlib.h"; then ++ PHP_ZLIB_DIR="$i" ++ PHP_ZLIB_INCDIR="$i/include/zlib" ++ elif test -f "$i/include/zlib.h"; then ++ PHP_ZLIB_DIR="$i" ++ PHP_ZLIB_INCDIR="$i/include" ++ fi ++ done ++ fi ++ ++ echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 ++echo "configure:105228: checking for the location of zlib" >&5 ++ if test "$PHP_ZLIB_DIR" = "no"; then ++ { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } ++ else ++ echo "$ac_t""$PHP_ZLIB_DIR" 1>&6 + +-fi + ++ if test "$ext_shared" = "yes"; then ++ ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" ++ if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then ++ ++ if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" + fi -- fi -- - if test "$found_iconv" = "no"; then ++ ++ if test "$ext_shared" = "yes"; then ++ ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD" ++ else ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi - for i in $PHP_ICONV /usr/local /usr; do - if test -r $i/include/giconv.h; then - cat >> confdefs.h <<\EOF -#define HAVE_GICONV_H 1 -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETHOSTNAME 1 - EOF +-EOF - ICONV_DIR=$i - iconv_lib_name=giconv @@ -56646,17 +55997,37 @@ - ICONV_DIR=$i - iconv_lib_name=iconv - break -- fi + fi - done -- ++ ++ fi + - if test -z "$ICONV_DIR"; then - { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } -- fi + fi - - if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || - test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME - then -- ++ else ++ ++ ++ if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then ++ ++ if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" ++ fi ++ ++ + - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" - -L$ICONV_DIR/$PHP_LIBDIR @@ -56664,7 +56035,7 @@ - - save_ext_shared=$ext_shared - ext_shared=yes -- + - for ac_i in $ac_stuff; do - case $ac_i in - -pthread) @@ -56672,21 +56043,34 @@ - LDFLAGS="$LDFLAGS -pthread" - else - -- + - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "EXTRA_LDFLAGS$unique=set" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ + fi + - fi - ;; - -l*) - ac_ii=`echo $ac_i|cut -c 3-` - -- ++ ++ ++ fi ++ ++ fi + - case $ac_ii in - c|c_r|pthread*) ;; - *) @@ -56694,174 +56078,489 @@ - LDFLAGS="$LDFLAGS -l$ac_ii" - else - -- + - case $ac_ii in -- c|c_r|pthread*) ;; -- *) ++ case z in + c|c_r|pthread*) ;; + *) - LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- ++ LIBS="-lz $LIBS" + ;; + esac + + - fi - ;; - esac -- -- + + - ;; - -L*) - ac_ii=`echo $ac_i|cut -c 3-` - - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- ++ fi ++ ++ + - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -- else -- ++ if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then ++ ++ if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_ZLIB_INCDIR + else + - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- ++ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`" + fi + + - if test "$ext_shared" = "yes"; then - LDFLAGS="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - - -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_func_gethostname=yes -+ ;; + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" -- ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi + - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -+ *) - -- fi -- -- +- + fi + ++ fi + - fi - -- fi -- + fi + - ;; - esac - done -- ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS=$INCLUDES ++ cat > conftest.$ac_ext <&6 -echo "configure:100041: checking for libiconv in -l$iconv_lib_name" >&5 -ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` -+ unset ac_cv_lib_nsl_gethostname -+ unset ac_cv_lib_nsl___gethostname -+ unset found -+ echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106201: checking for gethostname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++#include
++#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) ++yes ++#endif ++ ++EOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ egrep "yes" >/dev/null 2>&1; then ++ rm -rf conftest* ++ ++ PHP_PCRE_REGEX=yes ++ else - ac_save_LIBS="$LIBS" +- ac_save_LIBS="$LIBS" -LIBS="-l$iconv_lib_name $LIBS" -+LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < ++#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) ++yes ++#endif ++ EOF -if { (eval echo configure:100060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +- eval "ac_cv_lib_$ac_lib_var=yes" ++ ++ PHP_PCRE_REGEX=pecl ++ else -@@ -100071,1294 +106231,1580 @@ LIBS="$ac_save_LIBS" +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" ++ ++ PHP_PCRE_REGEX=no ++ fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- + rm -f conftest* +-LIBS="$ac_save_LIBS" + ++ + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++rm -f conftest* ++ ++ CPPFLAGS=$old_CPPFLAGS ++ ++ PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \ ++ lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c \ ++ lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \ ++ lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \ ++ lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \ ++ lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \ ++ lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \ ++ lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \ ++ lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \ ++ lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \ ++ lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \ ++ lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \ ++ lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \ ++ lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \ ++ lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \ ++ lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \ ++ lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \ ++ lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \ ++ lib/zip_error_clear.c lib/zip_file_error_clear.c" ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_ZIP 1 ++EOF ++ + - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- ++ ext_builddir=ext/zip ++ ext_srcdir=$abs_srcdir/ext/zip ++ ++ ac_extra= ++ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_ZIP_SHARED=no + - found_iconv=yes - - echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h -- ++ ++ case ext/zip in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac ++ ++ + - cat >> confdefs.h <<\EOF -#define HAVE_LIBICONV 1 -EOF -- ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo + - - echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h -- + - cat >> confdefs.h <<\EOF -#define ICONV_ALIASED_LIBICONV 1 --EOF -- -- -- -+ found=yes - else - echo "$ac_t""no" 1>&6 ++ old_IFS=$IFS ++ for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&6 - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - unset ac_cv_lib_$iconv_lib_name_libiconv - -- ++ b_c_pre=$shared_c_pre ++ b_cxx_pre=$shared_cxx_pre ++ b_c_meta=$shared_c_meta ++ b_cxx_meta=$shared_cxx_meta ++ b_c_post=$shared_c_post ++ b_cxx_post=$shared_cxx_post ++ b_lo=$shared_lo ++ ++ ++ old_IFS=$IFS ++ for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<> Makefile.fragments + - ;; - esac - done -- ++fi + - echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:100201: checking for iconv in -l$iconv_lib_name" >&5 -ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106240: checking for __gethostname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" -LIBS="-l$iconv_lib_name $LIBS" -+LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++ ++php_enable_http=no ++ ++echo $ac_n "checking whether to enable extended HTTP support""... $ac_c" 1>&6 ++echo "configure:105752: checking whether to enable extended HTTP support" >&5 ++# Check whether --enable-http or --disable-http was given. ++if test "${enable_http+set}" = set; then ++ enableval="$enable_http" ++ PHP_HTTP=$enableval else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -- --fi ++ ++ PHP_HTTP=no ++ test "$PHP_ENABLE_ALL" && PHP_HTTP=$PHP_ENABLE_ALL + + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ++ ++ ++ ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_HTTP in ++shared,*) ++ PHP_HTTP=`echo "$PHP_HTTP"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_HTTP=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac ++ ++ ++ ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++php_with_http_shared_deps=$PHP_HTTP ++ ++echo $ac_n "checking whether to depend on extensions which have been built shared""... $ac_c" 1>&6 ++echo "configure:105795: checking whether to depend on extensions which have been built shared" >&5 ++# Check whether --with-http-shared-deps or --without-http-shared-deps was given. ++if test "${with_http_shared_deps+set}" = set; then ++ withval="$with_http_shared_deps" ++ PHP_HTTP_SHARED_DEPS=$withval ++else + - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - - found_iconv=yes - -- ++ PHP_HTTP_SHARED_DEPS=$PHP_HTTP + -else - echo "$ac_t""no" 1>&6 -- + - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - unset ac_cv_lib_$iconv_lib_name_iconv - - --fi -- + fi + - - -fi -- + - fi - fi -- ++ext_output=$PHP_HTTP_SHARED_DEPS ++echo "$ac_t""$ext_output" 1>&6 + - if test "$found_iconv" = "yes"; then - - echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h -- + - cat >> confdefs.h <<\EOF -#define HAVE_ICONV 1 -EOF -- + - if test -n "$ICONV_DIR"; then - -- + - if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" - if test -n "$ICONV_DIR/$PHP_LIBDIR"; then @@ -57014,7 +56792,8 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" - fi -- ++php_with_http_curl_requests=$PHP_HTTP + - - if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" @@ -57024,7 +56803,14 @@ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++echo $ac_n "checking whether to enable cURL HTTP request support""... $ac_c" 1>&6 ++echo "configure:105817: checking whether to enable cURL HTTP request support" >&5 ++# Check whether --with-http-curl-requests or --without-http-curl-requests was given. ++if test "${with_http_curl_requests+set}" = set; then ++ withval="$with_http_curl_requests" ++ PHP_HTTP_CURL_REQUESTS=$withval ++else + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -57032,21 +56818,21 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- ++ PHP_HTTP_CURL_REQUESTS=$PHP_HTTP + - fi -- -- + ++fi + - fi - - fi -- + - fi - else - -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" ++ext_output=$PHP_HTTP_CURL_REQUESTS ++echo "$ac_t""$ext_output" 1>&6 - if test -n "$ICONV_DIR/$PHP_LIBDIR"; then - @@ -57061,21 +56847,24 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" - fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ ++ ++php_with_http_curl_libevent=$PHP_HTTP_CURL_REQUESTS ++ ++echo $ac_n "checking whether to enable libevent support fur cURL""... $ac_c" 1>&6 ++echo "configure:105839: checking whether to enable libevent support fur cURL" >&5 ++# Check whether --with-http-curl-libevent or --without-http-curl-libevent was given. ++if test "${with_http_curl_libevent+set}" = set; then ++ withval="$with_http_curl_libevent" ++ PHP_HTTP_CURL_LIBEVENT=$withval ++else + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -57083,84 +56872,76 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" ++ PHP_HTTP_CURL_LIBEVENT=$PHP_HTTP_CURL_REQUESTS - fi -+fi ++fi - - fi -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lnsl" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ LIBS=$ac_libs - fi +- fi ++ext_output=$PHP_HTTP_CURL_LIBEVENT ++echo "$ac_t""$ext_output" 1>&6 + -+ if test "$found" = "yes"; then -+ ++ ++ ++ ++php_with_http_zlib_compression=$PHP_HTTP ++ ++echo $ac_n "checking whether to enable zlib encodings support""... $ac_c" 1>&6 ++echo "configure:105861: checking whether to enable zlib encodings support" >&5 ++# Check whether --with-http-zlib-compression or --without-http-zlib-compression was given. ++if test "${with_http_zlib_compression+set}" = set; then ++ withval="$with_http_zlib_compression" ++ PHP_HTTP_ZLIB_COMPRESSION=$withval ++else + ++ PHP_HTTP_ZLIB_COMPRESSION=$PHP_HTTP -- - case $iconv_lib_name in -+ case nsl in - c|c_r|pthread*) ;; - *) +- c|c_r|pthread*) ;; +- *) - LIBS="-l$iconv_lib_name $LIBS" -+ LIBS="-lnsl $LIBS" - ;; - esac +- ;; +- esac ++fi -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETHOSTNAME 1 -+EOF -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBNSL 1 -+EOF ++ext_output=$PHP_HTTP_ZLIB_COMPRESSION ++echo "$ac_t""$ext_output" 1>&6 - fi -- -- + + - - if test "$ICONV_DIR/include" != "/usr/include"; then - - if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then - ai_p=$ICONV_DIR/include -+ ac_cv_func_gethostname=yes - else - +- else +- - ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" - fi -+ : - -+ fi ++php_with_http_magic_mime="no" ++ ++echo $ac_n "checking whether to enable response content type guessing""... $ac_c" 1>&6 ++echo "configure:105883: checking whether to enable response content type guessing" >&5 ++# Check whether --with-http-magic-mime or --without-http-magic-mime was given. ++if test "${with_http_magic_mime+set}" = set; then ++ withval="$with_http_magic_mime" ++ PHP_HTTP_MAGIC_MIME=$withval ++else - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ;; ++ PHP_HTTP_MAGIC_MIME="no" - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then @@ -57173,48 +56954,95 @@ - fi - - fi -+ esac - fi ++fi ++ ++ ++ext_output=$PHP_HTTP_MAGIC_MIME ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ + ++if test "$PHP_HTTP" != "no"; then ++ + -+ unset ac_cv_func_getdomainname -+ unset ac_cv_func___getdomainname -+ unset found -+ -+ echo $ac_n "checking for getdomainname""... $ac_c" 1>&6 -+echo "configure:106346: checking for getdomainname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_getdomainname'+set}'`\" = set"; then ++ echo $ac_n "checking for egrep""... $ac_c" 1>&6 ++echo "configure:105906: checking for egrep" >&5 ++if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char getdomainname(); - -- fi ++ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++ then ac_cv_prog_egrep='grep -E' ++ else ac_cv_prog_egrep='egrep' + fi - -else - { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } - - fi -+int main() { ++fi ++ ++echo "$ac_t""$ac_cv_prog_egrep" 1>&6 ++ EGREP=$ac_cv_prog_egrep ++ -- fi --fi -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_getdomainname) || defined (__stub___getdomainname) -+choke me -+#else -+getdomainname(); -+#endif ++ ++ ++ ++ echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 ++echo "configure:105924: checking for a sed that does not truncate output" >&5 ++if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ # Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for lt_ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if test -f "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++ fi ++ done ++ done ++done ++lt_ac_max=0 ++lt_ac_count=0 ++# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break + fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++ + fi -if test "$PHP_XMLRPC" = "yes"; then - # Extract the first word of "ranlib", so it can be a program name with args. @@ -57222,15 +57050,40 @@ -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:100410: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else ++SED=$lt_cv_path_SED ++echo "$ac_t""$SED" 1>&6 ++ ++ ++ ++ ++ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ++echo "configure:105983: checking how to run the C preprocessor" >&5 ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+; return 0; } ++ # This must be in double quotes, not single quotes, because CPP may get ++ # substituted into the Makefile and "${CC-cc}" will confuse make. ++ CPP="${CC-cc} -E" ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. ++ cat > conftest.$ac_ext < ++Syntax Error +EOF -+if { (eval echo configure:106374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_getdomainname=yes" ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:106004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" @@ -57243,45 +57096,149 @@ - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" ++ echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_func_getdomainname=no" ++ CPP="${CC-cc} -E -traditional-cpp" ++ cat > conftest.$ac_ext < ++Syntax Error ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:106021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ CPP="${CC-cc} -nologo -E" ++ cat > conftest.$ac_ext < ++Syntax Error ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:106038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ CPP=/lib/cpp ++fi ++rm -f conftest* ++fi ++rm -f conftest* ++fi ++rm -f conftest* ++ ac_cv_prog_CPP="$CPP" ++fi ++ CPP="$ac_cv_prog_CPP" ++else ++ ac_cv_prog_CPP="$CPP" ++fi ++echo "$ac_t""$CPP" 1>&6 ++ ++ ++ if test "$PHP_HTTP_SHARED_DEPS" != "no"; then ++ cat >> confdefs.h <<\EOF ++#define HTTP_SHARED_DEPS 1 ++EOF ++ ++ else ++ cat >> confdefs.h <<\EOF ++#define HTTP_SHARED_DEPS 0 ++EOF ++ ++ fi ++ ++ ++ ++ ++ ++ if test "x$PHP_LIBDIR" = "x"; then ++ PHP_LIBDIR=lib ++ fi ++ ++ for ac_hdr in netdb.h unistd.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:106087: checking for $ac_hdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:106097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" fi +rm -f conftest* fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -+ -+if eval "test \"`echo '$ac_cv_func_'getdomainname`\" = yes"; then ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ found=yes ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++ cat >> confdefs.h <&6 --fi -- + fi ++done + -echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:100438: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then -+ echo $ac_n "checking for __getdomainname""... $ac_c" 1>&6 -+echo "configure:106392: checking for __getdomainname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___getdomainname'+set}'`\" = set"; then ++ ++ unset ac_cv_func_gethostname ++ unset ac_cv_func___gethostname ++ unset found ++ ++ echo $ac_n "checking for gethostname""... $ac_c" 1>&6 ++echo "configure:106129: checking for gethostname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __getdomainname(); ++char gethostname(); int main() { -} $ac_kw foo() { @@ -57289,24 +57246,24 @@ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub___getdomainname) || defined (__stub_____getdomainname) ++#if defined (__stub_gethostname) || defined (__stub___gethostname) +choke me +#else -+__getdomainname(); ++gethostname(); +#endif + ; return 0; } EOF -if { (eval echo configure:100452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:106420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_c_inline=$ac_kw; break -+ eval "ac_cv_func___getdomainname=yes" ++ eval "ac_cv_func_gethostname=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_func___getdomainname=no" ++ eval "ac_cv_func_gethostname=no" fi rm -f conftest* -done @@ -57325,12 +57282,54 @@ -EOF - ;; -esac -- ++if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 ++echo "configure:106175: checking for __gethostname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __gethostname(); + - -- -- -- -+if eval "test \"`echo '$ac_cv_func_'__getdomainname`\" = yes"; then ++int main() { + ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub___gethostname) || defined (__stub_____gethostname) ++choke me ++#else ++__gethostname(); ++#endif + ++; return 0; } ++EOF ++if { (eval echo configure:106203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func___gethostname=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func___gethostname=no" ++fi ++rm -f conftest* ++fi + ++if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else @@ -57346,7 +57345,7 @@ + case $found in + yes) + cat >> confdefs.h <<\EOF -+#define HAVE_GETDOMAINNAME 1 ++#define HAVE_GETHOSTNAME 1 EOF - @@ -57354,17 +57353,17 @@ -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:100490: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then -+ ac_cv_func_getdomainname=yes ++ ac_cv_func_gethostname=yes + ;; + + *) + -+ unset ac_cv_lib_nsl_getdomainname -+ unset ac_cv_lib_nsl___getdomainname ++ unset ac_cv_lib_nsl_gethostname ++ unset ac_cv_lib_nsl___gethostname + unset found -+ echo $ac_n "checking for getdomainname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106458: checking for getdomainname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'getdomainname | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 ++echo "configure:106241: checking for gethostname in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -57373,7 +57372,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext < -#include @@ -57382,17 +57381,17 @@ +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char getdomainname(); ++char gethostname(); + +int main() { -+getdomainname() ++gethostname() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:100503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then -+if { (eval echo configure:106477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_header_stdc=yes + eval "ac_cv_lib_$ac_lib_var=yes" @@ -57416,9 +57415,9 @@ +else + echo "$ac_t""no" 1>&6 + -+ echo $ac_n "checking for __getdomainname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106497: checking for __getdomainname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'__getdomainname | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 ++echo "configure:106280: checking for __gethostname in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -57426,22 +57425,22 @@ +LIBS="-lnsl $LIBS" cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __getdomainname(); ++char __gethostname(); + +int main() { -+__getdomainname() ++__gethostname() +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -+if { (eval echo configure:106516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else @@ -57493,7 +57492,7 @@ else cat > conftest.$ac_ext < -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -57506,7 +57505,7 @@ +main() { return (0); } EOF -if { (eval echo configure:100570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:106552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - : + found=yes @@ -57541,7 +57540,7 @@ + + + cat >> confdefs.h <<\EOF -+#define HAVE_GETDOMAINNAME 1 ++#define HAVE_GETHOSTNAME 1 EOF -fi @@ -57555,7 +57554,7 @@ -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:100597: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ ac_cv_func_getdomainname=yes ++ ac_cv_func_gethostname=yes + else + + : @@ -57567,37 +57566,37 @@ + esac + + -+ unset ac_cv_func_getservbyport -+ unset ac_cv_func___getservbyport ++ unset ac_cv_func_getdomainname ++ unset ac_cv_func___getdomainname + unset found + -+ echo $ac_n "checking for getservbyport""... $ac_c" 1>&6 -+echo "configure:106603: checking for getservbyport" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_getservbyport'+set}'`\" = set"; then ++ echo $ac_n "checking for getdomainname""... $ac_c" 1>&6 ++echo "configure:106386: checking for getdomainname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_getdomainname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getservbyport(); below. */ ++ which can conflict with char getdomainname(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char getservbyport(); ++char getdomainname(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub_getservbyport) || defined (__stub___getservbyport) ++#if defined (__stub_getdomainname) || defined (__stub___getdomainname) +choke me +#else -+getservbyport(); ++getdomainname(); +#endif + +; return 0; } @@ -57606,23 +57605,23 @@ -{ (eval echo configure:100607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then -+if { (eval echo configure:106631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -+ eval "ac_cv_func_getservbyport=yes" ++ eval "ac_cv_func_getdomainname=yes" else - echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -+ eval "ac_cv_func_getservbyport=no" ++ eval "ac_cv_func_getdomainname=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + -+if eval "test \"`echo '$ac_cv_func_'getservbyport`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'getdomainname`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -+ echo $ac_n "checking for __getservbyport""... $ac_c" 1>&6 -+echo "configure:106649: checking for __getservbyport" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___getservbyport'+set}'`\" = set"; then ++ echo $ac_n "checking for __getdomainname""... $ac_c" 1>&6 ++echo "configure:106432: checking for __getdomainname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___getdomainname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __getservbyport(); ++char __getdomainname(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub___getservbyport) || defined (__stub_____getservbyport) ++#if defined (__stub___getdomainname) || defined (__stub_____getdomainname) +choke me +#else -+__getservbyport(); ++__getdomainname(); +#endif + +; return 0; } EOF - -+if { (eval echo configure:106677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_func___getservbyport=yes" ++ eval "ac_cv_func___getdomainname=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* -+ eval "ac_cv_func___getservbyport=no" ++ eval "ac_cv_func___getdomainname=no" +fi +rm -f conftest* +fi + -+if eval "test \"`echo '$ac_cv_func_'__getservbyport`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'__getdomainname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes else @@ -57687,38 +57686,38 @@ + case $found in + yes) + cat >> confdefs.h <<\EOF -+#define HAVE_GETSERVBYPORT 1 ++#define HAVE_GETDOMAINNAME 1 +EOF -+ ac_cv_func_getservbyport=yes ++ ac_cv_func_getdomainname=yes + ;; + + *) + -+ unset ac_cv_lib_nsl_getservbyport -+ unset ac_cv_lib_nsl___getservbyport ++ unset ac_cv_lib_nsl_getdomainname ++ unset ac_cv_lib_nsl___getdomainname + unset found -+ echo $ac_n "checking for getservbyport in -lnsl""... $ac_c" 1>&6 -+echo "configure:106715: checking for getservbyport in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'getservbyport | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for getdomainname in -lnsl""... $ac_c" 1>&6 ++echo "configure:106498: checking for getdomainname in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'getdomainname | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -57740,9 +57739,9 @@ -echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:100639: checking size of char" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then -+ echo $ac_n "checking for __getservbyport in -lnsl""... $ac_c" 1>&6 -+echo "configure:106754: checking for __getservbyport in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'__getservbyport | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for __getdomainname in -lnsl""... $ac_c" 1>&6 ++echo "configure:106537: checking for __getdomainname in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'__getdomainname | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -57754,7 +57753,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext < -#include @@ -57768,16 +57767,16 @@ +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __getservbyport(); ++char __getdomainname(); + +int main() { -+__getservbyport() ++__getdomainname() +; return 0; } EOF -if { (eval echo configure:100659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_char=`cat conftestval` -+if { (eval echo configure:106773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else @@ -57825,7 +57824,7 @@ else cat > conftest.$ac_ext < -#include @@ -57839,7 +57838,7 @@ +main() { return (0); } EOF -if { (eval echo configure:100700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:106809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - ac_cv_sizeof_int=`cat conftestval` + found=yes @@ -57872,17 +57871,14 @@ + + + cat >> confdefs.h <<\EOF -+#define HAVE_GETSERVBYPORT 1 - EOF - ++#define HAVE_GETDOMAINNAME 1 ++EOF ++ + cat >> confdefs.h <<\EOF +#define HAVE_LIBNSL 1 -+EOF + EOF --echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:100720: checking size of long" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then -+ ac_cv_func_getservbyport=yes ++ ac_cv_func_getdomainname=yes + else + + : @@ -57894,58 +57890,65 @@ + esac + + -+ unset ac_cv_func_getservbyname -+ unset ac_cv_func___getservbyname ++ unset ac_cv_func_getservbyport ++ unset ac_cv_func___getservbyport + unset found + -+ echo $ac_n "checking for getservbyname""... $ac_c" 1>&6 -+echo "configure:106860: checking for getservbyname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_getservbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long=4 --else - cat > conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long)); -- exit(0); --} ++ echo $ac_n "checking for getservbyport""... $ac_c" 1>&6 ++echo "configure:106643: checking for getservbyport" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_getservbyport'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char getservbyname(); ++char getservbyport(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub_getservbyname) || defined (__stub___getservbyname) ++#if defined (__stub_getservbyport) || defined (__stub___getservbyport) +choke me +#else -+getservbyname(); ++getservbyport(); +#endif -+ + +-echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:100720: checking size of long" >&5 +-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_long=4 +-else +- cat > conftest.$ac_ext < +-#include +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(long)); +- exit(0); +-} +; return 0; } EOF -if { (eval echo configure:100740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -+if { (eval echo configure:106888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_func_getservbyname=yes" ++ eval "ac_cv_func_getservbyport=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -57954,7 +57957,7 @@ -fi -rm -fr conftest* + rm -rf conftest* -+ eval "ac_cv_func_getservbyname=no" ++ eval "ac_cv_func_getservbyport=no" fi - +rm -f conftest* @@ -57969,21 +57972,21 @@ -echo "configure:100760: checking size of long long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -+if eval "test \"`echo '$ac_cv_func_'getservbyname`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'getservbyport`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_long=8 + echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __getservbyname""... $ac_c" 1>&6 -+echo "configure:106906: checking for __getservbyname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___getservbyname'+set}'`\" = set"; then ++ echo $ac_n "checking for __getservbyport""... $ac_c" 1>&6 ++echo "configure:106689: checking for __getservbyport" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___getservbyport'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -#include @@ -57995,22 +57998,22 @@ - exit(0); -} +/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char __getservbyname(); below. */ ++ which can conflict with char __getservbyport(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __getservbyname(); ++char __getservbyport(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -+#if defined (__stub___getservbyname) || defined (__stub_____getservbyname) ++#if defined (__stub___getservbyport) || defined (__stub_____getservbyport) +choke me +#else -+__getservbyname(); ++__getservbyport(); +#endif + +; return 0; } @@ -58018,22 +58021,22 @@ -if { (eval echo configure:100780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_long=`cat conftestval` -+if { (eval echo configure:106934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ eval "ac_cv_func___getservbyname=yes" ++ eval "ac_cv_func___getservbyport=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_long=0 + rm -rf conftest* -+ eval "ac_cv_func___getservbyname=no" ++ eval "ac_cv_func___getservbyport=no" fi -rm -fr conftest* +rm -f conftest* fi -+if eval "test \"`echo '$ac_cv_func_'__getservbyname`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'__getservbyport`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else @@ -58054,20 +58057,20 @@ + case $found in + yes) + cat >> confdefs.h <<\EOF -+#define HAVE_GETSERVBYNAME 1 ++#define HAVE_GETSERVBYPORT 1 +EOF + -+ ac_cv_func_getservbyname=yes ++ ac_cv_func_getservbyport=yes + ;; + + *) + -+ unset ac_cv_lib_nsl_getservbyname -+ unset ac_cv_lib_nsl___getservbyname ++ unset ac_cv_lib_nsl_getservbyport ++ unset ac_cv_lib_nsl___getservbyport + unset found -+ echo $ac_n "checking for getservbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106972: checking for getservbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'getservbyname | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for getservbyport in -lnsl""... $ac_c" 1>&6 ++echo "configure:106755: checking for getservbyport in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'getservbyport | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -58076,7 +58079,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext < -#if STDC_HEADERS @@ -58086,15 +58089,15 @@ +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char getservbyname(); ++char getservbyport(); + +int main() { -+getservbyname() ++getservbyport() +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+if { (eval echo configure:106991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_type_size_t=yes + eval "ac_cv_lib_$ac_lib_var=yes" @@ -58125,9 +58128,9 @@ -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:100833: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then -+ echo $ac_n "checking for __getservbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:107011: checking for __getservbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'__getservbyname | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for __getservbyport in -lnsl""... $ac_c" 1>&6 ++echo "configure:106794: checking for __getservbyport in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'__getservbyport | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -58136,7 +58139,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext < -#include @@ -58144,15 +58147,15 @@ +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -+char __getservbyname(); ++char __getservbyport(); + int main() { -struct tm *tp; -+__getservbyname() ++__getservbyport() ; return 0; } EOF -if { (eval echo configure:100847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:107030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_header_time=yes + eval "ac_cv_lib_$ac_lib_var=yes" @@ -58197,7 +58200,7 @@ else cat > conftest.$ac_ext < +main() { return (0); } @@ -58206,7 +58209,7 @@ - egrep "uid_t" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_uid_t=yes -+if { (eval echo configure:107066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes else @@ -58241,7 +58244,7 @@ + + + cat >> confdefs.h <<\EOF -+#define HAVE_GETSERVBYNAME 1 ++#define HAVE_GETSERVBYPORT 1 EOF - cat >> confdefs.h <<\EOF @@ -58251,109 +58254,62 @@ EOF -fi -+ ac_cv_func_getservbyname=yes ++ ac_cv_func_getservbyport=yes + else + + : -+ + + fi + + ;; + + esac -+ -+ -+ if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then -+ echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -+echo "configure:107114: checking for zlib.h" >&5 -+ ZLIB_DIR= -+ for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do -+ if test -f "$i/include/zlib.h"; then -+ ZLIB_DIR=$i -+ break; -+ fi -+ done -+ if test "x$ZLIB_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: could not find zlib.h" 1>&2; exit 1; } -+ else -+ echo "$ac_t""found in $ZLIB_DIR" 1>&6 -+ echo $ac_n "checking for zlib version >= 1.2.0.4""... $ac_c" 1>&6 -+echo "configure:107128: checking for zlib version >= 1.2.0.4" >&5 -+ ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'` -+ echo "$ac_t""$ZLIB_VERSION" 1>&6 -+ if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then -+ { echo "configure: error: libz version greater or equal to 1.2.0.4 required" 1>&2; exit 1; } -+ else -+ -+ if test "$ZLIB_DIR/include" != "/usr/include"; then -+ -+ if test -z "$ZLIB_DIR/include" || echo "$ZLIB_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$ZLIB_DIR/include -+ else -+ -+ ep_dir="`echo $ZLIB_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/include\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ fi - -+ ++ ++ unset ac_cv_func_getservbyname ++ unset ac_cv_func___getservbyname ++ unset found ++ ++ echo $ac_n "checking for getservbyname""... $ac_c" 1>&6 ++echo "configure:106900: checking for getservbyname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_getservbyname'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char getservbyname(); -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-lz $HTTP_SHARED_LIBADD" -+ if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then -+ -+ if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ZLIB_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" -+ fi ++int main() { -+ -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" -+ else -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_getservbyname) || defined (__stub___getservbyname) ++choke me ++#else ++getservbyname(); ++#endif ++; return 0; } ++EOF ++if { (eval echo configure:106928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_getservbyname=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_getservbyname=no" ++fi ++rm -f conftest* ++fi -# Standard XMLRPC list -for ac_func in \ @@ -58364,389 +58320,105 @@ -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:100913: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ fi -+ -+ fi -+ -+ fi -+ else -+ -+ -+ if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then -+ -+ if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ZLIB_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ -+ fi -+ -+ -+ -+ fi -+ -+ fi -+ -+ -+ case z in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lz $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_ZLIB 1 -+EOF -+ -+ fi -+ fi -+ fi -+ -+ if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then -+ echo $ac_n "checking for curl/curl.h""... $ac_c" 1>&6 -+echo "configure:107272: checking for curl/curl.h" >&5 -+ CURL_DIR= -+ for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do -+ if test -f "$i/include/curl/curl.h"; then -+ CURL_DIR=$i -+ break -+ fi -+ done -+ if test "x$CURL_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: could not find curl/curl.h" 1>&2; exit 1; } -+ else -+ echo "$ac_t""found in $CURL_DIR" 1>&6 -+ fi -+ -+ echo $ac_n "checking for curl-config""... $ac_c" 1>&6 -+echo "configure:107288: checking for curl-config" >&5 -+ CURL_CONFIG= -+ for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do -+ if test -x "$i"; then -+ CURL_CONFIG=$i -+ break -+ fi -+ done -+ if test "x$CURL_CONFIG" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: could not find curl-config" 1>&2; exit 1; } -+ else -+ echo "$ac_t""found: $CURL_CONFIG" 1>&6 -+ fi -+ -+ echo $ac_n "checking for curl version >= 7.12.3""... $ac_c" 1>&6 -+echo "configure:107304: checking for curl version >= 7.12.3" >&5 -+ CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[^0-9\.]//g'` -+ echo "$ac_t""$CURL_VERSION" 1>&6 -+ if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then -+ { echo "configure: error: libcurl version greater or equal to 7.12.3 required" 1>&2; exit 1; } -+ fi -+ -+ -+ save_INCLUDES="$INCLUDES" -+ INCLUDES= -+ save_LIBS="$LIBS" -+ LIBS= -+ save_CFLAGS="$CFLAGS" -+ CFLAGS=`$CURL_CONFIG --cflags` -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS=`$CURL_CONFIG --libs` -+ LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR" -+ -+ echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -+echo "configure:107323: checking for SSL support in libcurl" >&5 -+ CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` -+ if test "$CURL_SSL" = "SSL"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_SSL 1 -+EOF -+ -+ -+ echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 -+echo "configure:107333: checking for openssl support in libcurl" >&5 -+ if test "$cross_compiling" = yes; then -+ -+ echo "$ac_t""no" 1>&6 -+ ++if eval "test \"`echo '$ac_cv_func_'getservbyname`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes +else -+ cat > conftest.$ac_ext < -+ int main(int argc, char *argv[]) { -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); -+ } -+ return 1; -+ } -+ -+EOF -+if { (eval echo configure:107355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ echo "$ac_t""yes" 1>&6 -+ ac_safe=`echo "openssl/crypto.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for openssl/crypto.h""... $ac_c" 1>&6 -+echo "configure:107361: checking for openssl/crypto.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for __getservbyname""... $ac_c" 1>&6 ++echo "configure:106946: checking for __getservbyname" >&5 ++if eval "test \"`echo '$''{'ac_cv_func___getservbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -+#include -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:107371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_OPENSSL 1 -+EOF + cat > conftest.$ac_ext < + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char $ac_func(); ++char __getservbyname(); --int main() { -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi + int main() { --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else ++#if defined (__stub___getservbyname) || defined (__stub_____getservbyname) + choke me + #else -$ac_func(); --#endif -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ echo "$ac_t""no" 1>&6 -+ -+fi -+rm -fr conftest* -+fi ++__getservbyname(); + #endif --; return 0; } -+ -+ echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 -+echo "configure:107411: checking for gnutls support in libcurl" >&5 -+ if test "$cross_compiling" = yes; then -+ -+ echo "$ac_t""no" 1>&6 -+ -+else -+ cat > conftest.$ac_ext < -+ int main(int argc, char *argv[]) { -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); -+ } -+ return 1; -+ } -+ -+EOF -+if { (eval echo configure:107433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ echo "$ac_t""yes" 1>&6 -+ ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 -+echo "configure:107439: checking for gcrypt.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < + ; return 0; } EOF -if { (eval echo configure:100941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:107449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then ++if { (eval echo configure:106974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -+ eval "ac_cv_header_$ac_safe=yes" ++ eval "ac_cv_func___getservbyname=yes" else -+ echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -+ eval "ac_cv_header_$ac_safe=no" ++ eval "ac_cv_func___getservbyname=no" fi rm -f conftest* fi -- + -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'__getservbyname`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF -+#define HTTP_HAVE_GNUTLS 1 - EOF +-EOF - -+ -+ ++ found=yes else echo "$ac_t""no" 1>&6 ++found=no ++fi ++ fi -done - - - -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - +- - ext_builddir=ext/xmlrpc - ext_srcdir=$abs_srcdir/ext/xmlrpc -+ echo "$ac_t""no" 1>&6 -+ -+fi -+rm -fr conftest* -+fi - ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ -+ INCLUDES="$save_INCLUDES" -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ -+ -+ echo $ac_n "checking for bundled SSL CA info""... $ac_c" 1>&6 -+echo "configure:107498: checking for bundled SSL CA info" >&5 -+ CURL_CAINFO= -+ for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do -+ if test -f "$i"; then -+ CURL_CAINFO="$i" -+ break -+ fi -+ done -+ if test "x$CURL_CAINFO" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ else -+ echo "$ac_t""$CURL_CAINFO" 1>&6 -+ cat >> confdefs.h <> confdefs.h <<\EOF ++#define HAVE_GETSERVBYNAME 1 +EOF -+ -+ fi -+ -+ -+ if test "$CURL_DIR/include" != "/usr/include"; then -+ -+ if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$CURL_DIR/include -+ else -+ -+ ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`" -+ fi - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_XMLRPC_SHARED=no - - +- +- - case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ac_cv_func_getservbyname=yes ++ ;; -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - +- - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta @@ -58754,10 +58426,8 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -+ fi - -+ - +- +- - old_IFS=$IFS - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ - libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ @@ -58765,15 +58435,13 @@ - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ - libxmlrpc/xml_to_soap.c; do -- ++ *) + - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-lcurl $HTTP_SHARED_LIBADD" -+ if test -n "$CURL_DIR/$PHP_LIBDIR"; then - +- - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in @@ -58782,23 +58450,57 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -- ++ unset ac_cv_lib_nsl_getservbyname ++ unset ac_cv_lib_nsl___getservbyname ++ unset found ++ echo $ac_n "checking for getservbyname in -lnsl""... $ac_c" 1>&6 ++echo "configure:107012: checking for getservbyname in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'getservbyname | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lnsl $LIBS" ++cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 + - EXT_STATIC="$EXT_STATIC xmlrpc" - if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" - fi -+ if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$CURL_DIR/$PHP_LIBDIR - else +- else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_XMLRPC_SHARED=yes - @@ -58807,22 +58509,24 @@ - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ -+ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" -+ else -+ - - -- +- +- ++ echo $ac_n "checking for __getservbyname in -lnsl""... $ac_c" 1>&6 ++echo "configure:107051: checking for __getservbyname in -lnsl" >&5 ++ac_lib_var=`echo nsl'_'__getservbyname | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lnsl $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi + - old_IFS=$IFS - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ - libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ @@ -58839,7 +58566,6 @@ - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ - libxmlrpc/xml_to_soap.c; do -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - IFS=. - set $ac_src @@ -58847,18 +58573,29 @@ - IFS=$old_IFS - - shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" -- ++fi + - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -- + - cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ found=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ found=no ++fi ++rm -fr conftest* ++fi + - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" -- fi -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" -+ -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" - ++ LIBS=$ac_libs + fi +- - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" -- + - cat >>Makefile.objects<> confdefs.h <<\EOF ++#define HAVE_GETSERVBYNAME 1 + EOF - ;; - *) - - install_modules="install-modules" -+ fi -+ -+ fi ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBNSL 1 ++EOF - case $host_alias in - *aix*) @@ -58927,40 +58679,110 @@ - suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD)' - ;; -- esac -+ fi ++ ac_cv_func_getservbyname=yes + else + ++ : ++ ++ fi ++ ++ ;; ++ + esac - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" -+ if test -n "$CURL_DIR/$PHP_LIBDIR"; then -+ -+ if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then ++ echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 ++echo "configure:107154: checking for zlib.h" >&5 ++ ZLIB_DIR= ++ for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do ++ if test -f "$i/include/zlib.h"; then ++ ZLIB_DIR=$i ++ break; ++ fi ++ done ++ if test "x$ZLIB_DIR" = "x"; then ++ echo "$ac_t""not found" 1>&6 ++ { echo "configure: error: could not find zlib.h" 1>&2; exit 1; } ++ else ++ echo "$ac_t""found in $ZLIB_DIR" 1>&6 ++ echo $ac_n "checking for zlib version >= 1.2.0.4""... $ac_c" 1>&6 ++echo "configure:107168: checking for zlib version >= 1.2.0.4" >&5 ++ ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'` ++ echo "$ac_t""$ZLIB_VERSION" 1>&6 ++ if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then ++ { echo "configure: error: libz version greater or equal to 1.2.0.4 required" 1>&2; exit 1; } ++ else ++ ++ if test "$ZLIB_DIR/include" != "/usr/include"; then + -+ if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$CURL_DIR/$PHP_LIBDIR ++ if test -z "$ZLIB_DIR/include" || echo "$ZLIB_DIR/include" | grep '^/' >/dev/null ; then ++ ai_p=$ZLIB_DIR/include else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" + -+ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $ZLIB_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" ++ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/include\"`" fi -- ++ ++ + - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" -- ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi + - cat >>Makefile.objects</dev/null ; then ++ ai_p=$ZLIB_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" ++ fi + +- ;; +- esac +- cat >> confdefs.h <> confdefs.h </dev/null ; then ++ ai_p=$ZLIB_DIR/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" fi - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then @@ -58990,16 +58825,27 @@ - case "$PHP_SAPI" in - cgi|embed) - -- ++ ++ + - case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ fi ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" -- ++ fi + - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta @@ -59007,13 +58853,9 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -+ case curl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lcurl $LIBS" -+ ;; -+ esac ++ ++ fi - old_IFS=$IFS - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ @@ -59022,13 +58864,21 @@ - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ - libxmlrpc/xml_to_soap.c; do -- ++ fi + - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case z in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lz $LIBS" ++ ;; ++ esac - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -59042,34 +58892,150 @@ - $ac_comp -EOF - done -+ fi - EXT_STATIC="$EXT_STATIC xmlrpc" - ;; - *) -+ -+ for ac_i in `$CURL_CONFIG --libs`; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -pthread" -+ else - - +- +- - case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -- -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi ++ ++ ++ cat >> confdefs.h <<\EOF ++#define HTTP_HAVE_ZLIB 1 ++EOF ++ ++ fi ++ fi ++ fi ++ ++ if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then ++ echo $ac_n "checking for curl/curl.h""... $ac_c" 1>&6 ++echo "configure:107312: checking for curl/curl.h" >&5 ++ CURL_DIR= ++ for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do ++ if test -f "$i/include/curl/curl.h"; then ++ CURL_DIR=$i ++ break ++ fi ++ done ++ if test "x$CURL_DIR" = "x"; then ++ echo "$ac_t""not found" 1>&6 ++ { echo "configure: error: could not find curl/curl.h" 1>&2; exit 1; } ++ else ++ echo "$ac_t""found in $CURL_DIR" 1>&6 ++ fi ++ ++ echo $ac_n "checking for curl-config""... $ac_c" 1>&6 ++echo "configure:107328: checking for curl-config" >&5 ++ CURL_CONFIG= ++ for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do ++ if test -x "$i"; then ++ CURL_CONFIG=$i ++ break ++ fi ++ done ++ if test "x$CURL_CONFIG" = "x"; then ++ echo "$ac_t""not found" 1>&6 ++ { echo "configure: error: could not find curl-config" 1>&2; exit 1; } ++ else ++ echo "$ac_t""found: $CURL_CONFIG" 1>&6 ++ fi ++ ++ echo $ac_n "checking for curl version >= 7.12.3""... $ac_c" 1>&6 ++echo "configure:107344: checking for curl version >= 7.12.3" >&5 ++ CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[^0-9\.]//g'` ++ echo "$ac_t""$CURL_VERSION" 1>&6 ++ if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then ++ { echo "configure: error: libcurl version greater or equal to 7.12.3 required" 1>&2; exit 1; } ++ fi ++ ++ ++ save_INCLUDES="$INCLUDES" ++ INCLUDES= ++ save_LIBS="$LIBS" ++ LIBS= ++ save_CFLAGS="$CFLAGS" ++ CFLAGS=`$CURL_CONFIG --cflags` ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS=`$CURL_CONFIG --libs` ++ LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR" ++ ++ echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 ++echo "configure:107363: checking for SSL support in libcurl" >&5 ++ CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` ++ if test "$CURL_SSL" = "SSL"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HTTP_HAVE_SSL 1 ++EOF ++ ++ ++ echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 ++echo "configure:107373: checking for openssl support in libcurl" >&5 ++ if test "$cross_compiling" = yes; then ++ ++ echo "$ac_t""no" 1>&6 ++ ++else ++ cat > conftest.$ac_ext < ++ int main(int argc, char *argv[]) { ++ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); ++ if (data && data->ssl_version && *data->ssl_version) { ++ const char *ptr = data->ssl_version; ++ while(*ptr == ' ') ++ptr; ++ return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); ++ } ++ return 1; ++ } ++ ++EOF ++if { (eval echo configure:107395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + ++ echo "$ac_t""yes" 1>&6 ++ ac_safe=`echo "openssl/crypto.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for openssl/crypto.h""... $ac_c" 1>&6 ++echo "configure:107401: checking for openssl/crypto.h" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:107411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 + ++ cat >> confdefs.h <<\EOF ++#define HTTP_HAVE_OPENSSL 1 ++EOF - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre @@ -59078,8 +59044,23 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -- -- ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi + ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ++ echo "$ac_t""no" 1>&6 ++ ++fi ++rm -fr conftest* ++fi + - old_IFS=$IFS - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ - libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ @@ -59087,77 +59068,186 @@ - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ - libxmlrpc/xml_to_soap.c; do -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ ++ ++ echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 ++echo "configure:107451: checking for gnutls support in libcurl" >&5 ++ if test "$cross_compiling" = yes; then ++ ++ echo "$ac_t""no" 1>&6 ++ ++else ++ cat > conftest.$ac_ext < ++ int main(int argc, char *argv[]) { ++ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); ++ if (data && data->ssl_version && *data->ssl_version) { ++ const char *ptr = data->ssl_version; ++ while(*ptr == ' ') ++ptr; ++ return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); ++ } ++ return 1; ++ } ++ ++EOF ++if { (eval echo configure:107473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -l$ac_ii" -+ else - +- - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -- ++ echo "$ac_t""yes" 1>&6 ++ ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 ++echo "configure:107479: checking for gcrypt.h" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:107489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ++ cat >> confdefs.h <<\EOF ++#define HTTP_HAVE_GNUTLS 1 ++EOF + - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -- ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi + - cat >>Makefile.objects<&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac ++ echo "$ac_t""no" 1>&6 ++ ++fi ++rm -fr conftest* ++fi ++ else ++ echo "$ac_t""no" 1>&6 ++ fi ++ ++ INCLUDES="$save_INCLUDES" ++ LIBS="$save_LIBS" ++ CFLAGS="$save_CFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ ++ ++ echo $ac_n "checking for bundled SSL CA info""... $ac_c" 1>&6 ++echo "configure:107538: checking for bundled SSL CA info" >&5 ++ CURL_CAINFO= ++ for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do ++ if test -f "$i"; then ++ CURL_CAINFO="$i" ++ break ++ fi ++ done ++ if test "x$CURL_CAINFO" = "x"; then ++ echo "$ac_t""not found" 1>&6 ++ else ++ echo "$ac_t""$CURL_CAINFO" 1>&6 ++ cat >> confdefs.h </dev/null ; then ++ ai_p=$CURL_DIR/include ++ else ++ ++ ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`" + fi ++ ++ + ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + - BUILD_DIR="$BUILD_DIR $ext_builddir" - -+ fi -+ ;; -+ esac ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi ++ fi - if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=xmlrpc -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - +- - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii ++ + ++ if test "$ext_shared" = "yes"; then ++ HTTP_SHARED_LIBADD="-lcurl $HTTP_SHARED_LIBADD" ++ if test -n "$CURL_DIR/$PHP_LIBDIR"; then ++ ++ if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$CURL_DIR/$PHP_LIBDIR + else + -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" fi + @@ -59206,88 +59296,115 @@ - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } - fi -+ ;; -+ esac -+ done ++ fi ++ else ++ - - if test "$XMLRPC_DIR" != "/usr/include"; then -- ++ if test -n "$CURL_DIR/$PHP_LIBDIR"; then + - if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then - ai_p=$XMLRPC_DIR -- else -- ++ if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$CURL_DIR/$PHP_LIBDIR + else + - ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" -- fi -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_CURL 1 -+EOF ++ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" + fi -- -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes + ++ + -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" -- ++ eval "LIBPATH$unique=set" + - if test ""; then - INCLUDES="-I$ai_p $INCLUDES" - else - INCLUDES="$INCLUDES -I$ai_p" - fi -- -- fi -- ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ + + fi + + fi ++ ++ ++ case curl in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lcurl $LIBS" ++ ;; ++ esac ++ ++ ++ ++ ++ fi ++ + ++ ++ for ac_i in `$CURL_CONFIG --libs`; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi ++ fi +- if test "$ext_shared" = "yes"; then +- XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" +- if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` -+ + +- if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then + + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" ++ HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -l$ac_ii" + else + - ++ + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; + esac - -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" -- if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then ++ + + fi + ;; @@ -59297,8 +59414,7 @@ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` - -- if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then ++ + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then @@ -59319,12 +59435,12 @@ if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" - test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" else -@@ -101380,26 +107826,136 @@ echo "configure:101295: checking for XML +@@ -101380,26 +107765,88 @@ echo "configure:101295: checking for XML fi @@ -59332,59 +59448,11 @@ + esac + done + -+ echo $ac_n "checking for curl_share_strerror in -lcurl""... $ac_c" 1>&6 -+echo "configure:107835: checking for curl_share_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_share_strerror | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lcurl $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_SHARE_STRERROR 1 ++ cat >> confdefs.h <<\EOF ++#define HTTP_HAVE_CURL 1 +EOF + -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_share_strerror -+ -+ -+fi -+ ++ + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR @@ -59471,7 +59539,7 @@ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -101415,431 +107971,676 @@ echo "configure:101295: checking for XML +@@ -101415,431 +107862,676 @@ echo "configure:101295: checking for XML fi @@ -59494,28 +59562,28 @@ + esac + done -+ echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 -+echo "configure:107984: checking for curl_multi_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_share_strerror in -lcurl""... $ac_c" 1>&6 ++echo "configure:107875: checking for curl_share_strerror in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_share_strerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:107894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -59534,7 +59602,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_STRERROR 1 ++#define HAVE_CURL_SHARE_STRERROR 1 +EOF @@ -59546,7 +59614,7 @@ - ac_extra= + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_strerror ++ unset ac_cv_lib_curl_curl_share_strerror + + +fi @@ -59566,7 +59634,7 @@ - esac + save_ext_shared=$ext_shared + ext_shared=yes - ++ + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) @@ -59576,7 +59644,7 @@ + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" @@ -59726,21 +59794,21 @@ - *netware*) - - install_modules="install-modules" -+ echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 -+echo "configure:108133: checking for curl_easy_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 ++echo "configure:108024: checking for curl_multi_strerror in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -59793,7 +59861,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_EASY_STRERROR 1 ++#define HAVE_CURL_MULTI_STRERROR 1 EOF - ;; @@ -59820,7 +59888,7 @@ - esac + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_easy_strerror ++ unset ac_cv_lib_curl_curl_multi_strerror + + +fi @@ -59829,11 +59897,13 @@ - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" +- fi + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR + " -+ + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" + save_ext_shared=$ext_shared + ext_shared=yes + @@ -59851,9 +59921,7 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" ++ fi - cat >>Makefile.objects<&6 -+echo "configure:108282: checking for curl_easy_reset in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_easy_reset | sed 'y%./+-%__p_%'` ++ ++ echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 ++echo "configure:108173: checking for curl_easy_strerror in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:108192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -60007,44 +60055,56 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- EXT_STATIC="$EXT_STATIC xmlrpc" -- ;; -- *) -- -- -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac +- old_IFS=$IFS +- for ac_src in xmlrpc-epi-php.c; do +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac +- +- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_CURL_EASY_RESET 1 -+EOF -+ - ++#define HAVE_CURL_EASY_STRERROR 1 + EOF +- done + ++ +else + echo "$ac_t""no" 1>&6 -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo +- EXT_STATIC="$EXT_STATIC xmlrpc" +- ;; +- *) +- + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_easy_reset ++ unset ac_cv_lib_curl_curl_easy_strerror + -+ + +- case ext/xmlrpc in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +fi - ++ + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR @@ -60052,7 +60112,7 @@ + + save_ext_shared=$ext_shared + ext_shared=yes -+ + + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) @@ -60060,7 +60120,7 @@ + LDFLAGS="$LDFLAGS -pthread" + else + -+ + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" @@ -60069,6 +60129,15 @@ + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- +- - old_IFS=$IFS - for ac_src in xmlrpc-epi-php.c; do + fi @@ -60179,9 +60248,9 @@ -if test "${enable_xmlwriter+set}" = set; then - enableval="$enable_xmlwriter" - PHP_XMLWRITER=$enableval -+ echo $ac_n "checking for curl_formget in -lcurl""... $ac_c" 1>&6 -+echo "configure:108431: checking for curl_formget in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_formget | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_easy_reset in -lcurl""... $ac_c" 1>&6 ++echo "configure:108322: checking for curl_easy_reset in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_easy_reset | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else @@ -60191,18 +60260,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -60221,7 +60290,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_FORMGET 1 ++#define HAVE_CURL_EASY_RESET 1 +EOF + @@ -60248,7 +60317,7 @@ -esac + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_formget ++ unset ac_cv_lib_curl_curl_easy_reset + + +fi @@ -60365,27 +60434,27 @@ + esac + done -+ echo $ac_n "checking for curl_multi_setopt in -lcurl""... $ac_c" 1>&6 -+echo "configure:108580: checking for curl_multi_setopt in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_setopt | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_formget in -lcurl""... $ac_c" 1>&6 ++echo "configure:108471: checking for curl_formget in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_formget | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -60409,7 +60478,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_SETOPT 1 ++#define HAVE_CURL_FORMGET 1 +EOF @@ -60429,7 +60498,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_setopt ++ unset ac_cv_lib_curl_curl_formget + + fi @@ -60457,99 +60526,353 @@ + save_ext_shared=$ext_shared + ext_shared=yes + -+ for ac_i in $ac_stuff; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" -+ LDFLAGS="$LDFLAGS -pthread" - else - - -@@ -101861,7 +108662,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" ++ for ac_i in $ac_stuff; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then +- XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" ++ LDFLAGS="$LDFLAGS -pthread" + else + + +@@ -101861,7 +108553,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then +- XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" ++ LDFLAGS="$LDFLAGS -l$ac_ii" + else + + +@@ -101896,8 +108588,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + + + if test "$ext_shared" = "yes"; then +- XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + + +@@ -101923,13 +108615,115 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + esac + done + +- +- for ac_i in $LIBXML_INCS; do ++ echo $ac_n "checking for curl_multi_setopt in -lcurl""... $ac_c" 1>&6 ++echo "configure:108620: checking for curl_multi_setopt in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_multi_setopt | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lcurl $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ cat >> confdefs.h <<\EOF ++#define HAVE_CURL_MULTI_SETOPT 1 ++EOF ++ ++ ++else ++ echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_curl_curl_multi_setopt ++ ++ ++fi ++ ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ++ " ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do + case $ac_i in +- -I*) ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi ++ ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" - else ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) + ac_ii=`echo $ac_i|cut -c 3-` - -@@ -101896,8 +108697,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +- if test "$ac_ii" != "/usr/include"; then ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii +@@ -101942,481 +108736,290 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + fi - if test "$ext_shared" = "yes"; then -- XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" ++ if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - ++ else ++ ++ + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -101923,22 +108724,128 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi ++ eval "LIBPATH$unique=set" + ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ + fi + ++ ++ fi ++ + fi + + ;; esac done -- -- for ac_i in $LIBXML_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then +- +- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:101969: checking whether libxml build works" >&5 +-if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "checking for curl_multi_timeout in -lcurl""... $ac_c" 1>&6 -+echo "configure:108729: checking for curl_multi_timeout in -lcurl" >&5 ++echo "configure:108769: checking for curl_multi_timeout in -lcurl" >&5 +ac_lib_var=`echo curl'_'curl_multi_timeout | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- +- +- old_LIBS=$LIBS +- LIBS=" +- $XMLWRITER_SHARED_LIBADD +- $LIBS" +- if test "$cross_compiling" = yes; then +- +- LIBS=$old_LIBS +- +-else +- cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +-if { (eval echo configure:101996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- +- LIBS=$old_LIBS +- +- php_cv_libxml_build_works=yes +- +- ++if { (eval echo configure:108788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* +- +- LIBS=$old_LIBS +- +- echo "$ac_t""no" 1>&6 +- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } +- +- +-fi +-rm -fr conftest* + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ -+fi + +- +- + fi +- +-echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +- if test "$php_cv_libxml_build_works" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBXML 1 +-EOF +- +- fi +- +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF +-#define HAVE_XMLWRITER 1 +#define HAVE_CURL_MULTI_TIMEOUT 1 -+EOF -+ -+ + EOF + +- +- ext_builddir=ext/xmlwriter +- ext_srcdir=$abs_srcdir/ext/xmlwriter +- +- ac_extra= +- +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_XMLWRITER_SHARED=no +- +- +- case ext/xmlwriter in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +- + +else + echo "$ac_t""no" 1>&6 -+ + +- b_c_pre=$php_c_pre +- b_cxx_pre=$php_cxx_pre +- b_c_meta=$php_c_meta +- b_cxx_meta=$php_cxx_meta +- b_c_post=$php_c_post +- b_cxx_post=$php_cxx_post +- b_lo=$php_lo +- +- +- old_IFS=$IFS +- for ac_src in php_xmlwriter.c; do + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_curl_curl_multi_timeout + -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac +- +- cat >>Makefile.objects<&6 -+echo "configure:108789: checking for ext/$extname support" >&5 ++echo "configure:108829: checking for ext/$extname support" >&5 + if test -x "$PHP_EXECUTABLE"; then + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` + if test "$grepext" = "$extname"; then @@ -60572,7 +60895,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for event.h""... $ac_c" 1>&6 -+echo "configure:108803: checking for event.h" >&5 ++echo "configure:108843: checking for event.h" >&5 + EVENT_DIR= + for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do + if test -f "$i/include/event.h"; then @@ -60587,7 +60910,7 @@ + echo "$ac_t""found in $EVENT_DIR" 1>&6 + + echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6 -+echo "configure:108818: checking for libevent version, roughly" >&5 ++echo "configure:108858: checking for libevent version, roughly" >&5 + EVENT_VER="1.1b or lower" + if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then + if test -f "$EVENT_DIR/include/evrpc.h"; then @@ -60603,132 +60926,232 @@ + echo "$ac_t""$EVENT_VER" 1>&6 + + echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6 -+echo "configure:108834: checking for libcurl version >= 7.16.0" >&5 ++echo "configure:108874: checking for libcurl version >= 7.16.0" >&5 + echo "$ac_t""$CURL_VERSION" 1>&6 + if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then + echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2 + else + + if test "$EVENT_DIR/include" != "/usr/include"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii ++ + if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then + ai_p=$EVENT_DIR/include else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_XMLWRITER_SHARED=yes +- +- case ext/xmlwriter in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +- +- +- +- b_c_pre=$shared_c_pre +- b_cxx_pre=$shared_cxx_pre +- b_c_meta=$shared_c_meta +- b_cxx_meta=$shared_cxx_meta +- b_c_post=$shared_c_post +- b_cxx_post=$shared_cxx_post +- b_lo=$shared_lo +- ++ + ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`" - fi - - -@@ -101959,464 +108866,120 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - fi ++ fi -- ;; -- esac +- old_IFS=$IFS +- for ac_src in php_xmlwriter.c; do ++ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo" +- +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac +- +- cat >>Makefile.objects<&6 --echo "configure:101969: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else +- case $host_alias in +- *aix*) +- suffix=so +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlwriter.so '$ext_builddir'/phpxmlwriter.so' +- ;; +- *netware*) +- suffix=nlm +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)' +- ;; +- *) +- suffix=la +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD)' +- ;; +- esac +- +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" +- fi ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" +- +- cat >>Makefile.objects<>Makefile.objects<> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- LIBS=$old_LIBS -+ if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/$PHP_LIBDIR -+ else - -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -- --fi --rm -fr conftest* --fi -- -- -- --fi + +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 --EOF +- case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; +- esac - -- fi -- -- cat >> confdefs.h <<\EOF --#define HAVE_XMLWRITER 1 +- cat >>Makefile.objects</dev/null ; then ++ ai_p=$EVENT_DIR/$PHP_LIBDIR ++ else ++ + ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - -- ext_builddir=ext/xmlwriter -- ext_srcdir=$abs_srcdir/ext/xmlwriter -- -- ac_extra= ++ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`" + fi -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XMLWRITER_SHARED=no - +- EXT_STATIC="$EXT_STATIC xmlwriter" +- ;; +- *) ++ + if test "$ext_shared" = "yes"; then + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" + test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" + else -+ + - case ext/xmlwriter in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; @@ -60763,7 +61186,7 @@ - ac_obj=$1 - IFS=$old_IFS - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -60771,154 +61194,41 @@ - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -+ fi - +- - cat >>Makefile.objects<>Makefile.objects<>Makefile.objects</dev/null ; then + ai_p=$EVENT_DIR/$PHP_LIBDIR - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix" -- fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" -- -- cat >>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&2; exit 1; } - fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -- - fi + +- fi - -fi - @@ -61070,6 +61262,7 @@ - withval="$with_xsl" - PHP_XSL=$withval -else ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - PHP_XSL=no - test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL @@ -61102,13 +61295,24 @@ -echo "$ac_t""$ext_output" 1>&6 - - -- -- ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi + + -if test "$PHP_XSL" != "no"; then -- ++ ++ fi + - if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi + fi - if test "$PHP_DOM" = "no"; then - { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } @@ -61120,13 +61324,7 @@ - break - fi - done -+ case event in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-levent $LIBS" -+ ;; -+ esac - +- - if test -z "$XSLT_CONFIG"; then - { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } - else @@ -61141,6 +61339,14 @@ - XSL_INCS=`$XSLT_CONFIG --cflags` - - for ac_i in $XSL_LIBS; do ++ ++ case event in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-levent $LIBS" ++ ;; ++ esac ++ + + + @@ -61168,7 +61374,7 @@ else -@@ -102438,7 +109001,7 @@ if test "$PHP_XSL" != "no"; then +@@ -102438,7 +109041,7 @@ if test "$PHP_XSL" != "no"; then c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then @@ -61177,7 +61383,7 @@ else -@@ -102473,8 +109036,8 @@ if test "$PHP_XSL" != "no"; then +@@ -102473,8 +109076,8 @@ if test "$PHP_XSL" != "no"; then if test "$ext_shared" = "yes"; then @@ -61188,7 +61394,7 @@ else -@@ -102500,22 +109063,121 @@ if test "$PHP_XSL" != "no"; then +@@ -102500,22 +109103,121 @@ if test "$PHP_XSL" != "no"; then esac done @@ -61200,7 +61406,7 @@ - - if test "$ac_ii" != "/usr/include"; then + echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6 -+echo "configure:109068: checking for curl_multi_socket_action in -lcurl" >&5 ++echo "configure:109108: checking for curl_multi_socket_action in -lcurl" >&5 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -61208,7 +61414,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:109127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -61267,7 +61473,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for event.h""... $ac_c" 1>&6 -+echo "configure:109135: checking for event.h" >&5 ++echo "configure:109175: checking for event.h" >&5 + EVENT_DIR= + for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do + if test -f "$i/include/event.h"; then @@ -61282,7 +61488,7 @@ + echo "$ac_t""found in $EVENT_DIR" 1>&6 + + echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6 -+echo "configure:109150: checking for libevent version, roughly" >&5 ++echo "configure:109190: checking for libevent version, roughly" >&5 + EVENT_VER="1.1b or lower" + if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then + if test -f "$EVENT_DIR/include/evrpc.h"; then @@ -61298,7 +61504,7 @@ + echo "$ac_t""$EVENT_VER" 1>&6 + + echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6 -+echo "configure:109166: checking for libcurl version >= 7.16.0" >&5 ++echo "configure:109206: checking for libcurl version >= 7.16.0" >&5 + echo "$ac_t""$CURL_VERSION" 1>&6 + if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then + echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2 @@ -61321,7 +61527,7 @@ fi -@@ -102536,45 +109198,28 @@ if test "$PHP_XSL" != "no"; then +@@ -102536,45 +109238,28 @@ if test "$PHP_XSL" != "no"; then fi @@ -61377,7 +61583,7 @@ else -@@ -102600,18 +109245,18 @@ echo "configure:102546: checking for EXS +@@ -102600,18 +109285,18 @@ echo "configure:102546: checking for EXS else @@ -61402,11 +61608,10 @@ fi -@@ -102622,542 +109267,265 @@ echo "configure:102546: checking for EXS - +@@ -102623,541 +109308,264 @@ echo "configure:102546: checking for EXS cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" + eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" @@ -61808,7 +62013,6 @@ - enableval="$enable_zip" - PHP_ZIP=$enableval -else -+ eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" @@ -61981,7 +62185,7 @@ - withval="$with_pcre_dir" - PHP_PCRE_DIR=$withval + echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6 -+echo "configure:109400: checking for curl_multi_socket_action in -lcurl" >&5 ++echo "configure:109440: checking for curl_multi_socket_action in -lcurl" >&5 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -61992,7 +62196,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:109459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -62061,7 +62265,7 @@ - fi + if test "$PHP_HTTP_MAGIC_MIME" != "no"; then + echo $ac_n "checking for magic.h""... $ac_c" 1>&6 -+echo "configure:109462: checking for magic.h" >&5 ++echo "configure:109502: checking for magic.h" >&5 + MAGIC_DIR= + for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do + if test -f "$i/include/magic.h"; then @@ -62156,7 +62360,7 @@ else -@@ -103183,18 +109551,18 @@ echo "configure:103135: checking for the +@@ -103183,18 +109591,18 @@ echo "configure:103135: checking for the else @@ -62181,7 +62385,7 @@ fi -@@ -103220,10 +109588,10 @@ echo "configure:103135: checking for the +@@ -103220,10 +109628,10 @@ echo "configure:103135: checking for the fi @@ -62194,7 +62398,7 @@ ;; esac -@@ -103233,17 +109601,57 @@ echo "configure:103135: checking for the +@@ -103233,17 +109641,57 @@ echo "configure:103135: checking for the fi @@ -62209,7 +62413,7 @@ + haveext=$PHP_HASH + + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109616: checking for ext/$extname support" >&5 ++echo "configure:109656: checking for ext/$extname support" >&5 + if test -x "$PHP_EXECUTABLE"; then + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` + if test "$grepext" = "$extname"; then @@ -62217,7 +62421,7 @@ + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6 -+echo "configure:109624: checking for php_hash.h" >&5 ++echo "configure:109664: checking for php_hash.h" >&5 + HTTP_EXT_HASH_INCDIR= + for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do + if test -d $i; then @@ -62258,7 +62462,7 @@ fi -@@ -103264,97 +109672,160 @@ echo "configure:103135: checking for the +@@ -103264,97 +109712,160 @@ echo "configure:103135: checking for the fi @@ -62287,7 +62491,7 @@ + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6 -+echo "configure:109688: checking for php_hash.h" >&5 ++echo "configure:109728: checking for php_hash.h" >&5 + HTTP_EXT_HASH_INCDIR= + for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do + if test -d $i; then @@ -62406,7 +62610,7 @@ + haveext=$PHP_ICONV + + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109754: checking for ext/$extname support" >&5 ++echo "configure:109794: checking for ext/$extname support" >&5 + if test -x "$PHP_EXECUTABLE"; then + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` + if test "$grepext" = "$extname"; then @@ -62437,7 +62641,7 @@ + haveext=$PHP_SESSION + + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109782: checking for ext/$extname support" >&5 ++echo "configure:109822: checking for ext/$extname support" >&5 + if test -x "$PHP_EXECUTABLE"; then + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` + if test "$grepext" = "$extname"; then @@ -62492,7 +62696,7 @@ esac -@@ -103369,7 +109840,7 @@ EOF +@@ -103369,7 +109880,7 @@ EOF old_IFS=$IFS @@ -62501,7 +62705,7 @@ IFS=. set $ac_src -@@ -103392,18 +109863,18 @@ EOF +@@ -103392,18 +109903,18 @@ EOF done @@ -62526,7 +62730,7 @@ esac -@@ -103418,14 +109889,14 @@ EOF +@@ -103418,14 +109929,14 @@ EOF old_IFS=$IFS @@ -62543,7 +62747,7 @@ case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -103448,31 +109919,31 @@ EOF +@@ -103448,31 +109959,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -62584,7 +62788,7 @@ $link_cmd EOF -@@ -103485,31 +109956,31 @@ EOF +@@ -103485,31 +109996,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -62625,7 +62829,7 @@ $link_cmd EOF -@@ -103517,22 +109988,22 @@ EOF +@@ -103517,22 +110028,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:110114: checking whether to add a dependency on ext/$extname" >&5 ++echo "configure:110154: checking whether to add a dependency on ext/$extname" >&5 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then + echo "$ac_t""no" 1>&6 + @@ -62755,7 +62959,7 @@ + haveext=$HTTP_HAVE_EXT_ICONV + + echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6 -+echo "configure:110152: checking whether to add a dependency on ext/$extname" >&5 ++echo "configure:110192: checking whether to add a dependency on ext/$extname" >&5 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then + echo "$ac_t""no" 1>&6 + @@ -62793,7 +62997,7 @@ + haveext=$HTTP_HAVE_EXT_SESSION + + echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6 -+echo "configure:110190: checking whether to add a dependency on ext/$extname" >&5 ++echo "configure:110230: checking whether to add a dependency on ext/$extname" >&5 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then + echo "$ac_t""no" 1>&6 + @@ -62881,315 +63085,315 @@ fi -@@ -103656,7 +110273,7 @@ fi +@@ -103656,7 +110313,7 @@ fi php_enable_mysqlnd_compression_support=yes echo $ac_n "checking whether to enable compressed protocol support in mysqlnd""... $ac_c" 1>&6 -echo "configure:103660: checking whether to enable compressed protocol support in mysqlnd" >&5 -+echo "configure:110277: checking whether to enable compressed protocol support in mysqlnd" >&5 ++echo "configure:110317: checking whether to enable compressed protocol support in mysqlnd" >&5 # Check whether --enable-mysqlnd_compression_support or --disable-mysqlnd_compression_support was given. if test "${enable_mysqlnd_compression_support+set}" = set; then enableval="$enable_mysqlnd_compression_support" -@@ -103680,7 +110297,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -103680,7 +110337,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:103684: checking for the location of libz" >&5 -+echo "configure:110301: checking for the location of libz" >&5 ++echo "configure:110341: checking for the location of libz" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" -@@ -104047,7 +110664,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" | +@@ -104047,7 +110704,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" | for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6 -echo "configure:104051: checking whether $php_typename exists" >&5 -+echo "configure:110668: checking whether $php_typename exists" >&5 ++echo "configure:110708: checking whether $php_typename exists" >&5 php_cache_value=php_cv_sizeof_$php_typename if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then -@@ -104064,7 +110681,7 @@ else +@@ -104064,7 +110721,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -104094,7 +110711,7 @@ int main() +@@ -104094,7 +110751,7 @@ int main() } EOF -if { (eval echo configure:104098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:110715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:110755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -104234,7 +110851,7 @@ if test "$PHP_RECODE" != "no"; then +@@ -104234,7 +110891,7 @@ if test "$PHP_RECODE" != "no"; then done echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:104238: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 -+echo "configure:110855: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 ++echo "configure:110895: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -104242,7 +110859,7 @@ else +@@ -104242,7 +110899,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:110874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:110914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -104355,7 +110972,7 @@ fi +@@ -104355,7 +111012,7 @@ fi php_with_pear=DEFAULT echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 -echo "configure:104359: checking whether to install PEAR" >&5 -+echo "configure:110976: checking whether to install PEAR" >&5 ++echo "configure:111016: checking whether to install PEAR" >&5 # Check whether --with-pear or --without-pear was given. if test "${with_pear+set}" = set; then withval="$with_pear" -@@ -104457,7 +111074,7 @@ fi +@@ -104457,7 +111114,7 @@ fi bison_version=none if test "$YACC"; then echo $ac_n "checking for bison version""... $ac_c" 1>&6 -echo "configure:104461: checking for bison version" >&5 -+echo "configure:111078: checking for bison version" >&5 ++echo "configure:111118: checking for bison version" >&5 if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -104513,17 +111130,17 @@ dlfcn.h +@@ -104513,17 +111170,17 @@ dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:104517: checking for $ac_hdr" >&5 -+echo "configure:111134: checking for $ac_hdr" >&5 ++echo "configure:111174: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:104527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:111144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:111184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -104551,12 +111168,12 @@ done +@@ -104551,12 +111208,12 @@ done echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:104555: checking for size_t" >&5 -+echo "configure:111172: checking for size_t" >&5 ++echo "configure:111212: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -104584,12 +111201,12 @@ EOF +@@ -104584,12 +111241,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:104588: checking return type of signal handlers" >&5 -+echo "configure:111205: checking return type of signal handlers" >&5 ++echo "configure:111245: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -104606,7 +111223,7 @@ int main() { +@@ -104606,7 +111263,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:104610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:111267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else -@@ -104630,12 +111247,12 @@ EOF +@@ -104630,12 +111287,12 @@ EOF echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:104634: checking for uint" >&5 -+echo "configure:111251: checking for uint" >&5 ++echo "configure:111291: checking for uint" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -104663,12 +111280,12 @@ EOF +@@ -104663,12 +111320,12 @@ EOF fi echo $ac_n "checking for ulong""... $ac_c" 1>&6 -echo "configure:104667: checking for ulong" >&5 -+echo "configure:111284: checking for ulong" >&5 ++echo "configure:111324: checking for ulong" >&5 if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -104698,9 +111315,9 @@ fi +@@ -104698,9 +111355,9 @@ fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:104702: checking for int32_t" >&5 -+echo "configure:111319: checking for int32_t" >&5 ++echo "configure:111359: checking for int32_t" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:111380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <&6 -echo "configure:104742: checking for uint32_t" >&5 -+echo "configure:111359: checking for uint32_t" >&5 ++echo "configure:111399: checking for uint32_t" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:111420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <&6 -echo "configure:104782: checking for vprintf" >&5 -+echo "configure:111399: checking for vprintf" >&5 ++echo "configure:111439: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else -@@ -104830,12 +111447,12 @@ fi +@@ -104830,12 +111487,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:104834: checking for _doprnt" >&5 -+echo "configure:111451: checking for _doprnt" >&5 ++echo "configure:111491: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else -@@ -104883,7 +111500,7 @@ fi +@@ -104883,7 +111540,7 @@ fi fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:104887: checking for 8-bit clean memcmp" >&5 -+echo "configure:111504: checking for 8-bit clean memcmp" >&5 ++echo "configure:111544: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -104891,7 +111508,7 @@ else +@@ -104891,7 +111548,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:111522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:111562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else -@@ -104921,19 +111538,19 @@ test $ac_cv_func_memcmp_clean = no && LI +@@ -104921,19 +111578,19 @@ test $ac_cv_func_memcmp_clean = no && LI # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:104925: checking for working alloca.h" >&5 -+echo "configure:111542: checking for working alloca.h" >&5 ++echo "configure:111582: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -63197,355 +63401,355 @@ ; return 0; } EOF -if { (eval echo configure:104937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else -@@ -104954,12 +111571,12 @@ EOF +@@ -104954,12 +111611,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:104958: checking for alloca" >&5 -+echo "configure:111575: checking for alloca" >&5 ++echo "configure:111615: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else -@@ -105019,12 +111636,12 @@ EOF +@@ -105019,12 +111676,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:105023: checking whether alloca needs Cray hooks" >&5 -+echo "configure:111640: checking whether alloca needs Cray hooks" >&5 ++echo "configure:111680: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 +@@ -105049,12 +111706,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:105053: checking for $ac_func" >&5 -+echo "configure:111670: checking for $ac_func" >&5 ++echo "configure:111710: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -105104,7 +111721,7 @@ done +@@ -105104,7 +111761,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:105108: checking stack direction for C alloca" >&5 -+echo "configure:111725: checking stack direction for C alloca" >&5 ++echo "configure:111765: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -105112,7 +111729,7 @@ else +@@ -105112,7 +111769,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:111752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:111792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else -@@ -105155,12 +111772,12 @@ fi +@@ -105155,12 +111812,12 @@ fi for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:105159: checking for $ac_func" >&5 -+echo "configure:111776: checking for $ac_func" >&5 ++echo "configure:111816: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -105209,7 +111826,7 @@ done +@@ -105209,7 +111866,7 @@ done echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 -echo "configure:105213: checking whether sprintf is broken" >&5 -+echo "configure:111830: checking whether sprintf is broken" >&5 ++echo "configure:111870: checking whether sprintf is broken" >&5 if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -105220,11 +111837,11 @@ else +@@ -105220,11 +111877,11 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:111845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:111885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_broken_sprintf=no -@@ -105258,12 +111875,12 @@ EOF +@@ -105258,12 +111915,12 @@ EOF for ac_func in finite isfinite isinf isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:105262: checking for $ac_func" >&5 -+echo "configure:111879: checking for $ac_func" >&5 ++echo "configure:111919: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -105313,13 +111930,13 @@ done +@@ -105313,13 +111970,13 @@ done echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 -echo "configure:105317: checking whether fp_except is defined" >&5 -+echo "configure:111934: checking whether fp_except is defined" >&5 ++echo "configure:111974: checking whether fp_except is defined" >&5 if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -105330,7 +111947,7 @@ fp_except x = (fp_except) 0; +@@ -105330,7 +111987,7 @@ fp_except x = (fp_except) 0; ; return 0; } EOF -if { (eval echo configure:105334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:111991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_fp_except=yes -@@ -105357,9 +111974,9 @@ EOF +@@ -105357,9 +112014,9 @@ EOF echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6 -echo "configure:105361: checking for usable _FPU_SETCW" >&5 -+echo "configure:111978: checking for usable _FPU_SETCW" >&5 ++echo "configure:112018: checking for usable _FPU_SETCW" >&5 cat > conftest.$ac_ext < -@@ -105379,7 +111996,7 @@ int main() { +@@ -105379,7 +112036,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:105383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have__fpu_setcw=yes else -@@ -105400,9 +112017,9 @@ EOF +@@ -105400,9 +112057,9 @@ EOF fi echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6 -echo "configure:105404: checking for usable fpsetprec" >&5 -+echo "configure:112021: checking for usable fpsetprec" >&5 ++echo "configure:112061: checking for usable fpsetprec" >&5 cat > conftest.$ac_ext < -@@ -105421,7 +112038,7 @@ int main() { +@@ -105421,7 +112078,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:105425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have_fpsetprec=yes else -@@ -105442,9 +112059,9 @@ EOF +@@ -105442,9 +112099,9 @@ EOF fi echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6 -echo "configure:105446: checking for usable _controlfp" >&5 -+echo "configure:112063: checking for usable _controlfp" >&5 ++echo "configure:112103: checking for usable _controlfp" >&5 cat > conftest.$ac_ext < -@@ -105463,7 +112080,7 @@ int main() { +@@ -105463,7 +112120,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:105467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have__controlfp=yes else -@@ -105484,9 +112101,9 @@ EOF +@@ -105484,9 +112141,9 @@ EOF fi echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6 -echo "configure:105488: checking for usable _controlfp_s" >&5 -+echo "configure:112105: checking for usable _controlfp_s" >&5 ++echo "configure:112145: checking for usable _controlfp_s" >&5 cat > conftest.$ac_ext < -@@ -105506,7 +112123,7 @@ int main() { +@@ -105506,7 +112163,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:105510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have__controlfp_s=yes else -@@ -105527,9 +112144,9 @@ EOF +@@ -105527,9 +112184,9 @@ EOF fi echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6 -echo "configure:105531: checking whether FPU control word can be manipulated by inline assembler" >&5 -+echo "configure:112148: checking whether FPU control word can be manipulated by inline assembler" >&5 ++echo "configure:112188: checking whether FPU control word can be manipulated by inline assembler" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have_fpu_inline_asm_x86=yes else -@@ -105573,7 +112190,7 @@ EOF +@@ -105573,7 +112230,7 @@ EOF echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6 -echo "configure:105577: checking whether double cast to long preserves least significant bits" >&5 -+echo "configure:112194: checking whether double cast to long preserves least significant bits" >&5 ++echo "configure:112234: checking whether double cast to long preserves least significant bits" >&5 if test "$cross_compiling" = yes; then -@@ -105581,7 +112198,7 @@ if test "$cross_compiling" = yes; then +@@ -105581,7 +112238,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -105605,7 +112222,7 @@ int main() +@@ -105605,7 +112262,7 @@ int main() } EOF -if { (eval echo configure:105609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:112266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF -@@ -105631,17 +112248,17 @@ for ac_hdr in dlfcn.h +@@ -105631,17 +112288,17 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:105635: checking for $ac_hdr" >&5 -+echo "configure:112252: checking for $ac_hdr" >&5 ++echo "configure:112292: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:105645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:112262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:112302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -105669,14 +112286,14 @@ done +@@ -105669,14 +112326,14 @@ done echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6 -echo "configure:105673: checking whether dlsym() requires a leading underscore in symbol names" >&5 -+echo "configure:112290: checking whether dlsym() requires a leading underscore in symbol names" >&5 ++echo "configure:112330: checking whether dlsym() requires a leading underscore in symbol names" >&5 if test "$cross_compiling" = yes; then : else @@ -63553,54 +63757,54 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:112360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:112400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -105822,23 +112439,23 @@ fi +@@ -105822,23 +112479,23 @@ fi echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6 -echo "configure:105826: checking virtual machine dispatch method" >&5 -+echo "configure:112443: checking virtual machine dispatch method" >&5 ++echo "configure:112483: checking virtual machine dispatch method" >&5 echo "$ac_t""$PHP_ZEND_VM" 1>&6 echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6 -echo "configure:105830: checking whether to enable thread-safety" >&5 -+echo "configure:112447: checking whether to enable thread-safety" >&5 ++echo "configure:112487: checking whether to enable thread-safety" >&5 echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6 echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6 -echo "configure:105834: checking whether to enable inline optimization for GCC" >&5 -+echo "configure:112451: checking whether to enable inline optimization for GCC" >&5 ++echo "configure:112491: checking whether to enable inline optimization for GCC" >&5 echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 -echo "configure:105838: checking whether to enable Zend debugging" >&5 -+echo "configure:112455: checking whether to enable Zend debugging" >&5 ++echo "configure:112495: checking whether to enable Zend debugging" >&5 echo "$ac_t""$ZEND_DEBUG" 1>&6 echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6 -echo "configure:105842: checking whether to enable Zend multibyte" >&5 -+echo "configure:112459: checking whether to enable Zend multibyte" >&5 ++echo "configure:112499: checking whether to enable Zend multibyte" >&5 echo "$ac_t""$ZEND_MULTIBYTE" 1>&6 case $PHP_ZEND_VM in -@@ -105911,21 +112528,21 @@ fi +@@ -105911,21 +112568,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:105915: checking for inline" >&5 -+echo "configure:112532: checking for inline" >&5 ++echo "configure:112572: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -63608,7 +63812,7 @@ for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:112546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:112586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else -@@ -105954,7 +112571,7 @@ esac +@@ -105954,7 +112611,7 @@ esac echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6 -echo "configure:105958: checking target system is Darwin" >&5 -+echo "configure:112575: checking target system is Darwin" >&5 ++echo "configure:112615: checking target system is Darwin" >&5 if echo "$target" | grep "darwin" > /dev/null; then cat >> confdefs.h <<\EOF #define DARWIN 1 -@@ -105966,7 +112583,7 @@ else +@@ -105966,7 +112623,7 @@ else fi echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6 -echo "configure:105970: checking for MM alignment and log values" >&5 -+echo "configure:112587: checking for MM alignment and log values" >&5 ++echo "configure:112627: checking for MM alignment and log values" >&5 if test "$cross_compiling" = yes; then -@@ -105974,7 +112591,7 @@ if test "$cross_compiling" = yes; then +@@ -105974,7 +112631,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106010,7 +112627,7 @@ int main() +@@ -106010,7 +112667,7 @@ int main() } EOF -if { (eval echo configure:106014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:112671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1` -@@ -106035,7 +112652,7 @@ fi +@@ -106035,7 +112692,7 @@ fi echo "$ac_t""done" 1>&6 echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6 -echo "configure:106039: checking for memory allocation using mmap(MAP_ANON)" >&5 -+echo "configure:112656: checking for memory allocation using mmap(MAP_ANON)" >&5 ++echo "configure:112696: checking for memory allocation using mmap(MAP_ANON)" >&5 if test "$cross_compiling" = yes; then -@@ -106043,7 +112660,7 @@ if test "$cross_compiling" = yes; then +@@ -106043,7 +112700,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106079,7 +112696,7 @@ int main() +@@ -106079,7 +112736,7 @@ int main() } EOF -if { (eval echo configure:106083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:112740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF -@@ -106101,7 +112718,7 @@ fi +@@ -106101,7 +112758,7 @@ fi echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6 -echo "configure:106105: checking for memory allocation using mmap("/dev/zero")" >&5 -+echo "configure:112722: checking for memory allocation using mmap("/dev/zero")" >&5 ++echo "configure:112762: checking for memory allocation using mmap("/dev/zero")" >&5 if test "$cross_compiling" = yes; then -@@ -106109,7 +112726,7 @@ if test "$cross_compiling" = yes; then +@@ -106109,7 +112766,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106155,7 +112772,7 @@ int main() +@@ -106155,7 +112812,7 @@ int main() } EOF -if { (eval echo configure:106159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:112816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF -@@ -106179,12 +112796,12 @@ fi +@@ -106179,12 +112836,12 @@ fi for ac_func in mremap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:106183: checking for $ac_func" >&5 -+echo "configure:112800: checking for $ac_func" >&5 ++echo "configure:112840: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -106274,17 +112891,17 @@ for ac_hdr in stdarg.h +@@ -106274,17 +112931,17 @@ for ac_hdr in stdarg.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:106278: checking for $ac_hdr" >&5 -+echo "configure:112895: checking for $ac_hdr" >&5 ++echo "configure:112935: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:106288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:112905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:112945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -106361,7 +112978,7 @@ if test "$TSRM_PTH" != "no"; then +@@ -106361,7 +113018,7 @@ if test "$TSRM_PTH" != "no"; then echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 -echo "configure:106365: checking for GNU Pth" >&5 -+echo "configure:112982: checking for GNU Pth" >&5 ++echo "configure:113022: checking for GNU Pth" >&5 PTH_PREFIX="`$TSRM_PTH --prefix`" if test -z "$PTH_PREFIX"; then echo "$ac_t""Please check your Pth installation" 1>&6 -@@ -106391,17 +113008,17 @@ elif test "$TSRM_ST" != "no"; then +@@ -106391,17 +113048,17 @@ elif test "$TSRM_ST" != "no"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:106395: checking for $ac_hdr" >&5 -+echo "configure:113012: checking for $ac_hdr" >&5 ++echo "configure:113052: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:106405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:113022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:113062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -106431,7 +113048,7 @@ done +@@ -106431,7 +113088,7 @@ done LIBS="$LIBS -lst" echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6 -echo "configure:106435: checking for SGI's State Threads" >&5 -+echo "configure:113052: checking for SGI's State Threads" >&5 ++echo "configure:113092: checking for SGI's State Threads" >&5 echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF #define TSRM_ST 1 -@@ -106470,7 +113087,7 @@ if test "$cross_compiling" = yes; then +@@ -106470,7 +113127,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106488,7 +113105,7 @@ int main() { +@@ -106488,7 +113145,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:106492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -106508,7 +113125,7 @@ fi +@@ -106508,7 +113165,7 @@ fi CFLAGS=$save_CFLAGS echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:106512: checking for pthreads_cflags" >&5 -+echo "configure:113129: checking for pthreads_cflags" >&5 ++echo "configure:113169: checking for pthreads_cflags" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -106530,7 +113147,7 @@ if test "$cross_compiling" = yes; then +@@ -106530,7 +113187,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106548,7 +113165,7 @@ int main() { +@@ -106548,7 +113205,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:106552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -106578,7 +113195,7 @@ fi +@@ -106578,7 +113235,7 @@ fi echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:106582: checking for pthreads_lib" >&5 -+echo "configure:113199: checking for pthreads_lib" >&5 ++echo "configure:113239: checking for pthreads_lib" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -106600,7 +113217,7 @@ if test "$cross_compiling" = yes; then +@@ -106600,7 +113257,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106618,7 +113235,7 @@ int main() { +@@ -106618,7 +113275,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:106622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -106669,7 +113286,7 @@ EOF +@@ -106669,7 +113326,7 @@ EOF echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 -echo "configure:106673: checking for POSIX threads" >&5 -+echo "configure:113290: checking for POSIX threads" >&5 ++echo "configure:113330: checking for POSIX threads" >&5 echo "$ac_t""yes" 1>&6 fi -@@ -107305,7 +113922,7 @@ fi +@@ -107305,7 +113962,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:107309: checking build system type" >&5 -+echo "configure:113926: checking build system type" >&5 ++echo "configure:113966: checking build system type" >&5 build_alias=$build case "$build_alias" in -@@ -107334,7 +113951,7 @@ ac_prog=ld +@@ -107334,7 +113991,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 -echo "configure:107338: checking for ld used by $CC" >&5 -+echo "configure:113955: checking for ld used by $CC" >&5 ++echo "configure:113995: checking for ld used by $CC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -107364,10 +113981,10 @@ echo "configure:107338: checking for ld +@@ -107364,10 +114021,10 @@ echo "configure:107338: checking for ld esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:107368: checking for GNU ld" >&5 -+echo "configure:113985: checking for GNU ld" >&5 ++echo "configure:114025: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:107371: checking for non-GNU ld" >&5 -+echo "configure:113988: checking for non-GNU ld" >&5 ++echo "configure:114028: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -107406,7 +114023,7 @@ else +@@ -107406,7 +114063,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:107410: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:114027: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:114067: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107426,7 +114043,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld +@@ -107426,7 +114083,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:107430: checking for $LD option to reload object files" >&5 -+echo "configure:114047: checking for $LD option to reload object files" >&5 ++echo "configure:114087: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107451,7 +114068,7 @@ case $host_os in +@@ -107451,7 +114108,7 @@ case $host_os in esac echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:107455: checking for BSD-compatible nm" >&5 -+echo "configure:114072: checking for BSD-compatible nm" >&5 ++echo "configure:114112: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107504,7 +114121,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6 +@@ -107504,7 +114161,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6 NM="$lt_cv_path_NM" echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6 -echo "configure:107508: checking how to recognize dependent libraries" >&5 -+echo "configure:114125: checking how to recognize dependent libraries" >&5 ++echo "configure:114165: checking how to recognize dependent libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107696,13 +114313,13 @@ deplibs_check_method=$lt_cv_deplibs_chec +@@ -107696,13 +114353,13 @@ deplibs_check_method=$lt_cv_deplibs_chec test -z "$deplibs_check_method" && deplibs_check_method=unknown echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:107700: checking for object suffix" >&5 -+echo "configure:114317: checking for object suffix" >&5 ++echo "configure:114357: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:107706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:114323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:114363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; -@@ -107722,7 +114339,7 @@ ac_objext=$ac_cv_objext +@@ -107722,7 +114379,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:107726: checking for executable suffix" >&5 -+echo "configure:114343: checking for executable suffix" >&5 ++echo "configure:114383: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107732,7 +114349,7 @@ else +@@ -107732,7 +114389,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:107736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:114353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++ if { (eval echo configure:114393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.$ac_ext | *.c | *.o | *.obj) ;; -@@ -107778,7 +114395,7 @@ case $host in +@@ -107778,7 +114435,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:107782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:114439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -107792,8 +114409,8 @@ ia64-*-hpux*) +@@ -107792,8 +114449,8 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 107796 "configure"' > conftest.$ac_ext - if { (eval echo configure:107797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ echo '#line 114413 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:114414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ echo '#line 114453 "configure"' > conftest.$ac_ext ++ if { (eval echo configure:114454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -107827,7 +114444,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc +@@ -107827,7 +114484,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:107831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:114488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -107877,7 +114494,7 @@ s390*-*linux*|sparc*-*linux*) +@@ -107877,7 +114534,7 @@ s390*-*linux*|sparc*-*linux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:107881: checking whether the C compiler needs -belf" >&5 -+echo "configure:114498: checking whether the C compiler needs -belf" >&5 ++echo "configure:114538: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107890,14 +114507,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext +@@ -107890,14 +114547,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:114518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:114558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else -@@ -107925,7 +114542,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 +@@ -107925,7 +114582,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:107929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:114586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -107954,7 +114571,7 @@ if test -n "$CXX" && ( test "X$CXX" != " +@@ -107954,7 +114611,7 @@ if test -n "$CXX" && ( test "X$CXX" != " ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:107958: checking how to run the C++ preprocessor" >&5 -+echo "configure:114575: checking how to run the C++ preprocessor" >&5 ++echo "configure:114615: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -107967,12 +114584,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee +@@ -107967,12 +114624,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:107976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:114593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:114633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -108002,7 +114619,7 @@ fi +@@ -108002,7 +114659,7 @@ fi # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6 -echo "configure:108006: checking the maximum length of command line arguments" >&5 -+echo "configure:114623: checking the maximum length of command line arguments" >&5 ++echo "configure:114663: checking the maximum length of command line arguments" >&5 if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108124,7 +114741,7 @@ fi +@@ -108124,7 +114781,7 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6 -echo "configure:108128: checking command to parse $NM output from $compiler object" >&5 -+echo "configure:114745: checking command to parse $NM output from $compiler object" >&5 ++echo "configure:114785: checking command to parse $NM output from $compiler object" >&5 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108228,10 +114845,10 @@ void nm_test_func(){} +@@ -108228,10 +114885,10 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:108232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:114889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:108235: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then -+ if { (eval echo configure:114852: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then ++ if { (eval echo configure:114892: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -108282,7 +114899,7 @@ EOF +@@ -108282,7 +114939,7 @@ EOF lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo configure:108286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ if { (eval echo configure:114903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ if { (eval echo configure:114943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -108322,7 +114939,7 @@ else +@@ -108322,7 +114979,7 @@ else fi echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:108326: checking for objdir" >&5 -+echo "configure:114943: checking for objdir" >&5 ++echo "configure:114983: checking for objdir" >&5 if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108388,7 +115005,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" +@@ -108388,7 +115045,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108392: checking for $ac_word" >&5 -+echo "configure:115009: checking for $ac_word" >&5 ++echo "configure:115049: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108420,7 +115037,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108420,7 +115077,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108424: checking for $ac_word" >&5 -+echo "configure:115041: checking for $ac_word" >&5 ++echo "configure:115081: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108455,7 +115072,7 @@ fi +@@ -108455,7 +115112,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108459: checking for $ac_word" >&5 -+echo "configure:115076: checking for $ac_word" >&5 ++echo "configure:115116: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108487,7 +115104,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108487,7 +115144,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108491: checking for $ac_word" >&5 -+echo "configure:115108: checking for $ac_word" >&5 ++echo "configure:115148: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108522,7 +115139,7 @@ fi +@@ -108522,7 +115179,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108526: checking for $ac_word" >&5 -+echo "configure:115143: checking for $ac_word" >&5 ++echo "configure:115183: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108554,7 +115171,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108554,7 +115211,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108558: checking for $ac_word" >&5 -+echo "configure:115175: checking for $ac_word" >&5 ++echo "configure:115215: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108641,7 +115258,7 @@ case $deplibs_check_method in +@@ -108641,7 +115298,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:108645: checking for ${ac_tool_prefix}file" >&5 -+echo "configure:115262: checking for ${ac_tool_prefix}file" >&5 ++echo "configure:115302: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108701,7 +115318,7 @@ fi +@@ -108701,7 +115358,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:108705: checking for file" >&5 -+echo "configure:115322: checking for file" >&5 ++echo "configure:115362: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108773,7 +115390,7 @@ esac +@@ -108773,7 +115430,7 @@ esac # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108777: checking for $ac_word" >&5 -+echo "configure:115394: checking for $ac_word" >&5 ++echo "configure:115434: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108805,7 +115422,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108805,7 +115462,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108809: checking for $ac_word" >&5 -+echo "configure:115426: checking for $ac_word" >&5 ++echo "configure:115466: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108840,7 +115457,7 @@ fi +@@ -108840,7 +115497,7 @@ fi # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108844: checking for $ac_word" >&5 -+echo "configure:115461: checking for $ac_word" >&5 ++echo "configure:115501: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108872,7 +115489,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108872,7 +115529,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108876: checking for $ac_word" >&5 -+echo "configure:115493: checking for $ac_word" >&5 ++echo "configure:115533: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108906,7 +115523,7 @@ fi +@@ -108906,7 +115563,7 @@ fi echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6 -echo "configure:108910: checking for -single_module linker flag" >&5 -+echo "configure:115527: checking for -single_module linker flag" >&5 ++echo "configure:115567: checking for -single_module linker flag" >&5 if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108929,7 +115546,7 @@ fi +@@ -108929,7 +115586,7 @@ fi echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6 echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6 -echo "configure:108933: checking for -exported_symbols_list linker flag" >&5 -+echo "configure:115550: checking for -exported_symbols_list linker flag" >&5 ++echo "configure:115590: checking for -exported_symbols_list linker flag" >&5 if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108939,12 +115556,12 @@ else +@@ -108939,12 +115596,12 @@ else LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:115565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:115605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_cv_ld_exported_symbols_list=yes rm -rf conftest* else -@@ -109078,7 +115695,7 @@ if test "$GCC" = yes; then +@@ -109078,7 +115735,7 @@ if test "$GCC" = yes; then echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:109082: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo "configure:115699: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo "configure:115739: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109095,11 +115712,11 @@ else +@@ -109095,11 +115752,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:109099: $lt_compile\"" >&5) -+ (eval echo "\"configure:115716: $lt_compile\"" >&5) ++ (eval echo "\"configure:115756: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:109103: \$? = $ac_status" >&5 -+ echo "configure:115720: \$? = $ac_status" >&5 ++ echo "configure:115760: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -109128,7 +115745,7 @@ lt_prog_compiler_pic= +@@ -109128,7 +115785,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:109132: checking for $compiler option to produce PIC" >&5 -+echo "configure:115749: checking for $compiler option to produce PIC" >&5 ++echo "configure:115789: checking for $compiler option to produce PIC" >&5 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -109375,7 +115992,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6 +@@ -109375,7 +116032,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6 if test -n "$lt_prog_compiler_pic"; then echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6 -echo "configure:109379: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo "configure:115996: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++echo "configure:116036: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109392,11 +116009,11 @@ else +@@ -109392,11 +116049,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:109396: $lt_compile\"" >&5) -+ (eval echo "\"configure:116013: $lt_compile\"" >&5) ++ (eval echo "\"configure:116053: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:109400: \$? = $ac_status" >&5 -+ echo "configure:116017: \$? = $ac_status" >&5 ++ echo "configure:116057: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -109438,7 +116055,7 @@ esac +@@ -109438,7 +116095,7 @@ esac # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 -echo "configure:109442: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo "configure:116059: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo "configure:116099: checking if $compiler static flag $lt_tmp_static_flag works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109476,7 +116093,7 @@ fi +@@ -109476,7 +116133,7 @@ fi echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:109480: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:116097: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo "configure:116137: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109496,11 +116113,11 @@ else +@@ -109496,11 +116153,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:109500: $lt_compile\"" >&5) -+ (eval echo "\"configure:116117: $lt_compile\"" >&5) ++ (eval echo "\"configure:116157: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:109504: \$? = $ac_status" >&5 -+ echo "configure:116121: \$? = $ac_status" >&5 ++ echo "configure:116161: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -109530,7 +116147,7 @@ hard_links="nottested" +@@ -109530,7 +116187,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:109534: checking if we can lock with hard links" >&5 -+echo "configure:116151: checking if we can lock with hard links" >&5 ++echo "configure:116191: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no -@@ -109547,7 +116164,7 @@ else +@@ -109547,7 +116204,7 @@ else fi echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:109551: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:116168: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:116208: checking whether the $compiler linker ($LD) supports shared libraries" >&5 runpath_var= allow_undefined_flag= -@@ -109958,12 +116575,12 @@ _LT_EOF +@@ -109958,12 +116615,12 @@ _LT_EOF # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:116584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:116624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -109996,12 +116613,12 @@ if test -z "$aix_libpath"; then aix_libp +@@ -109996,12 +116653,12 @@ if test -z "$aix_libpath"; then aix_libp # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:116622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:116662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -110491,11 +117108,11 @@ x|xyes) +@@ -110491,11 +117148,11 @@ x|xyes) # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:110495: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:117112: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:117152: checking whether -lc should be explicitly linked in" >&5 $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo configure:110499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then -+ if { (eval echo configure:117116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then ++ if { (eval echo configure:117156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -110509,7 +117126,7 @@ echo "configure:110495: checking whether +@@ -110509,7 +117166,7 @@ echo "configure:110495: checking whether libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:110513: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } -+ if { (eval echo configure:117130: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } ++ if { (eval echo configure:117170: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then archive_cmds_need_lc=no else -@@ -110528,7 +117145,7 @@ echo "configure:110495: checking whether +@@ -110528,7 +117185,7 @@ echo "configure:110495: checking whether esac echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:110532: checking dynamic linker characteristics" >&5 -+echo "configure:117149: checking dynamic linker characteristics" >&5 ++echo "configure:117189: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= -@@ -111153,7 +117770,7 @@ if test "$GCC" = yes; then +@@ -111153,7 +117810,7 @@ if test "$GCC" = yes; then fi echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:111157: checking how to hardcode library paths into programs" >&5 -+echo "configure:117774: checking how to hardcode library paths into programs" >&5 ++echo "configure:117814: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ -@@ -111191,7 +117808,7 @@ fi +@@ -111191,7 +117848,7 @@ fi striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:111195: checking whether stripping libraries is possible" >&5 -+echo "configure:117812: checking whether stripping libraries is possible" >&5 ++echo "configure:117852: checking whether stripping libraries is possible" >&5 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" -@@ -111242,7 +117859,7 @@ else +@@ -111242,7 +117899,7 @@ else darwin*) # if libdl is installed we need to link against it echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:111246: checking for dlopen in -ldl" >&5 -+echo "configure:117863: checking for dlopen in -ldl" >&5 ++echo "configure:117903: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -111250,7 +117867,7 @@ else +@@ -111250,7 +117907,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:117882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:117922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111290,12 +117907,12 @@ fi +@@ -111290,12 +117947,12 @@ fi *) echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:111294: checking for shl_load" >&5 -+echo "configure:117911: checking for shl_load" >&5 ++echo "configure:117951: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:117939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:117979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else -@@ -111336,7 +117953,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_ +@@ -111336,7 +117993,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:111340: checking for shl_load in -ldld" >&5 -+echo "configure:117957: checking for shl_load in -ldld" >&5 ++echo "configure:117997: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -111344,7 +117961,7 @@ else +@@ -111344,7 +118001,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:117976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111374,12 +117991,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -111374,12 +118031,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:111378: checking for dlopen" >&5 -+echo "configure:117995: checking for dlopen" >&5 ++echo "configure:118035: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else -@@ -111420,7 +118037,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop +@@ -111420,7 +118077,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:111424: checking for dlopen in -ldl" >&5 -+echo "configure:118041: checking for dlopen in -ldl" >&5 ++echo "configure:118081: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -111428,7 +118045,7 @@ else +@@ -111428,7 +118085,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111458,7 +118075,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -111458,7 +118115,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:111462: checking for dlopen in -lsvld" >&5 -+echo "configure:118079: checking for dlopen in -lsvld" >&5 ++echo "configure:118119: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -111466,7 +118083,7 @@ else +@@ -111466,7 +118123,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111496,7 +118113,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -111496,7 +118153,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:111500: checking for dld_link in -ldld" >&5 -+echo "configure:118117: checking for dld_link in -ldld" >&5 ++echo "configure:118157: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -111504,7 +118121,7 @@ else +@@ -111504,7 +118161,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111571,7 +118188,7 @@ fi +@@ -111571,7 +118228,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:111575: checking whether a program can dlopen itself" >&5 -+echo "configure:118192: checking whether a program can dlopen itself" >&5 ++echo "configure:118232: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -111581,7 +118198,7 @@ else +@@ -111581,7 +118238,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:118265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:118305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -111667,7 +118284,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 +@@ -111667,7 +118324,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:111671: checking whether a statically linked program can dlopen itself" >&5 -+echo "configure:118288: checking whether a statically linked program can dlopen itself" >&5 ++echo "configure:118328: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -111677,7 +118294,7 @@ else +@@ -111677,7 +118334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:118361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:118401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -111781,11 +118398,11 @@ fi +@@ -111781,11 +118438,11 @@ fi # Report which library types will actually be built echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:111785: checking if libtool supports shared libraries" >&5 -+echo "configure:118402: checking if libtool supports shared libraries" >&5 ++echo "configure:118442: checking if libtool supports shared libraries" >&5 echo "$ac_t""$can_build_shared" 1>&6 echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:111789: checking whether to build shared libraries" >&5 -+echo "configure:118406: checking whether to build shared libraries" >&5 ++echo "configure:118446: checking whether to build shared libraries" >&5 test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and -@@ -111808,7 +118425,7 @@ esac +@@ -111808,7 +118465,7 @@ esac echo "$ac_t""$enable_shared" 1>&6 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:111812: checking whether to build static libraries" >&5 -+echo "configure:118429: checking whether to build static libraries" >&5 ++echo "configure:118469: checking whether to build static libraries" >&5 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes echo "$ac_t""$enable_static" 1>&6 -@@ -112494,7 +119111,7 @@ ac_prog=ld +@@ -112494,7 +119151,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 -echo "configure:112498: checking for ld used by $CC" >&5 -+echo "configure:119115: checking for ld used by $CC" >&5 ++echo "configure:119155: checking for ld used by $CC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -112524,10 +119141,10 @@ echo "configure:112498: checking for ld +@@ -112524,10 +119181,10 @@ echo "configure:112498: checking for ld esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:112528: checking for GNU ld" >&5 -+echo "configure:119145: checking for GNU ld" >&5 ++echo "configure:119185: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:112531: checking for non-GNU ld" >&5 -+echo "configure:119148: checking for non-GNU ld" >&5 ++echo "configure:119188: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -112566,7 +119183,7 @@ else +@@ -112566,7 +119223,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:112570: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:119187: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:119227: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -112632,7 +119249,7 @@ fi +@@ -112632,7 +119289,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:112636: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:119253: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:119293: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ld_shlibs_CXX=yes case $host_os in aix3*) -@@ -112730,12 +119347,12 @@ case $host_os in +@@ -112730,12 +119387,12 @@ case $host_os in # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:119356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:119396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -112769,12 +119386,12 @@ if test -z "$aix_libpath"; then aix_libp +@@ -112769,12 +119426,12 @@ if test -z "$aix_libpath"; then aix_libp # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:119395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:119435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -113541,7 +120158,7 @@ private: +@@ -113541,7 +120198,7 @@ private: }; EOF -if { (eval echo configure:113545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:120162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:120202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. -@@ -113697,7 +120314,7 @@ lt_prog_compiler_pic_CXX= +@@ -113697,7 +120354,7 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:113701: checking for $compiler option to produce PIC" >&5 -+echo "configure:120318: checking for $compiler option to produce PIC" >&5 ++echo "configure:120358: checking for $compiler option to produce PIC" >&5 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -113994,7 +120611,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" +@@ -113994,7 +120651,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" if test -n "$lt_prog_compiler_pic_CXX"; then echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6 -echo "configure:113998: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo "configure:120615: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++echo "configure:120655: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -114011,11 +120628,11 @@ else +@@ -114011,11 +120668,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:114015: $lt_compile\"" >&5) -+ (eval echo "\"configure:120632: $lt_compile\"" >&5) ++ (eval echo "\"configure:120672: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:114019: \$? = $ac_status" >&5 -+ echo "configure:120636: \$? = $ac_status" >&5 ++ echo "configure:120676: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -114057,7 +120674,7 @@ esac +@@ -114057,7 +120714,7 @@ esac # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 -echo "configure:114061: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo "configure:120678: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo "configure:120718: checking if $compiler static flag $lt_tmp_static_flag works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -114095,7 +120712,7 @@ fi +@@ -114095,7 +120752,7 @@ fi echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:114099: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:120716: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo "configure:120756: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -114115,11 +120732,11 @@ else +@@ -114115,11 +120772,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:114119: $lt_compile\"" >&5) -+ (eval echo "\"configure:120736: $lt_compile\"" >&5) ++ (eval echo "\"configure:120776: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:114123: \$? = $ac_status" >&5 -+ echo "configure:120740: \$? = $ac_status" >&5 ++ echo "configure:120780: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -114149,7 +120766,7 @@ hard_links="nottested" +@@ -114149,7 +120806,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:114153: checking if we can lock with hard links" >&5 -+echo "configure:120770: checking if we can lock with hard links" >&5 ++echo "configure:120810: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no -@@ -114166,7 +120783,7 @@ else +@@ -114166,7 +120823,7 @@ else fi echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:114170: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:120787: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:120827: checking whether the $compiler linker ($LD) supports shared libraries" >&5 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in -@@ -114212,11 +120829,11 @@ x|xyes) +@@ -114212,11 +120869,11 @@ x|xyes) # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:114216: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:120833: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:120873: checking whether -lc should be explicitly linked in" >&5 $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo configure:114220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then -+ if { (eval echo configure:120837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then ++ if { (eval echo configure:120877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -114230,7 +120847,7 @@ echo "configure:114216: checking whether +@@ -114230,7 +120887,7 @@ echo "configure:114216: checking whether libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag_CXX allow_undefined_flag_CXX= - if { (eval echo configure:114234: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } -+ if { (eval echo configure:120851: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } ++ if { (eval echo configure:120891: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then archive_cmds_need_lc_CXX=no else -@@ -114249,7 +120866,7 @@ echo "configure:114216: checking whether +@@ -114249,7 +120906,7 @@ echo "configure:114216: checking whether esac echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:114253: checking dynamic linker characteristics" >&5 -+echo "configure:120870: checking dynamic linker characteristics" >&5 ++echo "configure:120910: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= -@@ -114822,7 +121439,7 @@ if test "$GCC" = yes; then +@@ -114822,7 +121479,7 @@ if test "$GCC" = yes; then fi echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:114826: checking how to hardcode library paths into programs" >&5 -+echo "configure:121443: checking how to hardcode library paths into programs" >&5 ++echo "configure:121483: checking how to hardcode library paths into programs" >&5 hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -64910,7 +65114,20 @@ +config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dio/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/http/config9.m4 ext/http/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libevent/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 --- a/main/php_config.h.in +++ b/main/php_config.h.in -@@ -1334,6 +1334,51 @@ +@@ -1262,6 +1262,12 @@ + /* Define if uint32_t type is present. */ + #undef HAVE_UINT32_T + ++/* Define if system timezone data is used */ ++#undef HAVE_SYSTEM_TZDATA ++ ++/* Define for location of system timezone data */ ++#undef HAVE_SYSTEM_TZDATA_PREFIX ++ + /* Whether to build date as dynamic module */ + #undef COMPILE_DL_DATE + +@@ -1334,6 +1340,51 @@ /* */ #undef HAVE_ZLIB @@ -64962,7 +65179,7 @@ /* Whether to build bcmath as dynamic module */ #undef COMPILE_DL_BCMATH -@@ -1472,6 +1517,9 @@ +@@ -1472,6 +1523,9 @@ /* Whether to build dba as dynamic module */ #undef COMPILE_DL_DBA @@ -64972,7 +65189,7 @@ /* */ #undef HAVE_LIBXML -@@ -1895,6 +1943,9 @@ +@@ -1895,6 +1949,9 @@ /* LDAP SASL support */ #undef HAVE_LDAP_SASL @@ -64982,7 +65199,7 @@ /* whether to have multibyte string support */ #undef HAVE_MBSTRING -@@ -2813,6 +2864,120 @@ +@@ -2813,6 +2870,120 @@ /* Whether to build zip as dynamic module */ #undef COMPILE_DL_ZIP