fix some wrong Latin National Subset UTF8 codes

[enigma2.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 0775e5af4762fff0c2eb2a83ad96e724a3a3f7f3..d1a5a04d0a6b6daa09561f8c863b3fa323254d8f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,4 @@
 AC_DEFUN(TUXBOX_APPS,[
-AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 INSTALL="$INSTALL -p"
@@ -125,13 +124,13 @@ TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
 TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
        [--with-gamesdir=PATH    ],[where games data is stored])
 
-TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
+TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,,
        [--with-libdir=PATH      ],[where to find the internal libs])
 
 TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
        [--with-plugindir=PATH   ],[where to find the plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,/tuxbox,
+TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,,
        [--with-tuxboxdatadir=PATH],[where to find tuxbox data])
 
 TUXBOX_APPS_DIRECTORY_ONE(zoneinfodir,ZONEINFODIR,datadir,/share,/zoneinfo,
@@ -247,6 +246,18 @@ 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