diff --git a/rcapid/.Config.in b/rcapid/.Config.in deleted file mode 100644 index 33548a1b..00000000 --- a/rcapid/.Config.in +++ /dev/null @@ -1,4 +0,0 @@ -mainmenu_option next_comment -comment 'Options for rcapid package' -string 'CAPI-ADK directory' CONFIG_C20LIBDIR -endmenu diff --git a/rcapid/Makefile.in b/rcapid/Makefile.in index 56bbca3c..1c4fc8b7 100644 --- a/rcapid/Makefile.in +++ b/rcapid/Makefile.in @@ -5,9 +5,9 @@ # SHELL = /bin/sh CFLAGS = -O2 -INCLUDES = -I. -I@CONFIG_C20LIBDIR@/source -I@CONFIG_KERNELDIR@/drivers/isdn/avmb1 +INCLUDES = -I. -I../capi20 -I@CONFIG_KERNELDIR@/drivers/isdn/avmb1 DEFS = -DTARGET_32BIT -LDFLAGS = -L@CONFIG_C20LIBDIR@/linux -lc20 @LIBS@ +LDFLAGS = -L../capi20 -lcapi20 @LIBS@ PROGRAM = rcapid MODULES = rcapid.o MANPAGE = diff --git a/rcapid/configure b/rcapid/configure index 455a0934..ae146914 100755 --- a/rcapid/configure +++ b/rcapid/configure @@ -18,8 +18,6 @@ ac_help="$ac_help --with-sbin=DIR Set dir where binary is installed. [/sbin]" ac_help="$ac_help --with-man=DIR Set manpage dir. [/usr/man]" -ac_help="$ac_help - --with-c20lib=DIR Set c20lib dir. [/usr/src/capi-adk/c20lib]" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -533,12 +531,11 @@ I4LVERSION=${I4LVERSION:-"?.?"} CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}` -CONFIG_C20LIBDIR=`eval echo ${CONFIG_C20LIBDIR:-"/usr/src/capi-adk/c20lib"}` # 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 -echo "configure:542: checking for $ac_word" >&5 +echo "configure:539: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -567,7 +564,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:571: checking for $ac_word" >&5 +echo "configure:568: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -615,7 +612,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:619: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:616: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -625,11 +622,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -649,12 +646,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:653: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:650: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:658: checking whether we are using GNU C" >&5 +echo "configure:655: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -663,7 +660,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -678,7 +675,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:682: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:679: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -706,7 +703,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:710: checking how to run the C preprocessor" >&5 +echo "configure:707: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -721,13 +718,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -738,13 +735,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -796,7 +793,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:800: checking for a BSD compatible install" >&5 +echo "configure:797: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -851,17 +848,17 @@ for ac_hdr in fcntl.h sys/ioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:855: checking for $ac_hdr" >&5 +echo "configure:852: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -902,15 +899,15 @@ fi if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then echo $ac_n "checking for linux kernel source in ${tst_kerneldir}""... $ac_c" 1>&6 -echo "configure:906: checking for linux kernel source in ${tst_kerneldir}" >&5 +echo "configure:903: checking for linux kernel source in ${tst_kerneldir}" >&5 CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -926,15 +923,15 @@ rm -f conftest* fi if test "$lxdir" = "no" ; then echo $ac_n "checking for linux kernel source in /usr/src/linux""... $ac_c" 1>&6 -echo "configure:930: checking for linux kernel source in /usr/src/linux" >&5 +echo "configure:927: checking for linux kernel source in /usr/src/linux" >&5 CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -949,15 +946,15 @@ rm -f conftest* if test "$lxdir" = "no" ; then echo "$ac_t"""$lxdir"" 1>&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 -echo "configure:953: checking for linux kernel source in /usr/local/src/linux" >&5 +echo "configure:950: checking for linux kernel source in /usr/local/src/linux" >&5 CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -987,13 +984,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:991: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:988: 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 < Autoconf TIOCGETP @@ -1011,7 +1008,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1033,12 +1030,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1037: checking for ANSI C header files" >&5 +echo "configure:1034: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1046,7 +1043,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1063,7 +1060,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1081,7 +1078,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1102,7 +1099,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1113,7 +1110,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1137,12 +1134,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1141: checking return type of signal handlers" >&5 +echo "configure:1138: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1159,7 +1156,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1180,12 +1177,12 @@ EOF for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1184: checking for $ac_func" >&5 +echo "configure:1181: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1255,18 +1252,6 @@ EOF fi -# Check whether --with-c20lib or --without-c20lib was given. -if test "${with_c20lib+set}" = set; then - withval="$with_c20lib" - CONFIG_C20LIBDIR="${withval}" - cat >> confdefs.h <<\EOF -#define CONFIG_C20LIBDIR "${withval}" -EOF - -fi - - - @@ -1425,7 +1410,6 @@ s%@I4lVERSION@%$I4lVERSION%g s%@MANDATE@%$MANDATE%g s%@CONFIG_SBINDIR@%$CONFIG_SBINDIR%g s%@CONFIG_MANDIR@%$CONFIG_MANDIR%g -s%@CONFIG_C20LIBDIR@%$CONFIG_C20LIBDIR%g s%@INSTALL@%$INSTALL%g CEOF diff --git a/rcapid/configure.in b/rcapid/configure.in index 96276d54..4b2c5741 100644 --- a/rcapid/configure.in +++ b/rcapid/configure.in @@ -6,7 +6,6 @@ I4LVERSION=${I4LVERSION:-"?.?"} CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}` -CONFIG_C20LIBDIR=`eval echo ${CONFIG_C20LIBDIR:-"/usr/src/capi-adk/c20lib"}` dnl Checks for programs. AC_PROG_CC @@ -42,18 +41,10 @@ AC_ARG_WITH(man, AC_DEFINE(CONFIG_MANDIR,"${withval}"), ) -dnl Optional c20lib directory -AC_ARG_WITH(c20lib, - [ --with-c20lib=DIR Set c20lib dir. [/usr/src/capi-adk/c20lib]], - CONFIG_C20LIBDIR="${withval}" - AC_DEFINE(CONFIG_C20LIBDIR,"${withval}"), -) - AC_SUBST(I4lVERSION) AC_SUBST(MANDATE) AC_SUBST(CONFIG_SBINDIR) AC_SUBST(CONFIG_MANDIR) AC_SUBST(CONFIG_KERNELDIR) -AC_SUBST(CONFIG_C20LIBDIR) AC_SUBST(INSTALL) AC_OUTPUT(Makefile) diff --git a/rcapid/rcapid.c b/rcapid/rcapid.c index 9048fb79..d06ffe69 100644 --- a/rcapid/rcapid.c +++ b/rcapid/rcapid.c @@ -385,7 +385,7 @@ hdl_RCAPI_REGISTER_REQ(struct capi_message *msg) { else { local_ApplID = capi_fd; log(5, "registration successful: appl_id = %d\n", capi_fd); - capi_fd = applid2fd(capi_fd); + capi_fd = capi20_fileno(capi_fd); log(5, " capi_fd = %d\n", capi_fd); } } else