httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsanc...@hyperreal.org
Subject cvs commit: apache-1.3/src/include ap_config.h hsregex.h
Date Mon, 03 May 1999 23:07:55 GMT
wsanchez    99/05/03 16:07:54

  Modified:    src      Configure
               src/helpers GuessOS
               src/include ap_config.h hsregex.h
  Log:
  Add support for Mac OS (versions 10.0 and greater), using macro MAC_OS.
  Rename RHAPSODY macro to MAC_OS_X_SERVER.
  
  Revision  Changes    Path
  1.340     +7 -2      apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.339
  retrieving revision 1.340
  diff -u -r1.339 -r1.340
  --- Configure	1999/04/29 18:48:53	1.339
  +++ Configure	1999/05/03 23:07:42	1.340
  @@ -490,9 +490,14 @@
   	;;
       *-apple-rhapsody*)
   	OS='Mac OS X Server'
  -	CFLAGS="$CFLAGS -DRHAPSODY"
  +	CFLAGS="$CFLAGS -DMAC_OS_X_SERVER"
   	DEF_WANTHSREGEX=yes
   	;;
  +    *-apple-macos*)
  +	OS='Mac OS'
  +	CFLAGS="$CFLAGS -DMAC_OS"
  +	DEF_WANTHSREGEX=yes
  +	;;
       *-dec-osf*)
   	OS='DEC OSF/1'
   	CFLAGS="$CFLAGS -DOSF1"
  @@ -999,7 +1004,7 @@
   	    LDFLAGS_SHLIB="-shared"
   	    LDFLAGS_SHLIB_EXPORT="-rdynamic"
   	    ;;
  -	*-apple-rhapsody*)
  +	*-apple-rhapsody* | *-apple-macos* )
   	    LD_SHLIB="cc"
   	    CFLAGS_SHLIB=""
   	    LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress'
  
  
  
  1.60      +6 -1      apache-1.3/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- GuessOS	1999/04/21 14:30:25	1.59
  +++ GuessOS	1999/05/03 23:07:45	1.60
  @@ -243,9 +243,14 @@
   
       Rhapsody:*:*:*)
   	case "${MACHINE}" in
  -	    Power*) MACHINE=powerpc ;;
  +	    "Power Macintosh") MACHINE=powerpc ;;
   	esac
   	echo "${MACHINE}-apple-rhapsody${RELEASE}"; exit 0
  +	;;
  +
  +    "Mac OS":*:*:*)
  +	MACHINE=`uname -p`
  +	echo "${MACHINE}-apple-macos${RELEASE}"; exit 0
   	;;
   
       "RISC iX":*)
  
  
  
  1.256     +41 -9     apache-1.3/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
  retrieving revision 1.255
  retrieving revision 1.256
  diff -u -r1.255 -r1.256
  --- ap_config.h	1999/04/27 20:36:29	1.255
  +++ ap_config.h	1999/05/03 23:07:52	1.256
  @@ -384,12 +384,18 @@
   #define NO_USE_SIGACTION
   #define HAVE_SYSLOG 1
   
  -#elif defined(RHAPSODY) /* Mac OS X Server */
  +#elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (>= 10.0) and Mac OS X Server
(<= 5.x) */
  +#define HAVE_DYLD
  +#ifdef MAC_OS_X_SERVER
  +#define DYLD_CANT_UNLOAD
  +#endif /* MAC_OS_X_SERVER */
   #define HAVE_GMTOFF
   #define HAVE_MMAP
   #define USE_MMAP_FILES
   #define USE_MMAP_SCOREBOARD
  +#ifdef MAC_OS_X_SERVER
   #define MAP_TMPFILE
  +#endif /* MAC_OS_X_SERVER */
   #define HAVE_RESOURCE
   #define HAVE_SNPRINTF
   #define JMP_BUF jmp_buf
  @@ -397,26 +403,52 @@
   #define USE_FLOCK_SERIALIZED_ACCEPT
   #define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
   /*
  - * If you are using APACI, (you should be on Rhapsody) these
  - * values are set at configure time. These are here as reference;
  - * the apache that is built into Rhapsody is configured with
  - * these values.
  + * If you are using APACI, (you probably should be on Mac OS) these
  + * values are set at configure time.
    */
  -#if 0
  +#ifndef HTTPD_ROOT
   #define HTTPD_ROOT              "/Local/Library/WebServer"
  +#endif
  +#ifndef DOCUMENT_LOCATION
   #define DOCUMENT_LOCATION       HTTPD_ROOT "/Documents"
  +#endif
  +#ifndef DEFAULT_XFERLOG
   #define DEFAULT_XFERLOG         "Logs/Access"
  +#endif
  +#ifndef DEFAULT_ERRORLOG
   #define DEFAULT_ERRORLOG        "Logs/Errors"
  +#endif
  +#ifndef DEFAULT_PIDLOG
   #define DEFAULT_PIDLOG          "Logs/Process"
  +#endif
  +#ifndef DEFAULT_SCOREBOARD
   #define DEFAULT_SCOREBOARD      "Logs/Status"
  +#endif
  +#ifndef DEFAULT_LOCKFILE
   #define DEFAULT_LOCKFILE        "Logs/Lock"
  +#endif
  +#ifndef SERVER_CONFIG_FILE
   #define SERVER_CONFIG_FILE      "Configuration/Server"
  +#endif
  +#ifndef RESOURCE_CONFIG_FILE
   #define RESOURCE_CONFIG_FILE    "Configuration/Resources"
  +#endif
  +#ifndef TYPES_CONFIG_FILE
   #define TYPES_CONFIG_FILE       "Configuration/MIME"
  +#endif
  +#ifndef ACCESS_CONFIG_FILE
   #define ACCESS_CONFIG_FILE      "Configuration/Access"
  +#endif
  +#ifndef DEFAULT_USER_DIR
   #define DEFAULT_USER_DIR        "Library/Web Documents"
  -#define DEFAULT_USER            "nobody"
  -#define DEFAULT_GROUP           "nogroup"
  +#endif
  +#ifndef DEFAULT_USER
  +#define DEFAULT_USER            "www"
  +#endif
  +#ifndef DEFAULT_GROUP
  +#define DEFAULT_GROUP           "www"
  +#endif
  +#ifndef DEFAULT_PATH
   #define DEFAULT_PATH            "/bin:/usr/bin:/usr/local/bin"
   #endif
   
  @@ -934,7 +966,7 @@
    * __private_extern__.
    * For other systems, make that a no-op.
    */
  -#if defined(RHAPSODY)
  +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER)
   #define ap_private_extern __private_extern__
   #else
   #define ap_private_extern
  
  
  
  1.13      +1 -1      apache-1.3/src/include/hsregex.h
  
  Index: hsregex.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/hsregex.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- hsregex.h	1998/10/19 02:16:27	1.12
  +++ hsregex.h	1999/05/03 23:07:52	1.13
  @@ -16,7 +16,7 @@
   #endif
   #endif
   
  -#if defined(RHAPSODY)
  +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER)
   #define ap_private_extern __private_extern__
   #else
   #define ap_private_extern
  
  
  

Mime
View raw message