lib/gdi/font.cpp: assume HAVE_FRIBIDI is always set

[enigma2.git] / m4 / tuxbox.m4

diff --git a/m4/tuxbox.m4 b/m4/tuxbox.m4
index fb3b7d902699390742d9ee8b8cb64fe8ebed3a8b..1232fda88e212368ad5e75a038cd8d0366ac4725 100644 (file)
--- a/m4/tuxbox.m4
+++ b/m4/tuxbox.m4
@@ -2,7 +2,7 @@ AC_DEFUN([TUXBOX_APPS],[
 
 INSTALL="$INSTALL -p"
 
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 
 AC_ARG_WITH(target,
@@ -191,42 +191,6 @@ AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK],[
 _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
 ])
 
-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_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[
-PKG_CHECK_MODULES($1,$2)
-AC_SUBST($1_CFLAGS)
-AC_SUBST($1_LIBS)
-])
-
-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])
-else
-       $1_CFLAGS=""
-       $1_LIBS=""
-fi
-AC_SUBST($1_CFLAGS)
-AC_SUBST($1_LIBS)
-])
-
-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
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK],[
-_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
-])
-
 AC_DEFUN([_TUXBOX_APPS_LIB_SYMBOL],[
 AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no")
 if test "$HAVE_$1" = "yes"; then
@@ -270,18 +234,18 @@ AC_SUBST(USE_NLS)
 
 if test "$USE_NLS" = "yes"; then
        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,[
-               AC_TRY_LINK([
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[
                        #include <libintl.h>
                        #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
                        #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
                        #endif
                        extern int _nl_msg_cat_cntr;
                        extern int *_nl_domain_bindings;
-                       ],[
+                       ]], [[
                        bindtextdomain ("", "");
                        return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings;
-                       ], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no
-               )]
+                       ]])],[gt_cv_func_gnugettext_libc=yes],[gt_cv_func_gnugettext_libc=no
+               ])]
        )
 
        if test "$gt_cv_func_gnugettext_libc" = "yes"; then
@@ -339,7 +303,7 @@ AC_SUBST(CATALOGS)
 ])
 
 dnl backward compatiblity
-AC_DEFUN([AC_GNU_SOURCE],
+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
 [AH_VERBATIM([_GNU_SOURCE],
 [/* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE