retronetworking
/
isdn4k-utils
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Fix some glibc header file problems 

- Fix some autoconf file syntax, newer autoconf check it strict
This commit is contained in:
keil 2002-07-06 00:11:16 +00:00
parent c751a78d86
commit fe14dca76c
20 changed files with 83 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -1,11 +1,11 @@
# $Id: Makefile,v 1.50 2002/07/04 10:20:06 paul Exp $
# $Id: Makefile,v 1.51 2002/07/06 00:11:16 keil Exp $
#
# Toplevel Makefile for isdn4k-utils
#
.EXPORT_ALL_VARIABLES:
export I4LVERSION = 3.1pre4
export I4LVERSION = 3.1
all: do-it-all
@ -24,11 +24,13 @@ CONFIGURATION = config
do-it-all: config
endif
EXTRADIRS = isdnlog/tools/cdb isdnlog/tools/zone isdnlog/tools/dest
EXTRADIRS = isdnlog/tools/zone isdnlog/tools/dest
BUILD_ONLY :=
SUBDIRS :=
ifeq ($(CONFIG_ISDNLOG),y)
SUBDIRS := $(SUBDIRS) lib $(EXTRADIRS) isdnlog
BUILD_ONLY := isdnlog/tools/cdb
else
ifeq ($(CONFIG_CTRL_CONF),y)
SUBDIRS := $(SUBDIRS) lib
@ -119,7 +121,7 @@ ifneq ($(SUBDIRS),)
endif
subtargets: $(CONFIGURATION)
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i all; done
set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do $(MAKE) -C $$i all; done
rootperm:
@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
@ -153,7 +155,7 @@ clean:
for i in `echo ${wildcard */Makefile}`; do \
$(MAKE) -i -C `dirname $$i` clean; \
done;
for i in `echo $(EXTRADIRS)`; do \
for i in `echo $(BUILD_ONLY) $(EXTRADIRS)`; do \
if [ -f $$i/Makefile ]; then $(MAKE) -i -C $$i clean; fi; \
done;
-rm -f *~ *.o
@ -170,7 +172,7 @@ distclean: clean
$(MAKE) -i -C `dirname $$i` distclean; \
fi ; \
done;
for i in `echo $(EXTRADIRS)`; do \
for i in `echo $(BUILD_ONLY) $(EXTRADIRS)`; do \
if [ -f $$i/Makefile ]; then $(MAKE) -i -C $$i distclean; fi; \
done;
-rm -f *~ .config .config.old scripts/autoconf.h .menuconfig \
@ -196,8 +198,8 @@ cfgerror:
# - if a Makefile already exists, make config
#
subconfig: scripts/autoconf.h
@echo Selected subdirs: $(SUBDIRS)
@set -e; for i in `echo $(SUBDIRS)`; do \
@echo Selected subdirs: $(BUILD_ONLY) $(SUBDIRS)
@set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
if [ -x $$i/configure ] ; then \
/bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \

2
act2000/configure.in
View File

@ -23,7 +23,7 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
dnl Find current kernel source
AC_FIND_KERNEL
AC_CHECK_HEADERS($CONFIG_KERNELDIR/drivers/isdn/act2000/act2000.h,,
AC_MSG_ERROR("Not found. You MUST specify a correct path to linux source!")
[AC_MSG_ERROR([Not found. You MUST specify a correct path to linux source!])]
)
dnl Checks for typedefs, structures, and compiler characteristics.

2
avmb1/configure.in
View File

@ -24,7 +24,7 @@ AC_FIND_KERNEL
OLD_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I$CONFIG_KERNELDIR/include $CPPFLAGS"
AC_CHECK_HEADERS(linux/isdn.h linux/b1lli.h linux/capi.h linux/kernelcapi.h,,
AC_MSG_ERROR("Missing $ac_hdr. Kernel source installed?"))
[AC_MSG_ERROR([Missing $ac_hdr. Kernel source installed?])])
CPPFLAGS="$OLD_CPPFLAGS"
dnl Checks for typedefs, structures, and compiler characteristics.

2
capiinfo/configure.in
View File

@ -19,7 +19,7 @@ dnl Checks for libraries.
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(linux/capi.h,,
AC_MSG_ERROR("Missing $ac_hdr. Kernel source installed?"))
[AC_MSG_ERROR([Missing $ac_hdr. Kernel source installed?])])
dnl not used AC_CHECK_HEADERS(capi20.h)
dnl Checks for typedefs, structures, and compiler characteristics.

