fixes to compile and install under 2.0.36

This commit is contained in:
keil 1998-10-16 12:37:38 +00:00
parent 835bb26785
commit 508fe741d9
10 changed files with 151 additions and 68 deletions

26
ipppcomp/isdn_lzscomp.h Normal file
View File

@ -0,0 +1,26 @@
/*
* $Id: isdn_lzscomp.h,v 1.1 1998/10/16 12:37:38 keil Exp $
*
* Header for isdn_lzscomp.c
* Concentrated here to not mess up half a dozen kernel headers with code
* snippets
*
*/
#define CI_LZS_COMPRESS 17
#define CILEN_LZS_COMPRESS 5
#define LZS_CMODE_NONE 0
#define LZS_CMODE_LCB 1
#define LZS_CMODE_CRC 2
#define LZS_CMODE_SEQNO 3 /* MUST be implemented (default) */
#define LZS_CMODE_EXT 4 /* Seems to be what Win0.95 uses */
#define LZS_COMP_MAX_HISTS 1 /* Don't waste peers ressources */
#define LZS_COMP_DEF_HISTS 1 /* Most likely to negotiate */
#define LZS_DECOMP_MAX_HISTS 32 /* More is really nonsense */
#define LZS_DECOMP_DEF_HISTS 8 /* If we get it, this may be optimal */
#define LZS_HIST_BYTE1(word) (word>>8) /* Just for better reading */
#define LZS_HIST_BYTE2(word) (word&0xff) /* of this big endian stuff */
#define LZS_HIST_WORD(b1,b2) ((b1<<8)|b2) /* (network byte order rulez) */

View File

@ -1,11 +1,12 @@
#
# ipppd makefile for Linux
# $Id: Makefile.in,v 1.11 1998/09/26 18:28:10 akool Exp $
# $Id: Makefile.in,v 1.12 1998/10/16 12:37:43 keil Exp $
#
HAVE_LIBDES := @HAVE_LIBDES@
HAVE_LIBCRYPT := @HAVE_LIBCRYPT@
HAVE_SHADOW_H := @HAVE_SHADOW_H@
HAVE_LZSCOMP_H:= @HAVE_LZSCOMP_H@
SBINDIR := @CONFIG_SBINDIR@
MANDIR := @CONFIG_MANDIR@
CC := @CC@
@ -117,6 +118,10 @@ PPPDOBJS += isexpired.o
PPPDSRCS += isexpired.c
endif
ifeq ($(HAVE_LZSCOMP_H),1)
CFLAGS += -DHAVE_LZSCOMP_H
endif
%.8: %.man
cp $< $@

View File

