Attachment #37184 for bug #37311

Lines 132-138 Link Here

(-)Makefile.in (-1 / +1 lines)
132	target_alias = @target_alias@	132	target_alias = @target_alias@
133	spooldir = @localstatedir@/spool/capisuite	133	spooldir = @localstatedir@/spool/capisuite
134	pkgsysconfdir = @sysconfdir@/capisuite	134	pkgsysconfdir = @sysconfdir@/capisuite
135	doc_DATA = COPYING NEWS README	135	doc_DATA =
136	EXTRA_DIST = rc.capisuite.in capisuite.cronin cronjob.conf	136	EXTRA_DIST = rc.capisuite.in capisuite.cronin cronjob.conf
137		137
138	SUBDIRS = src scripts docs	138	SUBDIRS = src scripts docs

Lines 322-330 Link Here

(-)docs/Makefile.in (-3 lines)
322	$(mkinstalldirs) $(DESTDIR)$(docdir) ; \	322	$(mkinstalldirs) $(DESTDIR)$(docdir) ; \
323	cp -r manual $(DESTDIR)$(docdir)/ ; \	323	cp -r manual $(DESTDIR)$(docdir)/ ; \
324	fi	324	fi
325	if test -f manual.pdf; then \
326	cp manual.pdf $(DESTDIR)$(docdir)/ ; \
327	fi
328		325
329	uninstall-local:	326	uninstall-local:
330	rm -rf $(DESTDIR)$(docdir)	327	rm -rf $(DESTDIR)$(docdir)

Lines 133-139 Link Here

(-)scripts/Makefile.in (-1 / +1 lines)
133	spooldir = @localstatedir@/spool/capisuite	133	spooldir = @localstatedir@/spool/capisuite
134	pkgsysconfdir = @sysconfdir@/capisuite	134	pkgsysconfdir = @sysconfdir@/capisuite
135		135
136	dist_pkglib_DATA = idle.py incoming.py README	136	dist_pkglib_DATA = idle.py incoming.py
137	python_module_DATA = cs_helpers.py	137	python_module_DATA = cs_helpers.py
138	EXTRA_DIST = cs_helpers.pyin fax.confin answering_machine.confin capisuitefax.in	138	EXTRA_DIST = cs_helpers.pyin fax.confin answering_machine.confin capisuitefax.in
139		139

Lines 138-144 Link Here

(-)scripts/waves/Makefile.in (-1 / +1 lines)
138	bitte-neue-ansage-komplett.la neue-ansage-lautet.la wenn-einverstanden-1.la \	138	bitte-neue-ansage-komplett.la neue-ansage-lautet.la wenn-einverstanden-1.la \
139	bitte-neue-ansage-kurz.la ansage-gespeichert.la und.la ein.la 10.la 11.la \	139	bitte-neue-ansage-kurz.la ansage-gespeichert.la und.la ein.la 10.la 11.la \
140	12.la 13.la 14.la 15.la 16.la 17.la 18.la 19.la 20.la 30.la 40.la 50.la 60.la \	140	12.la 13.la 14.la 15.la 16.la 17.la 18.la 19.la 20.la 30.la 40.la 50.la 60.la \
141	70.la 80.la 90.la fernabfrage-aktiv.la unbekannt.la +.la README	141	70.la 80.la 90.la fernabfrage-aktiv.la unbekannt.la +.la
142		142
143	subdir = scripts/waves	143	subdir = scripts/waves
144	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	144	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs




)
]) dnl CS_TEST_GCC
AC_DEFUN([CS_TEST_CAPI4LINUX],
[AC_MSG_CHECKING([for new ALERT_REQ signature in capiutils.h])
AC_TRY_COMPILE([#include <capiutils.h>],
  [ALERT_REQ (NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);],
  [
    AC_DEFINE([HAVE_NEW_CAPI4LINUX],1,[we have new ALERT_REQ implementation])
    AC_MSG_RESULT([yes])
  ],
  AC_MSG_RESULT([no])
)
]) dnl CS_TEST_CAPI4LINUX


# PGAC_CHECK_PYTHON_DIRS
# -----------------------
# Determine the name of various directory of a given Python installation.

Lines 16-21 Link Here

(-)configure.in (+1 lines)
16	AC_HEADER_TIME	16	AC_HEADER_TIME
17	CS_TEST_GCC3	17	CS_TEST_GCC3
		18	CS_TEST_CAPI4LINUX
18	CS_SET_DOCDIR	19	CS_SET_DOCDIR

Lines 19-24 Link Here

(-)src/backend/capi.cpp (-1 / +7 lines)
19	#include "connection.h"	19	#include "connection.h"
20	#include "applicationinterface.h"	20	#include "applicationinterface.h"
21	#include "capi.h"	21	#include "capi.h"
		22	#include "../../config.h"
22		23
23	void* capi_exec_handler(void* arg)	24	void* capi_exec_handler(void* arg)
24	{	25	{
Lines 117-123 Link Here
117	if (debug_level >= 2) {	118	if (debug_level >= 2) {
118	debug << prefix() << ">ALERT_REQ: ApplId 0x" << hex << applId << ", MsgNr 0x" << messageNumber << ", PLCI 0x" << plci << endl;	119	debug << prefix() << ">ALERT_REQ: ApplId 0x" << hex << applId << ", MsgNr 0x" << messageNumber << ", PLCI 0x" << plci << endl;
119	}	120	}
120	unsigned info=ALERT_REQ(&CMSG, applId, messageNumber++, plci, NULL, NULL, NULL, NULL);	121	unsigned info=ALERT_REQ(&CMSG, applId, messageNumber++, plci,
		122	NULL, NULL, NULL, NULL
		123	#ifdef HAVE_NEW_CAPI4LINUX
		124	, NULL
		125	#endif
		126	);
121	if (debug_level >= 2) {	127	if (debug_level >= 2) {
122	debug << prefix() << "info: " << info << endl;	128	debug << prefix() << "info: " << info << endl;
123	}	129	}

Return to bug 37311

Lines 39-44 Link Here

(-)acinclude.m4 (+13 lines)
39	)	39	)
40	]) dnl CS_TEST_GCC	40	]) dnl CS_TEST_GCC
		41	AC_DEFUN([CS_TEST_CAPI4LINUX],
		42	[AC_MSG_CHECKING([for new ALERT_REQ signature in capiutils.h])
		43	AC_TRY_COMPILE([#include <capiutils.h>],
		44	[ALERT_REQ (NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);],
		45	[
		46	AC_DEFINE([HAVE_NEW_CAPI4LINUX],1,[we have new ALERT_REQ implementation])
		47	AC_MSG_RESULT([yes])
		48	],
		49	AC_MSG_RESULT([no])
		50	)
		51	]) dnl CS_TEST_CAPI4LINUX
		52
		53
41	# PGAC_CHECK_PYTHON_DIRS	54	# PGAC_CHECK_PYTHON_DIRS
42	# -----------------------	55	# -----------------------
43	# Determine the name of various directory of a given Python installation.	56	# Determine the name of various directory of a given Python installation.