dvbci.cpp: fix crash on service stop when more than one CI was used for this service

[enigma2.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 717cc51efd5a930a7103b13bfb1ff4372ec7da8c..b71c89f4898ba250418a9a919bb92e640463e700 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,4 @@
-AC_DEFUN(TUXBOX_APPS,[
-AM_MAINTAINER_MODE
+AC_DEFUN([TUXBOX_APPS],[

 
 INSTALL="$INSTALL -p"
 
 
 INSTALL="$INSTALL -p"
 


@@ -70,7 +69,7 @@ check_path () {
 
 ])
 
 
 ])
 

-AC_DEFUN(TUXBOX_APPS_DIRECTORY_ONE,[
+AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[

 AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
        _$2=$withval
        if test "$TARGET" = "cdk"; then
 AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
        _$2=$withval
        if test "$TARGET" = "cdk"; then


@@ -92,7 +91,7 @@ dnl AC_SUBST($2)
 AC_DEFINE_UNQUOTED($2,"$_$2",$7)
 ])
 
 AC_DEFINE_UNQUOTED($2,"$_$2",$7)
 ])
 

-AC_DEFUN(TUXBOX_APPS_DIRECTORY,[
+AC_DEFUN([TUXBOX_APPS_DIRECTORY],[

 AC_REQUIRE([TUXBOX_APPS])
 
 if test "$TARGET" = "cdk"; then
 AC_REQUIRE([TUXBOX_APPS])
 
 if test "$TARGET" = "cdk"; then


@@ -149,12 +148,12 @@ AC_SUBST(PLUGINDIR)
 AC_SUBST(TUXBOXDATADIR)
 dnl end workaround
 
 AC_SUBST(TUXBOXDATADIR)
 dnl end workaround
 

-AC_DEFUN(TUXBOX_APPS_ENDIAN,[
+AC_DEFUN([TUXBOX_APPS_ENDIAN],[

 AC_CHECK_HEADERS(endian.h)
 AC_C_BIGENDIAN
 ])
 
 AC_CHECK_HEADERS(endian.h)
 AC_C_BIGENDIAN
 ])
 

-AC_DEFUN(TUXBOX_APPS_DRIVER,[
+AC_DEFUN([TUXBOX_APPS_DRIVER],[

 #AC_ARG_WITH(driver,
 #      [  --with-driver=PATH      path for driver sources [[NONE]]],
 #      [DRIVER="$withval"],[DRIVER=""])
 #AC_ARG_WITH(driver,
 #      [  --with-driver=PATH      path for driver sources [[NONE]]],
 #      [DRIVER="$withval"],[DRIVER=""])


@@ -207,7 +206,7 @@ else
 fi
 ])
 
 fi
 ])
 

-AC_DEFUN(_TUXBOX_APPS_LIB_CONFIG,[
+AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[

 AC_PATH_PROG($1_CONFIG,$2,no)
 if test "$$1_CONFIG" != "no"; then
        if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
 AC_PATH_PROG($1_CONFIG,$2,no)
 if test "$$1_CONFIG" != "no"; then
        if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then


@@ -222,31 +221,31 @@ AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
 AC_SUBST($1_LIBS)
 ])
 

-AC_DEFUN(TUXBOX_APPS_LIB_CONFIG,[
+AC_DEFUN([TUXBOX_APPS_LIB_CONFIG],[

 _TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR)
 if test "$$1_CONFIG" = "no"; then
        AC_MSG_ERROR([could not find $2]);
 fi
 ])
 
 _TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR)
 if test "$$1_CONFIG" = "no"; then
        AC_MSG_ERROR([could not find $2]);
 fi
 ])
 

-AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_CHECK,[
+AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK],[

 _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
 ])
 
 _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
 ])
 

-AC_DEFUN(TUXBOX_APPS_PKGCONFIG,[
+AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[

 AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
 if test "$PKG_CONFIG" = "no" ; then
        AC_MSG_ERROR([could not find pkg-config]);
 fi
 ])
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
 if test "$PKG_CONFIG" = "no" ; then
        AC_MSG_ERROR([could not find pkg-config]);
 fi
 ])
 

-AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG,[
+AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[

 PKG_CHECK_MODULES($1,$2)
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
 PKG_CHECK_MODULES($1,$2)
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 

-AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL,[
+AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL],[

 PKG_CHECK_MODULES($1,$2,$3="yes",$3="no")
 if test "$$3" = "yes"; then
        AC_DEFINE($3, 1, [$2 available])
 PKG_CHECK_MODULES($1,$2,$3="yes",$3="no")
 if test "$$3" = "yes"; then
        AC_DEFINE($3, 1, [$2 available])


@@ -258,18 +257,18 @@ AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
 AC_SUBST($1_LIBS)
 ])
 

-AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG,[
+AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[

 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 if test -z "$$1_CFLAGS" ; then
        AC_MSG_ERROR([could not find package $2]);
 fi
 ])
 
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 if test -z "$$1_CFLAGS" ; then
        AC_MSG_ERROR([could not find package $2]);
 fi
 ])
 

-AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG_CHECK,[
+AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK],[

 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 ])
 
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 ])
 

-AC_DEFUN(_TUXBOX_APPS_LIB_SYMBOL,[
+AC_DEFUN([_TUXBOX_APPS_LIB_SYMBOL],[

 AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no")
 if test "$HAVE_$1" = "yes"; then
        $1_LIBS=-l$2
 AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no")
 if test "$HAVE_$1" = "yes"; then
        $1_LIBS=-l$2


@@ -278,18 +277,18 @@ fi
 AC_SUBST($1_LIBS)
 ])
 
 AC_SUBST($1_LIBS)
 ])
 

-AC_DEFUN(TUXBOX_APPS_LIB_SYMBOL,[
+AC_DEFUN([TUXBOX_APPS_LIB_SYMBOL],[

 _TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,ERROR)
 if test "$HAVE_$1" = "no"; then
        AC_MSG_ERROR([could not find $2]);
 fi
 ])
 
 _TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,ERROR)
 if test "$HAVE_$1" = "no"; then
        AC_MSG_ERROR([could not find $2]);
 fi
 ])
 

-AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_SYMBOL,[
+AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_SYMBOL],[

 _TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,WARN)
 ])
 
 _TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,WARN)
 ])
 

-AC_DEFUN(TUXBOX_APPS_GETTEXT,[
+AC_DEFUN([TUXBOX_APPS_GETTEXT],[

 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
        [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
        (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
        [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
        (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],


@@ -415,6 +414,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
                python_path=
                for i in $CPPFLAGS ; do
                        p=`echo $i | sed "s,^-I,,"`
                python_path=
                for i in $CPPFLAGS ; do
                        p=`echo $i | sed "s,^-I,,"`

+                       p=`echo $p | sed "s,^-isystem,,"`

                        if test -f "$p/python$cross_PYTHON_VERSION/Python.h"; then
                                python_path="$p/python$cross_PYTHON_VERSION"
                                break
                        if test -f "$p/python$cross_PYTHON_VERSION/Python.h"; then
                                python_path="$p/python$cross_PYTHON_VERSION"
                                break