diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-21 23:02:26 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 16:08:51 +0100 |
| commit | 567cdcb4aca0b40ec7017459642f135d6139e585 (patch) | |
| tree | 1c8a406b9fc88490754557b1c2f8fec36ad036eb | |
| parent | 234ccdf6534598dc52f2926f2deb3a1dc960af88 (diff) | |
| download | enigma2-567cdcb4aca0b40ec7017459642f135d6139e585.tar.gz enigma2-567cdcb4aca0b40ec7017459642f135d6139e585.zip | |
configure/m4: update some macros (autoupdate)
| -rw-r--r--[-rwxr-xr-x] | configure.ac | 9 | ||||
| -rw-r--r-- | m4/tuxbox.m4 | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index d6a9a9fa..b6e2d95a 100755..100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(enigma2,2.4) +AC_INIT([enigma2],[2.4]) 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_HELP_STRING([--with-libsdl], [use sdl, yes or no]), + AS_HELP_STRING([--with-libsdl],[use sdl, yes or no]), [[withsdl=$withval]], [[withsdl=yes]] ) @@ -23,7 +23,7 @@ else 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 ***])) @@ -84,7 +84,7 @@ LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS $GSTR TUXBOX_APPS_GETTEXT -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile data/Makefile data/fonts/Makefile @@ -191,6 +191,7 @@ main/Makefile tools/Makefile enigma2.pc ]) +AC_OUTPUT #lib/python/Plugins/Extensions/SimpleRSS/Makefile #lib/python/Plugins/Extensions/FileManager/Makefile diff --git a/m4/tuxbox.m4 b/m4/tuxbox.m4 index fb3b7d90..a6cdf930 100644 --- 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, @@ -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,[ - 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 +339,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 |