Mailing List Archive

rasmus 98/03/05 10:58:36

Modified: src CHANGES Configure
src/include conf.h http_config.h
src/os/unix os.h
Log:
These patches make Configure create src/include/ap_config.h and they also
clean up the various autoconf symbol clashes I was getting. I bumped the
MODULE_MAGIC_NUMBER so an external module will now that it can expect to
find ap_config.h after today. The patches have been tested on
Solaris 2.5.1 and a generic Linux 2.1.79 box both with and without the
external module compiled in. Nothing here should affect anybody, but
it allows people to correctly build external modules outside of the
Apache build environment.

Reviewed by: Concept ok'ed, at least in part, by Jim and Dean

Revision Changes Path
1.688 +8 -0 apache-1.3/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -r1.687 -r1.688
--- CHANGES 1998/03/04 14:28:25 1.687
+++ CHANGES 1998/03/05 18:58:30 1.688
@@ -1,5 +1,13 @@
Changes with Apache 1.3b6

+ *) The Configure script now generates src/include/ap_config.h which
+ contains the set of defines used when Apache is compiled on a platform.
+ This file can then be included by external modules before including
+ any Apache header files in case they are being built separately from
+ Apache. Along with this change, a couple of minor changes were
+ made to make Apache's #defines coexist peacefully with any autoconf
+ defines and external module might have. [Rasmus Lerdorf]
+
*) Fix mod_rewrite for the ugly API case where <VirtualHost> sections exist
but without any RewriteXXXXX directives. Here mod_rewrite is given no
chance by the API to initialise its per-server configuration and thus



1.194 +20 -1 apache-1.3/src/Configure

Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- Configure 1998/03/03 01:22:06 1.193
+++ Configure 1998/03/05 18:58:31 1.194
@@ -1,6 +1,6 @@
#!/bin/sh
exitcode=0
-trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $awkfile; exit $exitcode' 0 1 2 3 15
+trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit $exitcode' 0 1 2 3 15

# Apache configuration script, first cut --- rst.
# Don't like it? Inspired to do something better? Go for it.
@@ -26,6 +26,7 @@
tmpfile2=$tmpfile.2
tmpfile3=$tmpfile.3
awkfile=$tmpfile.4
+tmpconfig=$tmpfile.5
SUBDIRS='$(OSDIR) main ap modules'

####################################################################
@@ -838,6 +839,24 @@
SEEN[pp[2]] = 1
}
}'`
+
+#
+# At this point we can pick out all -D's from CFLAGS and create ap_config.h
+# to be used by external modules needing to include Apache header files.
+#
+
+for cflag in $CFLAGS; do
+ echo $cflag >>$tmpconfig ;
+done
+awk > include/ap_config.h < $tmpconfig '
+ BEGIN {
+ printf "/* Automatically generated file - do not edit */\n\n"
+ }
+ /^-D.*/ {
+ split(substr($1,3,length($1)),parts,"=")
+ printf ("#define %s %s\n",parts[1],parts[2])
+ }
+'

#
# Now autoconfigure each of the modules specified by AddModule.



1.188 +96 -101 apache-1.3/src/include/conf.h

Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- conf.h 1998/03/05 10:45:23 1.187
+++ conf.h 1998/03/05 18:58:33 1.188
@@ -80,7 +80,7 @@
/* Define one of these according to your system. */
#if defined(MINT)
typedef int rlim_t;
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
#define JMP_BUF sigjmp_buf
#define NO_LONG_DOUBLE
#define USE_FLOCK_SERIALIZED_ACCEPT
@@ -95,7 +95,7 @@
#define NO_SETSID
#define NO_KILLPG
#define NO_WRITEV
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
#define SHM_R 0400 /* Read permission */
#define SHM_W 0200 /* Write permission */
@@ -114,13 +114,13 @@
#define PF_INET AF_INET