2
capiinit/configure.in
View File

@ -12,7 +12,7 @@ dnl Checks for libraries.
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(linux/capi.h,,
AC_MSG_ERROR("Missing $ac_hdr. Kernel source installed?"))
[AC_MSG_ERROR([Missing $ac_hdr. Kernel source installed?])])
AC_CHECK_HEADERS(capi20.h)
dnl Checks for typedefs, structures, and compiler characteristics.

21
eicon/configure.in
View File

@ -16,25 +16,26 @@ AC_PROG_CC
dnl Checks for libraries.
AC_CHECK_LIB(ncurses, newpad,,
AC_CHECK_LIB(curses, newpad,,
AC_MSG_ERROR("Missing ncurses library")))
[AC_CHECK_LIB(curses, newpad,,
[AC_MSG_ERROR([Missing ncurses library])])])
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
AC_CHECK_HEADERS(ncurses.h,,
AC_CHECK_HEADERS(ncurses/curses.h,,
AC_CHECK_HEADERS(curses/ncurses.h,,
AC_CHECK_HEADERS(curses.h,,
AC_MSG_ERROR("Missing \(n\)curses.h")))))
[AC_CHECK_HEADERS(ncurses/curses.h,,
[AC_CHECK_HEADERS(curses/ncurses.h,,
[AC_CHECK_HEADERS(curses.h,,
[AC_MSG_ERROR([Missing \(n\)curses.h])])])])])
dnl Find current kernel source
AC_FIND_KERNEL
AC_CHECK_HEADER($CONFIG_KERNELDIR/include/linux/isdn.h,,
AC_MSG_ERROR("$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?")
)
AC_CHECK_HEADER(linux/isdn.h,,
[AC_CHECK_HEADER($CONFIG_KERNELDIR/include/linux/isdn.h,,
[AC_MSG_ERROR([$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?])]
)])
AC_CHECK_HEADER($CONFIG_KERNELDIR/drivers/isdn/eicon/eicon.h,,
AC_MSG_ERROR("$CONFIG_KERNELDIR/drivers/isdn/eicon/eicon.h missing. Kernel installed?")
[AC_MSG_ERROR([$CONFIG_KERNELDIR/drivers/isdn/eicon/eicon.h missing. Kernel installed?])]
)
dnl Checks for typedefs, structures, and compiler characteristics.

6
eurofile/src/wuauth/config.h
View File

@ -1,8 +1,12 @@
/*
* Linux configuration file
* $Id: config.h,v 1.2 1999/10/05 21:23:23 he Exp $
* $Id: config.h,v 1.3 2002/07/06 00:11:18 keil Exp $
*/
#if 0
#include <linux/version.h>
#else
#define LINUX_VERSION_CODE 0x020404
#endif
#if defined(LINUX_VERSION_CODE)
#if LINUX_VERSION_CODE >= 66061
/* 1.2.13 or later */

2
hisax/configure.in
View File

@ -25,7 +25,7 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
dnl Find current kernel source
AC_FIND_KERNEL
AC_CHECK_FILE($CONFIG_KERNELDIR/include/linux/isdn.h,,
AC_MSG_ERROR("$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?")
[AC_MSG_ERROR([$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?])]
)
dnl Checks for typedefs, structures, and compiler characteristics.

4
icn/configure.in
View File

@ -23,11 +23,11 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
dnl Find current kernel source
AC_FIND_KERNEL
AC_CHECK_FILE($CONFIG_KERNELDIR/include/linux/isdn.h,,
AC_MSG_ERROR("$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?")
[AC_MSG_ERROR([$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?])]
)
AC_CHECK_HEADERS($CONFIG_KERNELDIR/drivers/isdn/icn/icn.h,,
AC_MSG_ERROR("$CONFIG_KERNELDIR/drivers/isdn/icn/icn.h missing. Kernel installed?")
[AC_MSG_ERROR([$CONFIG_KERNELDIR/drivers/isdn/icn/icn.h missing. Kernel installed?])]
)
dnl Checks for typedefs, structures, and compiler characteristics.

10
imon/configure.in
View File