@ -25,7 +25,7 @@
* OR MODIFICATIONS.
*/
char ccp_rcsid[] = "$Id: ccp.c,v 1.7 1998/07/08 16:48:20 hipp Exp $";
char ccp_rcsid[] = "$Id: ccp.c,v 1.8 1998/10/16 12:37:45 keil Exp $";
#include <string.h>
#include <syslog.h>
@ -42,7 +42,11 @@ char ccp_rcsid[] = "$Id: ccp.c,v 1.7 1998/07/08 16:48:20 hipp Exp $";
#include "compressions.h"
#ifdef HAVE_LZSCOMP_H
#include <linux/isdn_lzscomp.h>
#else
#include "../ipppcomp/isdn_lzscomp.h"
#endif
/*
* Protocol entry points from main code.

100
ipppd/configure vendored
View File

@ -1305,15 +1305,51 @@ else
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1311: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
ac_safe=`echo "linux/isdn_lzscomp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/isdn_lzscomp.h""... $ac_c" 1>&6
echo "configure:1311: checking for linux/isdn_lzscomp.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
#line 1316 "configure"
#include "confdefs.h"
#include <linux/isdn_lzscomp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
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
HAVE_LZSCOMP_H=1; cat >> confdefs.h <<\EOF
#define HAVE_LZSCOMP_H 1
EOF
else
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1347: 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 <<EOF
#line 1352 "configure"
#include "confdefs.h"
int main() {
@ -1361,7 +1397,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:1365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@ -1382,12 +1418,12 @@ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
echo "configure:1386: checking for pid_t" >&5
echo "configure:1422: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1391 "configure"
#line 1427 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1415,12 +1451,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:1419: checking whether time.h and sys/time.h may both be included" >&5
echo "configure:1455: 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 <<EOF
#line 1424 "configure"
#line 1460 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@ -1429,7 +1465,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
if { (eval echo configure:1433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@ -1450,12 +1486,12 @@ EOF
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
echo "configure:1454: checking for uid_t in sys/types.h" >&5
echo "configure:1490: 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
#line 1459 "configure"
#line 1495 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@ -1485,7 +1521,7 @@ fi
echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
echo "configure:1489: checking type of array argument to getgroups" >&5
echo "configure:1525: checking type of array argument to getgroups" >&5
if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1493,7 +1529,7 @@ else
ac_cv_type_getgroups=cross
else
cat > conftest.$ac_ext <<EOF
#line 1497 "configure"
#line 1533 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
@ -1518,7 +1554,7 @@ main()
}
EOF
if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_type_getgroups=gid_t
else
@ -1532,7 +1568,7 @@ fi
if test $ac_cv_type_getgroups = cross; then
cat > conftest.$ac_ext <<EOF
#line 1536 "configure"
#line 1572 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@ -1557,13 +1593,13 @@ EOF
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
echo "configure:1561: checking whether ${CC-cc} needs -traditional" >&5
echo "configure:1597: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
#line 1567 "configure"
#line 1603 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@ -1581,7 +1617,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
#line 1585 "configure"
#line 1621 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@ -1603,7 +1639,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
echo "configure:1607: checking for 8-bit clean memcmp" >&5
echo "configure:1643: 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
@ -1611,7 +1647,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
#line 1615 "configure"
#line 1651 "configure"
#include "confdefs.h"
main()
@ -1621,7 +1657,7 @@ main()
}
EOF
if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@ -1639,12 +1675,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
echo "configure:1643: checking for vprintf" >&5
echo "configure:1679: 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 <<EOF
#line 1648 "configure"
#line 1684 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@ -1667,7 +1703,7 @@ vprintf();
; return 0; }
EOF
if { (eval echo configure:1671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@ -1691,12 +1727,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
echo "configure:1695: checking for _doprnt" >&5
echo "configure:1731: 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 <<EOF
#line 1700 "configure"
#line 1736 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@ -1719,7 +1755,7 @@ _doprnt();
; return 0; }
EOF
if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@ -1746,12 +1782,12 @@ fi
for ac_func in gethostname gettimeofday select socket strdup strerror strtol strtoul uname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1750: checking for $ac_func" >&5
echo "configure:1786: 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 <<EOF
#line 1755 "configure"
#line 1791 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -1774,7 +1810,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@ -1911,6 +1947,7 @@ fi
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@ -2052,6 +2089,7 @@ s%@HAVE_LIBDES@%$HAVE_LIBDES%g
s%@HAVE_LIBCRYPT@%$HAVE_LIBCRYPT%g
s%@HAVE_LIBBSD@%$HAVE_LIBBSD%g
s%@HAVE_SHADOW_H@%$HAVE_SHADOW_H%g
s%@HAVE_LZSCOMP_H@%$HAVE_LZSCOMP_H%g
s%@CONFIG_RUNDIR@%$CONFIG_RUNDIR%g
s%@CONFIG_SBINDIR@%$CONFIG_SBINDIR%g
s%@CONFIG_MANDIR@%$CONFIG_MANDIR%g

View File

@ -30,6 +30,7 @@ AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h limits.h paths.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h)
AC_CHECK_HEADER(shadow.h, HAVE_SHADOW_H=1; AC_DEFINE(HAVE_SHADOW_H))
AC_CHECK_HEADER(linux/isdn_lzscomp.h, HAVE_LZSCOMP_H=1; AC_DEFINE(HAVE_LZSCOMP_H))
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@ -111,6 +112,7 @@ AC_SUBST(HAVE_LIBDES)
AC_SUBST(HAVE_LIBCRYPT)
AC_SUBST(HAVE_LIBBSD)
AC_SUBST(HAVE_SHADOW_H)
AC_SUBST(HAVE_LZSCOMP_H)
AC_SUBST(CONFIG_RUNDIR)
AC_SUBST(CONFIG_SBINDIR)
AC_SUBST(CONFIG_MANDIR)

View File

@ -17,7 +17,7 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
char options_rcsid[] = "$Id: options.c,v 1.11 1998/07/08 16:48:22 hipp Exp $";
char options_rcsid[] = "$Id: options.c,v 1.12 1998/10/16 12:37:53 keil Exp $";
#include <stdio.h>
#include <errno.h>
@ -53,7 +53,11 @@ char options_rcsid[] = "$Id: options.c,v 1.11 1998/07/08 16:48:22 hipp Exp $";
#include <linux/ppp-comp.h>
#ifdef HAVE_LZSCOMP_H
#include <linux/isdn_lzscomp.h>
#else
#include "../ipppcomp/isdn_lzscomp.h"
#endif
#define FALSE 0
#define TRUE 1

View File

@ -1,4 +1,4 @@
## $Id: Makefile.in,v 1.44 1998/10/13 22:17:09 luethje Exp $
## $Id: Makefile.in,v 1.45 1998/10/16 12:38:04 keil Exp $
##
## ISDN accounting for isdn4linux.
##
@ -19,6 +19,9 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## $Log: Makefile.in,v $
## Revision 1.45 1998/10/16 12:38:04 keil
## fixes to compile and install under 2.0.36
##
## Revision 1.44 1998/10/13 22:17:09 luethje
## isdnlog: evaluate the variable PATH for program starts.
##
@ -429,7 +432,7 @@ clean:
distclean: clean
-rm -f $(PROGS) .depend config.h config.status config.cache \
config.log Makefile confdefs.h policy.h
config.log Makefile confdefs.h policy.h *~
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i distclean; done
ifeq (.depend,$(wildcard .depend))
@ -462,10 +465,10 @@ install: all rootperm installdirs
-@test ! -d $(DESTDIR)$(OLDCONFDIR) || (cp -auv $(DESTDIR)$(OLDCONFDIR)/$(OLDCONFFILE) $(DESTDIR)$(I4LCONFDIR) \
&& $(ISDNREP) 1>/dev/null 2>&1) \
&& mv $(DESTDIR)$(I4LCONFDIR)/$(OLDCONFFILE) $(DESTDIR)$(I4LCONFDIR)/$(OLDCONFFILE).old
@if [ -n "$(DESTDIR)" ]; then
$(GENCONF) $(DESTDIR)$(I4LCONFDIR)/$(CONFFILE).new $(DESTDIR)$(I4LCONFDIR)/$(CALLERIDFILE).new
else
$(GENCONF) $(DESTDIR)$(I4LCONFDIR)/$(CONFFILE) $(DESTDIR)$(I4LCONFDIR)/$(CALLERIDFILE)
@if [ -n "$(DESTDIR)" ]; then \
$(GENCONF) $(DESTDIR)$(I4LCONFDIR)/$(CONFFILE).new $(DESTDIR)$(I4LCONFDIR)/$(CALLERIDFILE).new ; \
else \
$(GENCONF) $(DESTDIR)$(I4LCONFDIR)/$(CONFFILE) $(DESTDIR)$(I4LCONFDIR)/$(CALLERIDFILE) ; \
fi
@echo "Generate config files. Wait a moment..."
-@$(ISDNCONF) -c 040 1>/dev/null 2>&1 || echo "Can not read areacode/avon lib."

View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.9 1998/10/13 22:36:53 keil Exp $
# $Id: Makefile.in,v 1.10 1998/10/16 12:38:11 keil Exp $
#
# Makefile for pcbitctl
# (C) 1997 Fritz Elfert
@ -13,6 +13,7 @@ MODULES = pcbitctl.o convhexbin.o
MANPAGE = pcbitctl.8
SBINDIR = @CONFIG_SBINDIR@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644

2
pcbit/configure vendored
View File

@ -530,7 +530,7 @@ fi
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}`
MANDATE=`grep CHECKIN icnctrl.man.in | awk '{print $4}'`
MANDATE=`grep CHECKIN pcbitctl.man.in | awk '{print $4}'`
# 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

View File

@ -5,7 +5,7 @@ AC_PREFIX_DEFAULT(/usr)
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}`
MANDATE=`grep CHECKIN icnctrl.man.in | awk '{print $4}'`
MANDATE=`grep CHECKIN pcbitctl.man.in | awk '{print $4}'`
dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL