More changes to compile without kernel source
parent
6bebcfad40
commit
4e3cdc70f0
|
@ -50,7 +50,6 @@ NORMAL_UNINSTALL = true
|
|||
PRE_UNINSTALL = true
|
||||
POST_UNINSTALL = true
|
||||
CC = gcc
|
||||
CONFIG_KERNELDIR = /usr/src/linux
|
||||
CONFIG_MANDIR = /usr/man
|
||||
CONFIG_SBINDIR = /sbin
|
||||
I4LCONFDIR = /etc/isdn
|
||||
|
|
|
@ -58,7 +58,6 @@ NORMAL_UNINSTALL = :
|
|||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
CC = @CC@
|
||||
CONFIG_KERNELDIR = @CONFIG_KERNELDIR@
|
||||
CONFIG_MANDIR = @CONFIG_MANDIR@
|
||||
CONFIG_SBINDIR = @CONFIG_SBINDIR@
|
||||
I4LCONFDIR = @I4LCONFDIR@
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,6 @@ AC_PREFIX_DEFAULT(/usr)
|
|||
|
||||
I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}`
|
||||
I4LVERSION=${I4LVERSION:-"?.?"}
|
||||
CONFIG_KERNELDIR=${CONFIG_KERNELDIR:-"/usr/src/linux"}
|
||||
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
|
||||
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
|
||||
#MANDATE=`grep CHECKIN isdnctrl.man.in | awk '{print $4}'`
|
||||
|
@ -41,7 +40,6 @@ AC_ARG_WITH(man,
|
|||
AC_SUBST(INSTALL)
|
||||
AC_SUBST(I4LCONFDIR)
|
||||
AC_SUBST(I4LVERSION)
|
||||
AC_SUBST(CONFIG_KERNELDIR)
|
||||
AC_SUBST(CONFIG_SBINDIR)
|
||||
AC_SUBST(CONFIG_MANDIR)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
dnl
|
||||
dnl Try finding linux sourcetree
|
||||
dnl
|
||||
|
||||
AC_DEFUN(AC_FIND_KERNEL, [
|
||||
OLD_CPPFLAGS="$CPPFLAGS"
|
||||
lxdir="no"
|
||||
eval tst_kerneldir=$CONFIG_KERNELDIR
|
||||
|
||||
AC_ARG_WITH(kernel,
|
||||
[ --with-kernel=DIR Set kernel source directory [/usr/src/linux]],
|
||||
DOTEST="y"; tst_kerneldir="${withval}")
|
||||
|
||||
if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then
|
||||
AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}])
|
||||
CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn"
|
||||
AC_TRY_CPP([#include <isdn_common.h>], lxdir=${tst_kerneldir},
|
||||
AC_MSG_RESULT("no"))
|
||||
fi
|
||||
if test "$lxdir" = "no" ; then
|
||||
AC_MSG_CHECKING([for linux kernel source in /usr/src/linux])
|
||||
CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn"
|
||||
AC_TRY_CPP([#include <isdn_common.h>], lxdir=/usr/src/linux)
|
||||
fi
|
||||
if test "$lxdir" = "no" ; then
|
||||
AC_MSG_RESULT("$lxdir")
|
||||
AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux])
|
||||
CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn"
|
||||
AC_TRY_CPP([#include <isdn_common.h>], lxdir=/usr/local/src/linux)
|
||||
fi
|
||||
if test "$lxdir" != "no" ; then
|
||||
AC_MSG_RESULT("yes")
|
||||
else
|
||||
lxdir=""
|
||||
AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.")
|
||||
fi
|
||||
CONFIG_KERNELDIR="$lxdir"
|
||||
CPPFLAGS="$OLD_CPPFLAGS"
|
||||
AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir")
|
||||
AC_SUBST(CONFIG_KERNELDIR)
|
||||
])
|
||||
|
|
@ -25,7 +25,6 @@ SBINDIR = @SBINDIR@
|
|||
BINDIR = @BINDIR@
|
||||
RUNDIR = @RUNDIR@
|
||||
SYSVINIT_RC_DIR = @SYSVINIT_RC_DIR@
|
||||
KERNELDIR = @KERNELDIR@
|
||||
I4LCONFDIR = @I4LCONFDIR@
|
||||
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -44,7 +44,6 @@ I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}`
|
|||
I4LVERSION=${I4LVERSION:-"?.?"}
|
||||
BINDIR=`eval echo ${CONFIG_BINDIR:-'\\${bindir}'}`
|
||||
SBINDIR=`eval echo ${CONFIG_SBINDIR:-'\\${sbindir}'}`
|
||||
KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}`
|
||||
dnl RUNDIR=`eval echo ${CONFIG_RUNDIR:-'\\${localstatedir}/run'}`
|
||||
dnl enforce a unique dire for pidfiles, independent of install patch
|
||||
RUNDIR=`eval echo ${CONFIG_RUNDIR:-"/var/run"}`
|
||||
|
@ -109,7 +108,6 @@ AC_SUBST(I4LCONFDIR)
|
|||
AC_SUBST(EFT_TOPDIR)
|
||||
AC_SUBST_FILE(EFT_AUTOCONF_WARNING)
|
||||
AC_SUBST(I4LVERSION)
|
||||
AC_SUBST(KERNELDIR)
|
||||
|
||||
AC_SUBST(BINDIR)
|
||||
AC_SUBST(SBINDIR)
|
||||
|
|
|
@ -46,7 +46,6 @@ KHOME=/home/kernel
|
|||
# "x25-on-top-of-isdn"-extensions is located. (To override the default
|
||||
# location set the environment variable KERNEL before calling this script)
|
||||
#
|
||||
KERNEL=${KERNEL:-linux-ix25}
|
||||
#
|
||||
#Where the x25 utility package is located
|
||||
#
|
||||
|
|
|
@ -14,11 +14,10 @@ CURRENT_DIR := $(shell pwd)
|
|||
EFT_LIBDIR = $(CURRENT_DIR)/eft
|
||||
EFT_INCDIR = $(CURRENT_DIR)/eft/include
|
||||
EFT_AUTHDIR = $(CURRENT_DIR)/wuauth
|
||||
KERNEL_INCDIR = $(KERNELDIR)/include
|
||||
|
||||
CFLAGS += -g -Wall
|
||||
|
||||
export EFT_LIBDIR EFT_INCDIR EFT_AUTHDIR CONFIG_EFTP_READLINE CONFIG_EFTD_WUAUTH CRYPTLIB CFLAGS KERNEL_INCDIR INSTALL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SYSVINIT_RC_DIR prefix exec_prefix bindir sbindir BINDIR SBINDIR CONFIG_EFTP_SETUID
|
||||
export EFT_LIBDIR EFT_INCDIR EFT_AUTHDIR CONFIG_EFTP_READLINE CONFIG_EFTD_WUAUTH CRYPTLIB CFLAGS INSTALL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SYSVINIT_RC_DIR prefix exec_prefix bindir sbindir BINDIR SBINDIR CONFIG_EFTP_SETUID
|
||||
|
||||
LIBDIRS = eft wuauth
|
||||
CLIENTDIRS = eftp
|
||||
|
|
|
@ -22,7 +22,7 @@ INSTALL=install
|
|||
INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
|
||||
MANPAGE=imontty.8
|
||||
|
||||
CCFLAGS=-O2 -I$(CONFIG_KERNELDIR)/include
|
||||
CCFLAGS=-O2
|
||||
#CCFLAGS=-I$(ISDN_INCLUDE) -g
|
||||
|
||||
# nothing to change behind this line
|
||||
|
|
|
@ -1200,7 +1200,6 @@ MANDATE=`grep CHECKIN ipppd.man.in | awk '{print $4}'`
|
|||
CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}`
|
||||
CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}`
|
||||
CONFIG_RUNDIR=`eval echo ${CONFIG_RUNDIR:-"/var/run"}`
|
||||
CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}`
|
||||
CONFIG_IPPPD_MSCHAP=${CONFIG_IPPPD_MSCHAP:-"n"}
|
||||
CONFIG_IPPPD_RADIUS=${CONFIG_IPPPD_RADIUS:-"n"}
|
||||
CONFIG_RADIUS_WTMP_LOGGING=${CONFIG_RADIUS_WTMP_LOGGING:-"n"}
|
||||
|
@ -2066,8 +2065,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
|||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
AC_FIND_KERNEL
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for daemon in -lbsd" >&5
|
||||
echo $ECHO_N "checking for daemon in -lbsd... $ECHO_C" >&6
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
SHELL = /bin/sh
|
||||
CFLAGS = -Wall -O2
|
||||
INCLUDES = -I. -I@CONFIG_KERNELDIR@/include
|
||||
INCLUDES = -I.
|
||||
LDFLAGS = -L../lib @LIBS@
|
||||
PROGRAM = iprofd
|
||||
MODULES = iprofd.o
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
sinclude(../etc/ackernel.m4)dnl
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,6 @@ AC_PREFIX_DEFAULT(/usr)
|
|||
I4LVERSION=${I4LVERSION:-"?.?"}
|
||||
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
|
||||
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
|
||||
CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}`
|
||||
MANDATE=`grep CHECKIN iprofd.man.in | awk '{print $4}'`
|
||||
|
||||
dnl Checks for programs.
|
||||
|
@ -18,12 +17,6 @@ dnl Checks for header files.
|
|||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
|
||||
|
||||
dnl Find current kernel source
|
||||
dnl AC_FIND_KERNEL
|
||||
dnl AC_CHECK_FILE($CONFIG_KERNELDIR/include/linux/isdn.h,,
|
||||
dnl AC_MSG_ERROR("$CONFIG_KERNELDIR/include/linux/isdn.h missing. Kernel installed?")
|
||||
dnl)
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
|
||||
dnl Checks for library functions.
|
||||
|
@ -48,5 +41,4 @@ AC_SUBST(MANDATE)
|
|||
AC_SUBST(I4LVERSION)
|
||||
AC_SUBST(CONFIG_SBINDIR)
|
||||
AC_SUBST(CONFIG_MANDIR)
|
||||
AC_SUBST(CONFIG_KERNELDIR)
|
||||
AC_OUTPUT(Makefile iprofd.man)
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
SHELL = /bin/sh
|
||||
CFLAGS = -Wall -O2
|
||||
INCLUDES = -I. -I@CONFIG_KERNELDIR@/include
|
||||
INCLUDES = -I.
|
||||
LDFLAGS = @LIBS@
|
||||
PROGRAM = isdnctrl
|
||||
MODULES = isdnctrl.o
|
||||
|
|
|
@ -1,11 +1,7 @@
|
|||
|
||||
sinclude(../etc/ackernel.m4)dnl
|
||||
|
||||
AC_DEFUN(AC_CHECK_TIMRU, [
|
||||
OLD_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="-nostdinc -I${CONFIG_KERNELDIR}/include"
|
||||
have_timru="no"
|
||||
AC_MSG_CHECKING([for TIMRU in ${CONFIG_KERNELDIR}/include/linux/isdn.h])
|
||||
AC_MSG_CHECKING([for TIMRU in linux/isdn.h])
|
||||
AC_TRY_COMPILE([#include <linux/isdn.h>],int x = IIOCNETARU;,have_timru="yes",)
|
||||
AC_MSG_RESULT("${have_timru}")
|
||||
CPPFLAGS="$OLD_CPPFLAGS"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,6 @@ AC_PREFIX_DEFAULT(/usr)
|
|||
I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}`
|
||||
I4LCONFFILE=`eval echo ${CONFIG_CONFFILE:-"/etc/isdn"}`
|
||||
I4LVERSION=${I4LVERSION:-"?.?"}
|
||||
CONFIG_KERNELDIR=${CONFIG_KERNELDIR:-"/usr/src/linux"}
|
||||
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
|
||||
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
|
||||
CONFIG_ISDNCTRL_CONF=${CONFIG_ISDNCTRL_CONF:-"n"}
|
||||
|
@ -55,7 +54,6 @@ AC_SUBST(I4LCONFFILE)
|
|||
AC_SUBST(I4LVERSION)
|
||||
AC_SUBST(CONFIG_ISDNCTRL_CONF)
|
||||
AC_SUBST(CONFIG_ISDNCTRL_DWABC_UDP_INFO)
|
||||
AC_SUBST(CONFIG_KERNELDIR)
|
||||
AC_SUBST(CONFIG_SBINDIR)
|
||||
AC_SUBST(CONFIG_MANDIR)
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
|
|
@ -7,7 +7,7 @@ CLEANFILES = *~ comperr
|
|||
MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \
|
||||
stamp-h.in comperr
|
||||
|
||||
INCLUDES = -I../capi20 -I$(CONFIG_KERNELDIR)/drivers/isdn/avmb1 $(all_includes)
|
||||
INCLUDES = -I../capi20 $(all_includes)
|
||||
CFLAGS = -Wall -O2
|
||||
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
|
||||
LDADD = -lcapi20
|
||||
|
|
|
@ -12,7 +12,6 @@ ifeq (../.config,$(wildcard ../.config))
|
|||
MAN5DIROPT = FILEMANDIR=$(CONFIG_MANDIR)/man5
|
||||
MANDIROPTS = $(MAN1DIROPT) $(MAN3DIROPT) $(MAN5DIROPT)
|
||||
BINDIROPT = BINDIR=$(CONFIG_BINDIR)
|
||||
EDEF += -I$(CONFIG_KERNELDIR)/include
|
||||
endif
|
||||
|
||||
all: xisdnload
|
||||
|
|
|
@ -29,9 +29,6 @@ ifeq (../.config,$(wildcard ../.config))
|
|||
ifneq ($(CONFIG_XMONISDN_DOWNCMD),"")
|
||||
I4LU_DEFINES += -DNETDOWN_COMMAND=\\\"'$(shell echo $(CONFIG_XMONISDN_DOWNCMD))'\\\"
|
||||
endif
|
||||
ifneq ($(CONFIG_KERNELDIR),"")
|
||||
I4LU_DEFINES += -I'$(shell echo $(CONFIG_KERNELDIR))'/include
|
||||
endif
|
||||
MAN1DIROPT = MANDIR=$(CONFIG_MANDIR)/man1
|
||||
MAN3DIROPT = LIBMANDIR=$(CONFIG_MANDIR)/man3
|
||||
MAN5DIROPT = FILEMANDIR=$(CONFIG_MANDIR)/man5
|
||||
|
|
Loading…
Reference in New Issue