configure/m4: update some macros (autoupdate)
authorAndreas Oberritter <obi@opendreambox.org>
Thu, 21 Oct 2010 23:02:26 +0000 (23:02 +0000)
committerAndreas Oberritter <obi@opendreambox.org>
Tue, 16 Nov 2010 15:08:51 +0000 (16:08 +0100)
configure.ac [changed mode: 0755->0644]
m4/tuxbox.m4

old mode 100755 (executable)
new mode 100644 (file)
index d6a9a9f..b6e2d95
@@ -1,4 +1,4 @@
-AC_INIT(enigma2,2.4)
+AC_INIT([enigma2],[2.4])
 AM_INIT_AUTOMAKE(enigma2,2.4)
 
 TUXBOX_APPS
 AM_INIT_AUTOMAKE(enigma2,2.4)
 
 TUXBOX_APPS
@@ -10,7 +10,7 @@ AC_PROG_RANLIB
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_ARG_WITH(libsdl,
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_ARG_WITH(libsdl,
-       AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
+       AS_HELP_STRING([--with-libsdl],[use sdl, yes or no]),
        [[withsdl=$withval]],
        [[withsdl=yes]]
 )
        [[withsdl=$withval]],
        [[withsdl=yes]]
 )
@@ -23,7 +23,7 @@ else
 fi
 AM_CONDITIONAL(HAVE_DDVDLIB, test "$have_ddvdlib" = "yes")
 
 fi
 AM_CONDITIONAL(HAVE_DDVDLIB, test "$have_ddvdlib" = "yes")
 
-AM_PATH_PYTHON()
+AM_PATH_PYTHON
 AX_PYTHON_DEVEL
 #AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
 
 AX_PYTHON_DEVEL
 #AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
 
@@ -84,7 +84,7 @@ LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS $GSTR
 
 TUXBOX_APPS_GETTEXT
 
 
 TUXBOX_APPS_GETTEXT
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 data/Makefile
 data/fonts/Makefile
 Makefile
 data/Makefile
 data/fonts/Makefile
@@ -191,6 +191,7 @@ main/Makefile
 tools/Makefile
 enigma2.pc
 ])
 tools/Makefile
 enigma2.pc
 ])
+AC_OUTPUT
 
 #lib/python/Plugins/Extensions/SimpleRSS/Makefile
 #lib/python/Plugins/Extensions/FileManager/Makefile
 
 #lib/python/Plugins/Extensions/SimpleRSS/Makefile
 #lib/python/Plugins/Extensions/FileManager/Makefile
index fb3b7d9..a6cdf93 100644 (file)
@@ -2,7 +2,7 @@ AC_DEFUN([TUXBOX_APPS],[
 
 INSTALL="$INSTALL -p"
 
 
 INSTALL="$INSTALL -p"
 
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 
 AC_ARG_WITH(target,
 AC_SYS_LARGEFILE
 
 AC_ARG_WITH(target,
@@ -270,18 +270,18 @@ AC_SUBST(USE_NLS)
 
 if test "$USE_NLS" = "yes"; then
        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,[
 
 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;
                        #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;
                        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
        )
 
        if test "$gt_cv_func_gnugettext_libc" = "yes"; then
@@ -339,7 +339,7 @@ AC_SUBST(CATALOGS)
 ])
 
 dnl backward compatiblity
 ])
 
 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
 [AH_VERBATIM([_GNU_SOURCE],
 [/* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE