home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Spezial
/
SPEZIAL2_97.zip
/
SPEZIAL2_97.iso
/
ANWEND
/
ONLINE
/
ANALOG_1
/
ANALOG_1.ZIP
/
patches.emx
< prev
next >
Wrap
Text File
|
1997-09-08
|
7KB
|
190 lines
diff -cbr orig/analform.c analog2.11/analform.c
*** orig/analform.c Fri Mar 14 17:33:08 1997
--- analog211/analform.c Sun Sep 7 12:54:52 1997
***************
*** 19,25 ****
/* You must change the next line to indicate where the analog program lives */
! #define COMMAND "/usr/local/etc/httpd/analog/analog"
#define MAXARGLENGTH (2048) /* should be plenty */
#define OK (0)
#define ERR (-1)
--- 19,25 ----
/* You must change the next line to indicate where the analog program lives */
! #define COMMAND "analog"
#define MAXARGLENGTH (2048) /* should be plenty */
#define OK (0)
#define ERR (-1)
diff -cbr orig/analhea2.h analog2.11/analhea2.h
*** orig/analhea2.h Fri Mar 14 17:36:50 1997
--- analog2.11/analhea2.h Sun Sep 7 12:11:50 1997
***************
*** 49,54 ****
--- 49,59 ----
#define DIRSEP '/'
#endif
+ #ifdef __EMX__
+ #define VERSION VNUMBER "/emx"
+ #define DIRSEP '\\'
+ #endif
+
#ifdef _WIN32 /* so it can pick it up automatically */
#undef WIN32
#define WIN32
***************
*** 81,89 ****
#ifndef NODIRENT
#ifndef VMSDIRENT
#ifndef MACDIRENT
- #include <dirent.h> /* Normal dirent */
#include <sys/types.h>
#include <sys/stat.h>
#else
#include "macdir.h" /* Mac dirent */
#endif
--- 86,94 ----
#ifndef NODIRENT
#ifndef VMSDIRENT
#ifndef MACDIRENT
#include <sys/types.h>
#include <sys/stat.h>
+ #include <dirent.h> /* Normal dirent */
#else
#include "macdir.h" /* Mac dirent */
#endif
diff -cbr orig/analhead.h analog2.11/analhead.h
*** orig/analhead.h Fri Mar 14 17:33:10 1997
--- analog2.11/analhead.h Sun Sep 7 12:47:52 1997
***************
*** 69,75 ****
#define MINGRAPHWIDTH (15)
/* bar charts must be at least this many characters wide */
! #define FORMPROG "/cgi-bin/analform.cgi"
/* If you make an analog form interface, what will be the URL of the
program that processes it? (It should be wherever cgi-bin programs
go on your server; normally in a cgi-bin directory). */
--- 69,75 ----
#define MINGRAPHWIDTH (15)
/* bar charts must be at least this many characters wide */
! #define FORMPROG "/cgi-bin/analform"
/* If you make an analog form interface, what will be the URL of the
program that processes it? (It should be wherever cgi-bin programs
go on your server; normally in a cgi-bin directory). */
***************
*** 42,48 ****
#define LANGDIR ANALOGDIR "lang/"
/* Directory where the language files live. */
! #define DEFAULTCONFIGFILE ANALOGDIR "analog.cfg"
/* the name of the default configuration file; see README.html for a
description of this file. Use "none" for no configuration file. */
--- 42,49 ----
#define LANGDIR ANALOGDIR "lang/"
/* Directory where the language files live. */
! /* #define DEFAULTCONFIGFILE ANALOGDIR "analog.cfg" */
! #define DEFAULTCONFIGFILE (getenv("ANALOG") ? getenv("ANALOG") : ANALOGDIR "analog.cfg")
/* the name of the default configuration file; see README.html for a
description of this file. Use "none" for no configuration file. */
diff -cbr orig/analog.cfg analog2.11/analog.cfg
*** orig/analog.cfg Fri Mar 14 17:33:10 1997
--- analog2.11/analog.cfg Sun Sep 7 12:33:34 1997
***************
*** 4,9 ****
--- 4,11 ----
# Here are a couple of configuration commands to get you started. Add any more
# you like from the Readme.
#
+ LANGFILE englishh.lng
+ DOMAINSFILE domains.tab
#
# REQINCLUDE pages
LINKINCLUDE pages
diff -cbr orig/Makefile analog2.11/Makefile
*** orig/Makefile Fri Mar 14 17:33:08 1997
--- analog2.11/Makefile Sun Sep 7 12:37:34 1997
***************
*** 1,16 ****
# Makefile for analog 2.1
# Please read Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
! CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different
# compilers need different CFLAGS, e.g., -O instead of -O2.
CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT
! OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC or VMS
! LIBS = -lm # extra libraries needed; Solaris 2 (SunOS 5) needs
# LIBS = -lnsl -lm and SCO Unix needs LIBS = -lsocket -lm
# IRIX reportedly needs LIBS = -lc -lm
PAGER = more # Your favourite pager program, e.g. more
! PROGRAM = analog
SOURCES = alias.c analog.c formgen.c hash.c init.c init2.c macstuff.c \
output.c output2.c sscanf.c utils.c win32.c
OBJS = alias.o analog.o formgen.o hash.o init.o init2.o macstuff.o \
--- 1,16 ----
# Makefile for analog 2.1
# Please read Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
! CC = gcc -Zomf # which compiler to use: eg cc, acc, gcc. NB Different
# compilers need different CFLAGS, e.g., -O instead of -O2.
CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT
! OS = EMX # Operating system: UNIX, DOS, WIN32, MAC or VMS
! LIBS = -lsocket -s -Zcrtdll -Zstack 512 # extra libraries needed; Solaris 2 (SunOS 5) needs
# LIBS = -lnsl -lm and SCO Unix needs LIBS = -lsocket -lm
# IRIX reportedly needs LIBS = -lc -lm
PAGER = more # Your favourite pager program, e.g. more
! PROGRAM = analog.exe
SOURCES = alias.c analog.c formgen.c hash.c init.c init2.c macstuff.c \
output.c output2.c sscanf.c utils.c win32.c
OBJS = alias.o analog.o formgen.o hash.o init.o init2.o macstuff.o \
***************
*** 18,24 ****
HEADERS = analhead.h analhea2.h
# Form interface options:
! FORMPROG = analform.cgi # The program that processes the data from the form
FORMSRC = analform.c # The source code for that program
FORMHTML = analogform.html # Where the form itself will go
FORMOPTS = # Extra analog options when constructing the form
--- 18,24 ----
HEADERS = analhead.h analhea2.h
# Form interface options:
! FORMPROG = analform.exe # The program that processes the data from the form
FORMSRC = analform.c # The source code for that program
FORMHTML = analogform.html # Where the form itself will go
FORMOPTS = # Extra analog options when constructing the form
***************
*** 30,39 ****
@echo '***'
$(OBJS): $(HEADERS) Makefile
! $(CC) $(CFLAGS) $(DEFS) -D$(OS) -c $*.c
$(FORMPROG): $(FORMSRC) Makefile
! $(CC) $(CFLAGS) $(FORMSRC) -o $(FORMPROG)
$(FORMHTML): $(PROGRAM) Makefile
./$(PROGRAM) -form $(FORMOPTS) +O$(FORMHTML)
--- 30,39 ----
@echo '***'
$(OBJS): $(HEADERS) Makefile
! $(CC) $(CFLAGS) $(DEFS) -D$(OS) -c $*.c -o $@
$(FORMPROG): $(FORMSRC) Makefile
! $(CC) $(CFLAGS) $(FORMSRC) -o $(FORMPROG) $(LIBS)
$(FORMHTML): $(PROGRAM) Makefile
./$(PROGRAM) -form $(FORMOPTS) +O$(FORMHTML)