Handle changed type for capi_mod.h IsInstalled member

Version 2.0.12

Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
This commit is contained in:
Karsten Keil 2012-05-11 17:51:39 +02:00
parent dfa4b851ef
commit 28e7f4552f
15 changed files with 92 additions and 41 deletions

View File

@ -135,6 +135,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -99,6 +99,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -106,6 +106,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -1,6 +1,6 @@
lib_capi_mod_misdn_la_SOURCES = capi_mod_misdn.c lib_capi_mod_misdn_la_SOURCES = capi_mod_misdn.c
lib_capi_mod_misdn_la_CFLAGS = -fno-strict-aliasing -Wall lib_capi_mod_misdn_la_CFLAGS = -fno-strict-aliasing -Wall -DHAVE_OLDCAPIMOD=@HAVE_OLDCAPIMOD@
lib_capi_mod_misdn_la_LDFLAGS = -shared -version-info @CAPI_MODULE_LOADER_VERSION@:0:0 lib_capi_mod_misdn_la_LDFLAGS = -shared -version-info @CAPI_MODULE_LOADER_VERSION@:0:0
modulesdir = $(libdir)/capi modulesdir = $(libdir)/capi

View File

@ -124,6 +124,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -217,7 +218,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
lib_capi_mod_misdn_la_SOURCES = capi_mod_misdn.c lib_capi_mod_misdn_la_SOURCES = capi_mod_misdn.c
lib_capi_mod_misdn_la_CFLAGS = -fno-strict-aliasing -Wall lib_capi_mod_misdn_la_CFLAGS = -fno-strict-aliasing -Wall -DHAVE_OLDCAPIMOD=@HAVE_OLDCAPIMOD@
lib_capi_mod_misdn_la_LDFLAGS = -shared -version-info @CAPI_MODULE_LOADER_VERSION@:0:0 lib_capi_mod_misdn_la_LDFLAGS = -shared -version-info @CAPI_MODULE_LOADER_VERSION@:0:0
modulesdir = $(libdir)/capi modulesdir = $(libdir)/capi
modules_LTLIBRARIES = lib_capi_mod_misdn.la modules_LTLIBRARIES = lib_capi_mod_misdn.la

View File