#elif defined(SUNOS4)
-#define HAVE_GMTOFF
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_GMTOFF 1
+#define HAVE_SYS_RESOURCE_H 1
#undef NO_KILLPG
#undef NO_SETSID
char *crypt(const char *pw, const char *salt);
char *mktemp(char *template);
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
#include <sys/time.h>
@@ -130,25 +130,26 @@
#define NO_LINGCLOSE
#define USE_FLOCK_SERIALIZED_ACCEPT
#define NEED_DIFFTIME
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(SOLARIS2)
#undef HAVE_GMTOFF
#define NO_KILLPG
#undef NO_SETSID
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_DLFCN_H 1
#define bzero(a,b) memset(a,0,b)
#if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) && \
!defined(USE_PTHREAD_SERIALIZED_ACCEPT)
#define USE_FCNTL_SERIALIZED_ACCEPT
#endif
#define NEED_UNION_SEMUN
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_CRYPT_H
+#define HAVE_CRYPT_H 1
int gethostname(char *name, int namelen);
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(IRIX)
#undef HAVE_GMTOFF
@@ -159,31 +160,32 @@
#if !defined(USE_FCNTL_SERIALIZED_ACCEPT) && !defined(USE_USLOCK_SERIALIZED_ACCEPT)
#define USE_SYSVSEM_SERIALIZED_ACCEPT
#endif
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_FILES
-#define HAVE_CRYPT_H
+#define HAVE_CRYPT_H 1
+#define HAVE_DLFCN_H 1
#define NO_LONG_DOUBLE
-#define HAVE_BSTRING_H
+#define HAVE_BSTRING_H 1
#define NO_LINGCLOSE
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(HIUX)
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
#undef HAVE_GMTOFF
#define NO_KILLPG
#undef NO_SETSID
#ifndef _HIUX_SOURCE
#define _HIUX_SOURCE
#endif
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
#define SELECT_NEEDS_CAST
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(HPUX) || defined(HPUX10)
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
#undef HAVE_GMTOFF
#define NO_KILLPG
#undef NO_SETSID
@@ -191,9 +193,9 @@
#ifndef _HPUX_SOURCE
#define _HPUX_SOURCE
#endif
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#ifndef HPUX10
#define SELECT_NEEDS_CAST
typedef int rlim_t;
@@ -203,12 +205,12 @@
#undef HAVE_GMTOFF
#undef NO_KILLPG
#undef NO_SETSID
-#define HAVE_SYS_SELECT_H
+#define HAVE_SYS_SELECT_H 1
#ifndef __ps2__
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#ifndef DEFAULT_GROUP
#define DEFAULT_GROUP "nobody"
#endif
@@ -225,7 +227,7 @@
#endif

#elif defined(ULTRIX)
-#define HAVE_GMTOFF
+#define HAVE_GMTOFF 1
#undef NO_KILLPG
#undef NO_SETSID
#define ULTRIX_BRAIN_DEATH
@@ -236,41 +238,41 @@
#endif

#elif defined(OSF1)
-#define HAVE_GMTOFF
+#define HAVE_GMTOFF 1
#undef NO_KILLPG
#undef NO_SETSID
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_CRYPT_H
+#define HAVE_CRYPT_H 1
#define NO_LONG_DOUBLE
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#define USE_FLOCK_SERIALIZED_ACCEPT
#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT

#elif defined(PARAGON)
-#define HAVE_GMTOFF
+#define HAVE_GMTOFF 1
#undef NO_KILLPG
#undef NO_SETSID
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_CRYPT_H
+#define HAVE_CRYPT_H 1
#define NO_LONG_DOUBLE
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
typedef int rlim_t;

#elif defined(SEQUENT)
-#define HAVE_GMTOFF
+#define HAVE_GMTOFF 1
#undef NO_KILLPG
#define NO_SETSID
#define NEED_STRDUP
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#define tolower(c) (isupper(c) ? tolower(c) : c)

#elif defined(NEXT)
typedef unsigned short mode_t;
-#define HAVE_GMTOFF
+#define HAVE_GMTOFF 1
#undef NO_KILLPG
#define NO_SETSID
#define NEED_STRDUP
@@ -325,9 +327,10 @@
typedef int pid_t;
#define USE_LONGJMP
#define NO_USE_SIGACTION
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(LINUX)
+#define HAVE_DLFCN_H 1

#if LINUX > 1
#include <features.h>
@@ -357,11 +360,11 @@
#define NET_SIZE_T socklen_t
#endif

-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_FILES
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1

/* glibc 2.1 and later finally define rlim_t */
#if !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
@@ -380,7 +383,7 @@
#undef NO_SETSID
#undef NEED_STRDUP
#include <sys/time.h>
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(SCO)
#undef HAVE_GMTOFF
@@ -390,19 +393,19 @@
#define NO_WRITEV
#define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */
#include <sys/time.h>
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(SCO5)

#define SIGURG SIGUSR1
-#define HAVE_SYS_SELECT_H
+#define HAVE_SYS_SELECT_H 1
#define USE_FCNTL_SERIALIZED_ACCEPT
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
#define SecureWare
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

