Add RFC931 and INTERNATIONAL installation variables

diff --git a/contrib/whois++/INSTALL b/contrib/whois++/INSTALL
index b612369a9db3a06959d18f5acc549ec3afc38221..9d5d47bc6142a1df4f79254960199949a155e0f7 100644 (file)
--- a/contrib/whois++/INSTALL
+++ b/contrib/whois++/INSTALL
@@ -38,6 +38,9 @@ INTERNATIONAL         Define this is you have POSIX international support.
        constraint in a future release.
        Available under Ultrix but not SunOS.
 
+RFC931                 Define this if you wish to turn on rfc931 logging.
+       You must have log_tcp source available.
+
 Once you have modified these variable you should be able to just type "make",
 if you are in the whois++ directory, or "make ldap-whois++" from the main
 LDAP directory. All going well there should be no problems so "make install",

diff --git a/contrib/whois++/Makefile b/contrib/whois++/Makefile
index a2f9b2eccc710312c03df0c227d73bad7742c1a5..d5e5af0536a87245c0ed414bd84ec1d5c23be2eb 100644 (file)
--- a/contrib/whois++/Makefile
+++ b/contrib/whois++/Makefile
@@ -19,10 +19,17 @@ FACILITY    = LOG_LOCAL3
 #
 #SYSLIBS       = -li -lsyslog
 #
+# If you want POSIX international support (format of dates), on ultrix
+#
+#INTERNATIONAL = -DINTERNATIONAL
+#
 # If you want RFC931 logging you must have log_tcp source available
 #
+#RFC931DEF     = -DRFC931
+#RFC931SRC     = /local/src/log_tcp/rfc931.c
+
 SRCS   = whois++.c command.c config.c describe.c help.c output.c template.c \
-         util.c version.c # /local/src/log_tcp/rfc931.c
+         util.c version.c $(RFC931SRC)
 HDRS   = whois++.h
 OBJS   = ${SRCS:.c=.o}
 HOST   = `hostname`
@@ -36,7 +43,8 @@ DEFINES = -DETCDIR=\"$(ETCDIR)\" -DBUILD="\"$(USER)@$(HOST) on $(DATE)\"" \
          -DCONFIG_DIRECTORY=\"$(CONFIG_DIRECTORY)\" -DMAIN \
          -DHELP_DIRECTORY=\"$(HELP_DIRECTORY)\" -DREVISION="$(REVISION)" \
          -DPROTOCOL="\"[FIRST DRAFT - 15 April 1993]\"" -DRELEASE=\"BETA\" \
-         -DFACILITY=$(FACILITY) -DDEFAULT_LDAPHOST=\"$(LDAPHOST)\" # -DRFC931
+         -DFACILITY=$(FACILITY) -DDEFAULT_LDAPHOST=\"$(LDAPHOST)\" \
+         $(INTERNATIONAL) $(RFC931DEF)
 
 CFLAGS = -I$(LDAPSRC)/include -I/usr/local/include $(ACFLAGS)
 LIBS   = -L$(LDAPSRC)/libraries/libldap -lldap -L$(LDAPSRC)/libraries/liblber \