@ -155,14 +155,19 @@ static void misdnWriteCapiTrace(int nSend, unsigned char *pnBuffer, int nLength,
} }
#endif #endif
#if HAVE_OLDCAPIMOD
#define ISINSTALLTYPE unsigned
#else
#define ISINSTALLTYPE int
#endif
/** /**
* \brief Check if misdn interface is available * \brief Check if misdn interface is available
* \return file descriptor of socket, or error code * \return file descriptor of socket, or error code
*/ */
static unsigned misdnIsInstalled(void) static ISINSTALLTYPE misdnIsInstalled(void)
{ {
unsigned nHandle; ISINSTALLTYPE nHandle;
nHandle = misdnOpenSocket(); nHandle = misdnOpenSocket();
#ifdef MISDND_CAPI_MODULE_DEBUG #ifdef MISDND_CAPI_MODULE_DEBUG

87
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for mISDNuser 2.0.11. # Generated by GNU Autoconf 2.68 for mISDNuser 2.0.12.
# #
# Report bugs to <i4ldeveloper@isdn4linux.de>. # Report bugs to <i4ldeveloper@isdn4linux.de>.
# #
@ -709,8 +709,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='mISDNuser' PACKAGE_NAME='mISDNuser'
PACKAGE_TARNAME='mISDNuser' PACKAGE_TARNAME='mISDNuser'
PACKAGE_VERSION='2.0.11' PACKAGE_VERSION='2.0.12'
PACKAGE_STRING='mISDNuser 2.0.11' PACKAGE_STRING='mISDNuser 2.0.12'
PACKAGE_BUGREPORT='i4ldeveloper@isdn4linux.de' PACKAGE_BUGREPORT='i4ldeveloper@isdn4linux.de'
PACKAGE_URL='' PACKAGE_URL=''
@ -761,6 +761,7 @@ AF_ISDN_VAL
MISDN_AF_ISDN_VAL MISDN_AF_ISDN_VAL
LIBOBJS LIBOBJS
CAPI_MODULE_LOADER_VERSION CAPI_MODULE_LOADER_VERSION
HAVE_OLDCAPIMOD
OPT_SOFTDSP_FALSE OPT_SOFTDSP_FALSE
OPT_SOFTDSP_TRUE OPT_SOFTDSP_TRUE
OPT_CAPI_FALSE OPT_CAPI_FALSE
@ -1459,7 +1460,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures mISDNuser 2.0.11 to adapt to many kinds of systems. \`configure' configures mISDNuser 2.0.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1529,7 +1530,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of mISDNuser 2.0.11:";; short | recursive ) echo "Configuration of mISDNuser 2.0.12:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1641,7 +1642,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
mISDNuser configure 2.0.11 mISDNuser configure 2.0.12
generated by GNU Autoconf 2.68 generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
@ -2437,7 +2438,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by mISDNuser $as_me 2.0.11, which was It was created by mISDNuser $as_me 2.0.12, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@ $ $0 $@
@ -3257,7 +3258,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='mISDNuser' PACKAGE='mISDNuser'
VERSION='2.0.11' VERSION='2.0.12'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -5343,13 +5344,13 @@ if ${lt_cv_nm_interface+:} false; then :
else else
lt_cv_nm_interface="BSD nm" lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:5346: $ac_compile\"" >&5) (eval echo "\"\$as_me:5347: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err) (eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5 cat conftest.err >&5
(eval echo "\"\$as_me:5349: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval echo "\"\$as_me:5350: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5 cat conftest.err >&5
(eval echo "\"\$as_me:5352: output\"" >&5) (eval echo "\"\$as_me:5353: output\"" >&5)
cat conftest.out >&5 cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin" lt_cv_nm_interface="MS dumpbin"
@ -6555,7 +6556,7 @@ ia64-*-hpux*)
;; ;;
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 6558 "configure"' > conftest.$ac_ext echo '#line 6559 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@ -8607,11 +8608,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8610: $lt_compile\"" >&5) (eval echo "\"\$as_me:8611: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:8614: \$? = $ac_status" >&5 echo "$as_me:8615: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@ -8946,11 +8947,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8949: $lt_compile\"" >&5) (eval echo "\"\$as_me:8950: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:8953: \$? = $ac_status" >&5 echo "$as_me:8954: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@ -9051,11 +9052,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9054: $lt_compile\"" >&5) (eval echo "\"\$as_me:9055: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:9058: \$? = $ac_status" >&5 echo "$as_me:9059: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@ -9106,11 +9107,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9109: $lt_compile\"" >&5) (eval echo "\"\$as_me:9110: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:9113: \$? = $ac_status" >&5 echo "$as_me:9114: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@ -11474,7 +11475,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11477 "configure" #line 11478 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11570,7 +11571,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11573 "configure" #line 11574 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13526,11 +13527,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13529: $lt_compile\"" >&5) (eval echo "\"\$as_me:13530: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:13533: \$? = $ac_status" >&5 echo "$as_me:13534: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@ -13625,11 +13626,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13628: $lt_compile\"" >&5) (eval echo "\"\$as_me:13629: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:13632: \$? = $ac_status" >&5 echo "$as_me:13633: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@ -13677,11 +13678,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13680: $lt_compile\"" >&5) (eval echo "\"\$as_me:13681: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:13684: \$? = $ac_status" >&5 echo "$as_me:13685: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@ -15193,6 +15194,12 @@ fi
ac_fn_c_check_header_mongrel "$LINENO" "capi20.h" "ac_cv_header_capi20_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "capi20.h" "ac_cv_header_capi20_h" "$ac_includes_default"
if test "x$ac_cv_header_capi20_h" = xyes; then : if test "x$ac_cv_header_capi20_h" = xyes; then :
else
as_fn_error $? "capi20.h do not exist - install capi4linux development files" "$LINENO" 5
fi
ac_fn_c_check_header_mongrel "$LINENO" "capi_mod.h" "ac_cv_header_capi_mod_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "capi_mod.h" "ac_cv_header_capi_mod_h" "$ac_includes_default"
if test "x$ac_cv_header_capi_mod_h" = xyes; then : if test "x$ac_cv_header_capi_mod_h" = xyes; then :
@ -15201,9 +15208,27 @@ else
fi fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <capi_mod.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "unsigned\ \(\ \*IsInstalled" >/dev/null 2>&1; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Old capi_mod.h *IsInstalled detected" >&5
$as_echo "Old capi_mod.h *IsInstalled detected" >&6; }
HAVE_OLDCAPIMOD=1
else else
as_fn_error $? "capi20.h do not exist - install capi4linux development files" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: New capi_mod.h *IsInstalled detected" >&5
$as_echo "New capi_mod.h *IsInstalled detected" >&6; }
HAVE_OLDCAPIMOD=0
fi fi
rm -f conftest*
if ac_fn_c_compute_int "$LINENO" "MODULE_LOADER_VERSION" "CAPI_MODULE_LOADER_VERSION" " if ac_fn_c_compute_int "$LINENO" "MODULE_LOADER_VERSION" "CAPI_MODULE_LOADER_VERSION" "
@ -16189,7 +16214,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by mISDNuser $as_me 2.0.11, which was This file was extended by mISDNuser $as_me 2.0.12, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -16255,7 +16280,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
mISDNuser config.status 2.0.11 mISDNuser config.status 2.0.12
configured by $0, generated by GNU Autoconf 2.68, configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([mISDNuser],[2.0.11],[i4ldeveloper@isdn4linux.de],[mISDNuser]) AC_INIT([mISDNuser],[2.0.12],[i4ldeveloper@isdn4linux.de],[mISDNuser])
AC_CONFIG_SRCDIR([tools/]) AC_CONFIG_SRCDIR([tools/])
AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_HEADERS([include/config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -112,12 +112,22 @@ then
AC_CHECK_LIB(capi20, [capi20_isinstalled],, AC_CHECK_LIB(capi20, [capi20_isinstalled],,
AC_MSG_ERROR([capi library not found]) AC_MSG_ERROR([capi library not found])
) )
AC_CHECK_HEADER([capi20.h], AC_CHECK_HEADER([capi20.h],,
AC_CHECK_HEADER([capi_mod.h],,
AC_MSG_ERROR([capi_mod.h do not exist - update capi4linux]),
),
AC_MSG_ERROR([capi20.h do not exist - install capi4linux development files]), AC_MSG_ERROR([capi20.h do not exist - install capi4linux development files]),
) )
AC_CHECK_HEADER([capi_mod.h],,
AC_MSG_ERROR([capi_mod.h do not exist - update capi4linux]),
)
AC_EGREP_HEADER([unsigned\ \(\ \*IsInstalled], capi_mod.h,
[
AC_MSG_RESULT([Old capi_mod.h *IsInstalled detected])
HAVE_OLDCAPIMOD=1
],[
AC_MSG_RESULT([New capi_mod.h *IsInstalled detected])
HAVE_OLDCAPIMOD=0
]
)
AC_SUBST(HAVE_OLDCAPIMOD)
AC_COMPUTE_INT([CAPI_MODULE_LOADER_VERSION], [[MODULE_LOADER_VERSION]], AC_COMPUTE_INT([CAPI_MODULE_LOADER_VERSION], [[MODULE_LOADER_VERSION]],
[ [
#include <sys/types.h> #include <sys/types.h>

View File

@ -111,6 +111,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -117,6 +117,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -101,6 +101,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -106,6 +106,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -99,6 +99,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -135,6 +135,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -117,6 +117,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
HAVE_OLDCAPIMOD = @HAVE_OLDCAPIMOD@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@