/* Although SCO 5 defines these in <strings.h> (note the "s") they don't have
consts. Sigh. */
@@ -431,7 +434,7 @@
/* fcntl() locking is expensive with NFS */
#define USE_FLOCK_SERIALIZED_ACCEPT
#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
/*
* NOTE: If when you run Apache under A/UX and you get a warning
@@ -443,7 +446,7 @@
#define MOVEBREAK 0x4000000
#define NO_LINGCLOSE
#define NO_SLACK
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(SVR4)
#define NO_KILLPG
@@ -458,9 +461,9 @@
#ifndef USE_SYSVSEM_SERIALIZED_ACCEPT
#define USE_FCNTL_SERIALIZED_ACCEPT
#endif
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#define NET_SIZE_T size_t
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
#ifdef _OSD_POSIX /* BS2000-POSIX mainframe needs initgroups */
#define NEED_INITGROUPS
@@ -478,21 +481,21 @@
#define NEED_STRCASECMP
#define NEED_STRNCASECMP
#define bzero(a,b) memset(a,0,b)
-#define HAVE_RESOURCE
-#define HAVE_MMAP
+#define HAVE_RESOURCE 1
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#undef USE_SHMGET_SCOREBOARD /* force use of mmap() scoreboard */
-#define HAVE_CRYPT_H
-#define HAVE_SYS_SELECT_H
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_CRYPT_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_RESOURCE_H 1
#include <sys/time.h>
#if UW >= 200
#define _POSIX_SOURCE
#endif
#define NET_SIZE_T size_t
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#define USE_FCNTL_SERIALIZED_ACCEPT

#elif defined(DGUX)
@@ -505,14 +508,14 @@
/* A lot of SVR4 systems need this */
#define USE_FCNTL_SERIALIZED_ACCEPT
#define ap_inet_addr inet_network
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(NETBSD)
-#define HAVE_SYS_RESOURCE_H
-#define HAVE_GMTOFF
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_GMTOFF 1
#undef NO_KILLPG
#undef NO_SETSID
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#ifndef DEFAULT_USER
#define DEFAULT_USER "nobody"
#endif
@@ -529,7 +532,7 @@
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#define strftime(buf,bufsize,fmt,tm) ascftime(buf,fmt,tm)
#include <sys/types.h>

@@ -537,17 +540,18 @@
#undef HAVE_GMTOFF
#undef NO_KILLPG
#undef NO_SETSID
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(__FreeBSD__) || defined(__bsdi__)
#if defined(__FreeBSD__)
#include <osreldate.h>
#endif
-#define HAVE_SYS_RESOURCE_H
-#define HAVE_GMTOFF
+#define HAVE_DLFCN_H 1
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_GMTOFF 1
#undef NO_KILLPG
#undef NO_SETSID
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
#ifndef DEFAULT_USER
@@ -561,7 +565,7 @@
typedef quad_t rlim_t;
#endif
#define USE_FLOCK_SERIALIZED_ACCEPT
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(QNX)
#ifndef crypt
@@ -578,20 +582,20 @@
#define NEED_INITGROUPS
#define NEED_SELECT_H
#define NEED_PROCESS_H
-#define HAVE_SYS_SELECT_H
+#define HAVE_SYS_SELECT_H 1
#include <unix.h>
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(LYNXOS)
#undef HAVE_GMTOFF
-#define HAVE_RESOURCE
+#define HAVE_RESOURCE 1
#undef USE_MMAP_SCOREBOARD
#undef USE_SHMGET_SCOREBOARD
#undef HAVE_CRYPT_H
#undef HAVE_SYS_SELECT_H
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
#undef HAVE_SNPRINTF
#undef USE_FCNTL_SERIALIZED_ACCEPT
#undef USE_FLOCK_SERIALIZED_ACCEPT
@@ -601,10 +605,10 @@
#undef NO_SETSID
#undef NO_USE_SIGACTION
#undef NO_LINGCLOSE
-#define HAVE_CVT
+#define HAVE_CVT 1
extern char *crypt(char *pw, char *salt);
typedef int rlim_t;
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(UXPDS)
#undef NEED_STRCASECMP
@@ -613,14 +617,14 @@
#undef HAVE_GMTOFF
#define NO_KILLPG
#undef NO_SETSID
-#define HAVE_RESOURCE 1
+#define HAVE_RESOURCE 1
#define bzero(a,b) memset(a,0,b)
#define USE_FCNTL_SERIALIZED_ACCEPT
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_CRYPT_H
-#define HAVE_SYSLOG
+#define HAVE_CRYPT_H 1
+#define HAVE_SYSLOG 1