@ -22,15 +22,15 @@ dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(sys/time.h unistd.h)
AC_CHECK_HEADERS(ncurses.h,,
AC_CHECK_HEADERS(ncurses/curses.h,,
AC_CHECK_HEADERS(curses/ncurses.h,,
AC_CHECK_HEADERS(curses.h,,
AC_MSG_ERROR("Missing \(n\)curses.h")))))
[AC_CHECK_HEADERS(ncurses/curses.h,,
[AC_CHECK_HEADERS(curses/ncurses.h,,
[AC_CHECK_HEADERS(curses.h,,
[AC_MSG_ERROR([Missing \(n\)curses.h])])])])])
dnl Check for linux/isdn.h, give up if not found.
AC_FIND_KERNEL
AC_CHECK_FILE($CONFIG_KERNELDIR/include/linux/isdn.h,,
AC_MSG_ERROR("Missing $CONFIG_KERNELDIR/include/linux/isdn.h. Kernel source installed?")
[AC_MSG_ERROR([Missing $CONFIG_KERNELDIR/include/linux/isdn.h. Kernel source installed?])]
)
dnl Checks for typedefs, structures, and compiler characteristics.

2
ipppd/configure.in
View File

@ -21,7 +21,7 @@ AC_FIND_KERNEL
dnl Checks for libraries.
AC_CHECK_LIB(bsd, daemon,HAVE_LIBBSD=1; AC_DEFINE(HAVE_LIBBSD),
AC_MSG_WARN(Could not find libbsd, build disabled))
[AC_MSG_WARN(Could not find libbsd, build disabled)])
dnl Replace `main' with a function in -lcrypt:
AC_CHECK_LIB(crypt, main,HAVE_LIBCRYPT=1; AC_DEFINE(HAVE_LIBCRYPT))
AC_CHECK_LIB(des, des_ecb_encrypt, HAVE_LIBDES=1; AC_DEFINE(HAVE_LIBDES))

4
ipppd/ipppd.h
View File

@ -18,7 +18,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: ipppd.h,v 1.20 2000/07/25 20:23:51 kai Exp $
* $Id: ipppd.h,v 1.21 2002/07/06 00:11:18 keil Exp $
*/
/*
@ -48,6 +48,7 @@
# include <utmp.h>
#endif
#if 0
#include <linux/version.h>
#if (LINUX_VERSION_CODE < ((0x020100)+88))
#define ISDN_PPP_COMP_MAX_OPTIONS 16
@ -58,6 +59,7 @@ struct isdn_ppp_comp_data {
int flags;
};
#endif
#endif
#ifndef PPP_LINK_CCP
#define PPP_LINK_CCP 0x80fb

3
ipppd/main.c
View File

@ -25,7 +25,7 @@
* PATCHLEVEL 9
*/
char main_rcsid[] = "$Id: main.c,v 1.20 2002/01/31 19:49:07 paul Exp $";
char main_rcsid[] = "$Id: main.c,v 1.21 2002/07/06 00:11:18 keil Exp $";
#include <stdio.h>
#include <stdarg.h>
@ -40,6 +40,7 @@ char main_rcsid[] = "$Id: main.c,v 1.20 2002/01/31 19:49:07 paul Exp $";
#include <pwd.h>
#include <unistd.h>
#include <ctype.h>
#include <time.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/wait.h>

4
isdnlog/configure.in
View File

@ -136,8 +136,8 @@ if test -e tools/cdb/i4l_cdb.c ; then
AC_MSG_RESULT(Using 'cdb' as database)
else
AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM),
AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM),
AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))))
[AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM),
[AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])])
fi
AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT")

6
isdnlog/tools/dest/configure.in
View File

@ -23,9 +23,9 @@ else
dnl Checks for libraries.
dnl Berkeley DB appends RDBEXT
AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm;DBEXT=".gdbm";RDBEXT=".gdbm"; AC_DEFINE(HAVE_LIBGDBM),
AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDBM),
AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDB),
AC_MSG_ERROR('No db found'))))
[AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDBM),
[AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDB),
[AC_MSG_ERROR([No db found])])])])
dnl Checks for header files.
fi

6
isdnlog/tools/zone/configure.in
View File

@ -25,9 +25,9 @@ dnl Checks for libraries.
dnl Berkeley DB appends RDBEXT
CDBEXTRALIBS=""
AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm;DBEXT=".gdbm";RDBEXT=".gdbm"; AC_DEFINE(HAVE_LIBGDBM),
AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDBM),
AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDB),
AC_MSG_ERROR("No db found"))))
[AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDBM),
[AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDB),
[AC_MSG_ERROR([No db found])])])])
fi
AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT")

2
pcbit/configure.in
View File

@ -20,7 +20,7 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
dnl Find current kernel source
AC_FIND_KERNEL
AC_CHECK_FILE($CONFIG_KERNELDIR/include/linux/isdn.h,,
AC_MSG_ERROR("$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?")
[AC_MSG_ERROR([$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?])]
)
dnl Checks for typedefs, structures, and compiler characteristics.

24
vbox/acinclude.m4
View File

@ -36,36 +36,36 @@ AC_DEFUN(GND_PACKAGE_TCL,
if (test "${gnd_use_tcl_lib}" = "")
then
gnd_1st_tcl_lib_test="tcl8.0"
gnd_2nd_tcl_lib_test="tcl7.6"
gnd_3rd_tcl_lib_test="tcl"
gnd_1st_tcl_lib_test="tcl8.4"
gnd_2nd_tcl_lib_test="tcl8.3"
gnd_3rd_tcl_lib_test="tcl8.0"
else
gnd_1st_tcl_lib_test="${gnd_use_tcl_lib}"
gnd_2nd_tcl_lib_test="tcl8.0"
gnd_3rd_tcl_lib_test="tcl7.6"
gnd_2nd_tcl_lib_test="tcl8.4"
gnd_3rd_tcl_lib_test="tcl8.3"
fi
AC_CHECK_LIB(m,
cos,
AC_CHECK_LIB(dl,
dlerror,
AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
[AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl",
AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
[AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl",
AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
[AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl",
,
${gnd_tcl_lib_dir} -lm -ldl
),
)],
${gnd_tcl_lib_dir} -lm -ldl
),
)],
${gnd_tcl_lib_dir} -lm -ldl
),
),
)],
)],
)
if (test "${LINK_TCL_LIBS}" != "")

26
vbox/aclocal.m4 vendored
View File

@ -48,36 +48,36 @@ AC_DEFUN(GND_PACKAGE_TCL,
if (test "${gnd_use_tcl_lib}" = "")
then
gnd_1st_tcl_lib_test="tcl8.0"
gnd_2nd_tcl_lib_test="tcl7.6"
gnd_3rd_tcl_lib_test="tcl"
gnd_1st_tcl_lib_test="tcl8.4"
gnd_2nd_tcl_lib_test="tcl8.3"
gnd_3rd_tcl_lib_test="tcl8.0"
else
gnd_1st_tcl_lib_test="${gnd_use_tcl_lib}"
gnd_2nd_tcl_lib_test="tcl8.0"
gnd_3rd_tcl_lib_test="tcl7.6"
gnd_2nd_tcl_lib_test="tcl8.4"
gnd_3rd_tcl_lib_test="tcl8.3"
fi
AC_CHECK_LIB(m,
cos,
AC_CHECK_LIB(dl,
[AC_CHECK_LIB(dl,
dlerror,
AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
[AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl",
AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
[AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl",
AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
[AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl",
,
${gnd_tcl_lib_dir} -lm -ldl
),
)],
${gnd_tcl_lib_dir} -lm -ldl
),
)],
${gnd_tcl_lib_dir} -lm -ldl
),
),
)],
)],
)
if (test "${LINK_TCL_LIBS}" != "")

10
vbox/configure vendored
View File

@ -2016,13 +2016,13 @@ fi
if (test "${gnd_use_tcl_lib}" = "")
then
gnd_1st_tcl_lib_test="tcl8.0"
gnd_2nd_tcl_lib_test="tcl7.6"
gnd_3rd_tcl_lib_test="tcl"
gnd_1st_tcl_lib_test="tcl8.4"
gnd_2nd_tcl_lib_test="tcl8.3"
gnd_3rd_tcl_lib_test="tcl8.0"
else
gnd_1st_tcl_lib_test="${gnd_use_tcl_lib}"
gnd_2nd_tcl_lib_test="tcl8.0"
gnd_3rd_tcl_lib_test="tcl7.6"
gnd_2nd_tcl_lib_test="tcl8.4"
gnd_3rd_tcl_lib_test="tcl8.3"
fi
echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6