#elif defined(__EMX__)
/* Defines required for EMX OS/2 port. */
@@ -633,7 +637,7 @@
#define chdir _chdir2
#include <sys/time.h>
#define MAXSOCKETS 4096
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define NO_RELIABLE_PIPED_LOGS

@@ -641,7 +645,7 @@
typedef int rlim_t;
#undef NO_KILLPG
#define NO_SETSID
-#define HAVE_GMTOFF
+#define HAVE_GMTOFF 1
#ifndef __MACHTEN_PPC__
#ifndef __MACHTEN_68K__
#define __MACHTEN_68K__
@@ -652,7 +656,7 @@
#define USE_LONGJMP
#undef NEED_STRDUP
#else
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
#define USE_FCNTL_SERIALIZED_ACCEPT
#endif
@@ -663,10 +667,10 @@
#undef NO_KILLPG
#undef NO_SETSID
#undef NEED_STRDUP
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#define NO_TIMEZONE
#include <stdio.h>
@@ -677,22 +681,22 @@
#include <net/errno.h>
#define NO_KILLPG
#undef NO_SETSID
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
#define SIGURG SIGUSR1
#define USE_FCNTL_SERIALIZED_ACCEPT
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1

#elif defined(NEWSOS)
-#define HAVE_SYS_RESOURCE_H
-#define HAVE_SHMGET
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
#define USE_LONGJMP
#define NO_SETSID
#define NO_USE_SIGACTION
#define NEED_WAITPID
#define NO_OTHER_CHILD
-#define HAVE_SYSLOG
+#define HAVE_SYSLOG 1
#include <sys/time.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -729,7 +733,7 @@
#else
/* Unknown system - Edit these to match */
#ifdef BSD
-#define HAVE_GMTOFF
+#define HAVE_GMTOFF 1
#else
#undef HAVE_GMTOFF
#endif
@@ -778,7 +782,7 @@
/* Do we have sys/resource.h; assume that BSD does. */
#ifndef HAVE_SYS_RESOURCE_H
#ifdef BSD
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
#endif
#endif /* HAVE_SYS_RESOURCE_H */

@@ -836,6 +840,7 @@
#include <arpa/inet.h> /* for inet_ntoa */
#endif
#include <sys/wait.h>
+#include <pwd.h>
#include <grp.h>
#include <fcntl.h>
#include <limits.h>
@@ -849,17 +854,7 @@
#include <malloc.h>
#include <io.h>
#include <fcntl.h>
-#endif /* WIN32 */
-
-/*
- * Under Unix we have <pwd.h> for getpwnam() and friends,
- * under WIN32 this is emulated by our os/win32/passwd.h
- */
-#ifdef WIN32
-#include "../os/win32/passwd.h"
-#else
-#include <pwd.h>
-#endif
+#endif /* ndef WIN32 */

#include <time.h> /* for ctime */
#include <signal.h>



1.70 +1 -1 apache-1.3/src/include/http_config.h

Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- http_config.h 1998/03/05 13:27:14 1.69
+++ http_config.h 1998/03/05 18:58:34 1.70
@@ -262,7 +262,7 @@
* handle it back-compatibly, or at least signal an error).
*/

-#define MODULE_MAGIC_NUMBER 19980304
+#define MODULE_MAGIC_NUMBER 19980305
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL

/* Generic accessors for other modules to get at their own module-specific



1.10 +1 -10 apache-1.3/src/os/unix/os.h

Index: os.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- os.h 1998/03/05 15:50:46 1.9
+++ os.h 1998/03/05 18:58:36 1.10
@@ -83,15 +83,6 @@
extern int os_is_path_absolute(const char *f);
#endif

-/*
- * Abstraction layer for dynamic loading of modules (mod_so.c)
- */
-
-#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \
- defined(__bsdi__) || defined(IRIX)
-# define HAS_DLFCN
-#endif
-
#if defined(__FreeBSD__)
# define NEED_UNDERSCORE_SYM
#endif
@@ -102,7 +93,7 @@
#endif

/* Start of real module */
-#ifdef HAS_DLFCN
+#ifdef HAVE_DLFCN_H
# include <dlfcn.h>
#else
void * dlopen (const char * __filename, int __flag);