diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/_xine.m4 | 10 | ||||
| -rw-r--r-- | m4/aa.m4 | 38 | ||||
| -rw-r--r-- | m4/arts.m4 | 10 | ||||
| -rw-r--r-- | m4/attributes.m4 | 6 | ||||
| -rw-r--r-- | m4/directx.m4 | 4 | ||||
| -rw-r--r-- | m4/dl.m4 | 2 | ||||
| -rw-r--r-- | m4/dvdnav.m4 | 20 | ||||
| -rw-r--r-- | m4/getopt_long.m4 | 4 | ||||
| -rw-r--r-- | m4/ioctl_request.m4 | 2 | ||||
| -rw-r--r-- | m4/libFLAC.m4 | 4 | ||||
| -rw-r--r-- | m4/libfame.m4 | 10 | ||||
| -rw-r--r-- | m4/misc.m4 | 2 | ||||
| -rw-r--r-- | m4/opengl.m4 | 4 | ||||
| -rw-r--r-- | m4/pkg.m4 | 6 | ||||
| -rw-r--r-- | m4/symbol.m4 | 2 | ||||
| -rw-r--r-- | m4/xine.m4 | 24 | ||||
| -rw-r--r-- | m4/xv.m4 | 6 |
17 files changed, 77 insertions, 77 deletions
diff --git a/m4/_xine.m4 b/m4/_xine.m4 index 0c840cd9d..70bbe5d8f 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -81,7 +81,7 @@ AC_DEFUN([AC_CHECK_LIRC], if test x"$LIRC_PREFIX" != "x"; then lirc_libprefix="$LIRC_PREFIX/lib" - LIRC_INCLUDE="-I$LIRC_PREFIX/include" + LIRC_INCLUDE="-I$LIRC_PREFIX/include" fi for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do AC_CHECK_FILE("$llirc/liblirc_client.a", @@ -117,14 +117,14 @@ AC_DEFUN([AC_CHECK_DXR3], AC_MSG_RESULT([*** checking for a supported mpeg encoder]) have_encoder=no have_libfame=yes - AC_CHECK_LIB(fame, fame_open, + AC_CHECK_LIB(fame, fame_open, [AC_CHECK_HEADER(fame.h, true, have_libfame=no)], have_libfame=no) if test "$have_libfame" = "yes"; then AC_DEFINE(HAVE_LIBFAME) have_encoder=yes fi have_librte=yes - AC_CHECK_LIB(rte, rte_init, + AC_CHECK_LIB(rte, rte_init, [AC_CHECK_HEADER(rte.h, true, have_librte=no)], have_librte=no) if test "$have_librte" = "yes"; then AC_DEFINE(HAVE_LIBRTE) @@ -390,7 +390,7 @@ dnl Validate the GMSGFMT program found by gettext.m4; reject old versions dnl of GNU msgfmt that do not support the "msgid_plural" extension. AC_DEFUN([AC_PROG_GMSGFMT_PLURAL], [dnl AC_REQUIRE(AM_GNU_GETTEXT) - + if test "$GMSGFMT" != ":"; then AC_MSG_CHECKING([for plural forms in GNU msgfmt]) @@ -498,7 +498,7 @@ _ACEOF AC_MSG_RESULT(no) fi fi - fi + fi else AC_MSG_RESULT(no) fi @@ -1,27 +1,27 @@ dnl Configure path and dependencies for aalib. dnl dnl Copyright (C) 2001 Daniel Caujolle-Bert <segfault@club-internet.fr> -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2 of the License, or dnl (at your option) any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -dnl -dnl +dnl +dnl dnl As a special exception to the GNU General Public License, if you dnl distribute this file as part of a program that contains a configuration dnl script generated by Autoconf, you may include it under the same dnl distribution terms that you use for the rest of that program. -dnl +dnl dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND ]]]) dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS, AALIB_STATIC_LIBS. dnl @@ -32,7 +32,7 @@ dnl 17/09/2001 dnl * use both aalib-config, and *last chance* aainfo for guessing. dnl 19/08/2001 dnl * use aalib-config instead of aainfo now. -dnl 17/06/2001 +dnl 17/06/2001 dnl * First shot dnl @@ -66,7 +66,7 @@ int main () { exit(1); } - if ((AA_LIB_VERSION > major) || ((AA_LIB_VERSION == major) && + if ((AA_LIB_VERSION > major) || ((AA_LIB_VERSION == major) && #ifdef AA_LIB_MINNOR (AA_LIB_MINNOR >= minor) #else @@ -89,11 +89,11 @@ int main () { return 1; } ]])],[],[no_aalib=yes],[no_aalib=cc]) - if test "x$no_aalib" = xcc; then + if test "x$no_aalib" = xcc; then AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> #include <aalib.h> -]], [[ return ((AA_LIB_VERSION) || +]], [[ return ((AA_LIB_VERSION) || #ifdef AA_LIB_MINNOR (AA_LIB_MINNOR) #else @@ -107,7 +107,7 @@ int main () { AC_DEFUN([AM_PATH_AALIB], -[dnl +[dnl dnl AC_ARG_WITH(aalib-prefix, AS_HELP_STRING([--with-aalib-prefix=DIR], [prefix where AALIB is installed (optional)]), @@ -115,7 +115,7 @@ AC_ARG_WITH(aalib-prefix, AC_ARG_WITH(aalib-exec-prefix, AS_HELP_STRING([--with-aalib-exec-prefix=DIR], [exec prefix where AALIB is installed (optional)]), aalib_config_exec_prefix="$withval", aalib_config_exec_prefix="") -AC_ARG_ENABLE(aalibtest, +AC_ARG_ENABLE(aalibtest, AS_HELP_STRING([--disable-aalibtest], [do not try to compile and run a test AALIB program]), enable_aalibtest=$enableval, enable_aalibtest=yes) @@ -169,9 +169,9 @@ dnl aalib-config is missing, check for old aainfo AC_PATH_TOOL(AAINFO, aainfo, no) else AC_MSG_CHECKING(for $AAINFO) - if test -x $AAINFO; then + if test -x $AAINFO; then AC_MSG_RESULT(yes) - else + else AAINFO="no" AC_MSG_RESULT(no) fi @@ -189,10 +189,10 @@ dnl aalib-config is missing, check for old aainfo AALIB_CFLAGS="$AALIB_CFLAGS `echo $X_CFLAGS|sed -e 's/\-I/\-L/g;s/include/lib/g'`" x11dep="yes" fi -dnl if test $drv = "slang" -a x$slangdep = "x"; then +dnl if test $drv = "slang" -a x$slangdep = "x"; then dnl slangdep="yes" dnl fi -dnl if test $drv = "gpm" -a x$gmpdep = "x"; then +dnl if test $drv = "gpm" -a x$gmpdep = "x"; then dnl gpmdep="yes" dnl fi done @@ -218,7 +218,7 @@ dnl fi if test "x$no_aalib" = x; then AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) if test "$AALIB_CONFIG" = "no"; then @@ -236,8 +236,8 @@ dnl fi AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> #include <aalib.h> -]], [[ - return ((AA_LIB_VERSION) || +]], [[ + return ((AA_LIB_VERSION) || #ifdef AA_LIB_MINNOR (AA_LIB_MINNOR) #else diff --git a/m4/arts.m4 b/m4/arts.m4 index 079c21ba8..b66199be8 100644 --- a/m4/arts.m4 +++ b/m4/arts.m4 @@ -6,7 +6,7 @@ dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for ARTS, and define ARTS_CFLAGS and ARTS_LIBS dnl AC_DEFUN([AM_PATH_ARTS], -[dnl +[dnl dnl Get the cflags and libraries from the artsc-config script dnl AC_ARG_WITH(arts-prefix, AS_HELP_STRING([--with-arts-prefix=DIR], [prefix where ARTS is installed (optional)]), @@ -22,7 +22,7 @@ AC_ARG_ENABLE(artstest, AS_HELP_STRING([--disable-artstest], [do not try to comp fi AC_PATH_TOOL(ARTS_CONFIG, artsc-config, no) - + min_arts_version=ifelse([$1], ,0.9.5,$1) AC_MSG_CHECKING(for ARTS artsc - version >= $min_arts_version) no_arts="" @@ -64,7 +64,7 @@ char* my_strdup (char *str) { char *new_str; - + if (str) { new_str = malloc ((strlen (str) + 1) * sizeof(char)); @@ -72,7 +72,7 @@ my_strdup (char *str) } else new_str = NULL; - + return new_str; } @@ -122,7 +122,7 @@ int main () fi if test "x$no_arts" = x ; then AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) if test "$ARTS_CONFIG" = "no" ; then diff --git a/m4/attributes.m4 b/m4/attributes.m4 index 4863b6bfe..c7ef73e68 100644 --- a/m4/attributes.m4 +++ b/m4/attributes.m4 @@ -25,7 +25,7 @@ dnl License when using or distributing such scripts, even though portions dnl of the text of the Macro appear in them. The GNU General Public dnl License (GPL) does govern all other use of the material that dnl constitutes the Autoconf Macro. -dnl +dnl dnl This special exception to the GPL applies to versions of the dnl Autoconf Macro released by this project. When you make and dnl distribute a modified version of the Autoconf Macro, you may extend @@ -114,7 +114,7 @@ AC_DEFUN([CC_NOUNDEFINED], [ dnl First of all check for the --no-undefined variant of GNU ld. This allows dnl for a much more readable commandline, so that people can understand what dnl it does without going to look for what the heck -z defs does. - for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do + for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"]) break done @@ -257,7 +257,7 @@ AC_DEFUN([CC_FLAG_VISIBILITY], [ cc_cv_flag_visibility='yes', cc_cv_flag_visibility='no') CFLAGS="$cc_flag_visibility_save_CFLAGS"]) - + AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, [Define this if the compiler supports the -fvisibility flag]) diff --git a/m4/directx.m4 b/m4/directx.m4 index 999beff6d..743403c72 100644 --- a/m4/directx.m4 +++ b/m4/directx.m4 @@ -6,7 +6,7 @@ dnl dnl dnl AM_PATH_DIRECTX([ACTION IF FOUND [, ACTION IF NOT FOUND]])) dnl -dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and +dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and dnl DIRECTX_VIDEO_LIBS. dnl AC_DEFUN([AM_PATH_DIRECTX], [ @@ -39,7 +39,7 @@ AC_COMPILE_IFELSE( int main() { DirectDrawCreate(0, NULL, 0); DirectSoundCreate(0, NULL, 0); - + return 0; } ], @@ -31,7 +31,7 @@ int main() { dlopen(NULL, 0); return 0; } -], +], [DYNAMIC_LD_LIBS=-lkernel32 have_dl=yes AC_MSG_RESULT(yes)], diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4 index 0f24080f7..c15404168 100644 --- a/m4/dvdnav.m4 +++ b/m4/dvdnav.m4 @@ -1,33 +1,33 @@ dnl Configure paths for DVDNAV dnl dnl Copyright (C) 2001 Daniel Caujolle-Bert <segfault@club-internet.fr> -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2 of the License, or dnl (at your option) any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -dnl -dnl +dnl +dnl dnl As a special exception to the GNU General Public License, if you dnl distribute this file as part of a program that contains a configuration dnl script generated by Autoconf, you may include it under the same dnl distribution terms that you use for the rest of that program. -dnl +dnl dnl AM_PATH_DVDNAV([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for DVDNAV, and define DVDNAV_CFLAGS and DVDNAV_LIBS dnl AC_DEFUN([AM_PATH_DVDNAV], -[dnl +[dnl dnl Get the cflags and libraries from the dvdnav-config script dnl AC_ARG_WITH(dvdnav-prefix, @@ -36,7 +36,7 @@ AC_ARG_WITH(dvdnav-prefix, AC_ARG_WITH(dvdnav-exec-prefix, AS_HELP_STRING([--with-dvdnav-exec-prefix=DIR], [exec prefix where DVDNAV is installed (optional)]), dvdnav_config_exec_prefix="$withval", dvdnav_config_exec_prefix="") -AC_ARG_ENABLE(dvdnavtest, +AC_ARG_ENABLE(dvdnavtest, AS_HELP_STRING([--disable-dvdnavtest], [do not try to compile and run a test DVDNAV program]), enable_dvdnavtest=$enableval, enable_dvdnavtest=yes) @@ -89,7 +89,7 @@ dnl #include <stdlib.h> #include <string.h> -int +int main () { int major, minor, sub; @@ -139,7 +139,7 @@ main () fi if test "x$no_dvdnav" = x ; then AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) if test "$DVDNAV_CONFIG" = "no" ; then diff --git a/m4/getopt_long.m4 b/m4/getopt_long.m4 index 39f41ffc2..59e9d8148 100644 --- a/m4/getopt_long.m4 +++ b/m4/getopt_long.m4 @@ -19,13 +19,13 @@ int main (int argc, char **argv) { int option_index = 0; int c; opterr = 0; - while ((c = getopt_long (argc, argv, "?hv", + while ((c = getopt_long (argc, argv, "?hv", long_options, &option_index)) != EOF) ; return 0; } ]])], - [AC_MSG_RESULT(yes); + [AC_MSG_RESULT(yes); ac_getopt_long=yes; AC_DEFINE(HAVE_GETOPT_LONG,,[Define this if you have GNU getopt_long() implemented])], [AC_MSG_RESULT(no); ac_getopt_long=no], diff --git a/m4/ioctl_request.m4 b/m4/ioctl_request.m4 index c6d12258e..6eb3f45a6 100644 --- a/m4/ioctl_request.m4 +++ b/m4/ioctl_request.m4 @@ -24,7 +24,7 @@ dnl License when using or distributing such scripts, even though portions dnl of the text of the Macro appear in them. The GNU General Public dnl License (GPL) does govern all other use of the material that dnl constitutes the Autoconf Macro. -dnl +dnl dnl This special exception to the GPL applies to versions of the dnl Autoconf Macro released by the xine project. When you make and dnl distribute a modified version of the Autoconf Macro, you may extend diff --git a/m4/libFLAC.m4 b/m4/libFLAC.m4 index 9ecf8dd51..7ad896b05 100644 --- a/m4/libFLAC.m4 +++ b/m4/libFLAC.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS dnl AC_DEFUN([AM_PATH_LIBFLAC], -[dnl +[dnl dnl Get the cflags and libraries dnl AC_ARG_WITH(libFLAC-prefix, AS_HELP_STRING([--with-libFLAC-prefix=DIR], [prefix where libFLAC is installed (optional)]), libFLAC_prefix="$withval", libFLAC_prefix="") @@ -71,7 +71,7 @@ int main () if test "x$no_libFLAC" = "x" ; then AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) + ifelse([$1], , :, [$1]) else AC_MSG_RESULT(no) if test -f conf.libFLACtest ; then diff --git a/m4/libfame.m4 b/m4/libfame.m4 index 5fc34cc56..bf54f1e80 100644 --- a/m4/libfame.m4 +++ b/m4/libfame.m4 @@ -4,7 +4,7 @@ dnl Vivien Chappelier 12/11/00 dnl stolen from ORBit autoconf dnl AC_DEFUN([AM_PATH_LIBFAME], -[dnl +[dnl dnl Get the cflags and libraries from the libfame-config script dnl AC_ARG_WITH(libfame-prefix, AS_HELP_STRING([--with-libfame-prefix=DIR], [prefix where libfame is installed (optional)]), @@ -57,7 +57,7 @@ dnl #include <stdio.h> #include <stdlib.h> -int +int main () { int major, minor, micro; @@ -76,7 +76,7 @@ main () (libfame_minor_version != $libfame_config_minor_version) || (libfame_micro_version != $libfame_config_micro_version)) { - printf("\n*** 'libfame-config --version' returned %d.%d.%d, but Libfame (%d.%d.%d)\n", + printf("\n*** 'libfame-config --version' returned %d.%d.%d, but Libfame (%d.%d.%d)\n", $libfame_config_major_version, $libfame_config_minor_version, $libfame_config_micro_version, libfame_major_version, libfame_minor_version, libfame_micro_version); printf ("*** was found! If libfame-config was correct, then it is best\n"); @@ -87,7 +87,7 @@ main () printf("*** If libfame-config was wrong, set the environment variable LIBFAME_CONFIG\n"); printf("*** to point to the correct copy of libfame-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); - } + } #if defined (LIBFAME_MAJOR_VERSION) && defined (LIBFAME_MINOR_VERSION) && defined (LIBFAME_MICRO_VERSION) else if ((libfame_major_version != LIBFAME_MAJOR_VERSION) || (libfame_minor_version != LIBFAME_MINOR_VERSION) || @@ -137,7 +137,7 @@ main () fi if test "x$no_libfame" = x ; then AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) if test "$LIBFAME_CONFIG" = "no" ; then diff --git a/m4/misc.m4 b/m4/misc.m4 index 83246f36c..31686b33d 100644 --- a/m4/misc.m4 +++ b/m4/misc.m4 @@ -25,7 +25,7 @@ dnl License when using or distributing such scripts, even though portions dnl of the text of the Macro appear in them. The GNU General Public dnl License (GPL) does govern all other use of the material that dnl constitutes the Autoconf Macro. -dnl +dnl dnl This special exception to the GPL applies to versions of the dnl Autoconf Macro released by this project. When you make and dnl distribute a modified version of the Autoconf Macro, you may extend diff --git a/m4/opengl.m4 b/m4/opengl.m4 index 2c12949d9..f718fc848 100644 --- a/m4/opengl.m4 +++ b/m4/opengl.m4 @@ -35,14 +35,14 @@ AC_DEFUN([AM_PATH_OPENGL], [ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <GL/gl.h> #include <GL/glu.h>]], [[ gluPerspective(45.0f,1.33f,1.0f,1000.0f); glBegin(GL_POINTS); glEnd(); return 0 ]])], [ ac_have_glu="yes" - GLU_LIBS="-lGLU" + GLU_LIBS="-lGLU" AC_DEFINE(HAVE_GLU,1,[Define this if you have GLU support available]) AC_MSG_RESULT(yes)], [ AC_MSG_RESULT(no) echo "*** GLU doesn't link with GL; GLU is disabled ***"]) LIBS="$ac_save_LIBS"] )], - [], + [], [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU $X_EXTRA_LIBS] ) fi @@ -1,5 +1,5 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# +# # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # # This program is free software; you can redistribute it and/or modify @@ -39,7 +39,7 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -120,7 +120,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs diff --git a/m4/symbol.m4 b/m4/symbol.m4 index 7f807f1b1..54c4593d2 100644 --- a/m4/symbol.m4 +++ b/m4/symbol.m4 @@ -24,7 +24,7 @@ dnl License when using or distributing such scripts, even though portions dnl of the text of the Macro appear in them. The GNU General Public dnl License (GPL) does govern all other use of the material that dnl constitutes the Autoconf Macro. -dnl +dnl dnl This special exception to the GPL applies to versions of the dnl Autoconf Macro released by the xine project. When you make and dnl distribute a modified version of the Autoconf Macro, you may extend diff --git a/m4/xine.m4 b/m4/xine.m4 index 2842de621..6c8d980b6 100644 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -1,33 +1,33 @@ dnl Configure paths for XINE dnl dnl Copyright (C) 2001 Daniel Caujolle-Bert <segfault@club-internet.fr> -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2 of the License, or dnl (at your option) any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -dnl -dnl +dnl +dnl dnl As a special exception to the GNU General Public License, if you dnl distribute this file as part of a program that contains a configuration dnl script generated by Autoconf, you may include it under the same dnl distribution terms that you use for the rest of that program. -dnl +dnl dnl AM_PATH_XINE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for XINE, and define XINE_CFLAGS and XINE_LIBS dnl AC_DEFUN([AM_PATH_XINE], -[dnl +[dnl dnl Get the cflags and libraries from the xine-config script dnl AC_ARG_WITH(xine-prefix, @@ -36,7 +36,7 @@ AC_ARG_WITH(xine-prefix, AC_ARG_WITH(xine-exec-prefix, AS_HELP_STRING([--with-xine-exec-prefix=DIR], [exec prefix where XINE is installed (optional)]), xine_config_exec_prefix="$withval", xine_config_exec_prefix="") -AC_ARG_ENABLE(xinetest, +AC_ARG_ENABLE(xinetest, AS_HELP_STRING([--disable-xinetest], [do not try to compile and run a test XINE program]), enable_xinetest=$enableval, enable_xinetest=yes) @@ -94,7 +94,7 @@ dnl #include <stdlib.h> #include <string.h> -int +int main () { int major, minor, sub; @@ -113,7 +113,7 @@ main () (XINE_MINOR_VERSION != $xine_config_minor_version) || (XINE_SUB_VERSION != $xine_config_sub_version)) { - printf("\n*** 'xine-config --version' returned %d.%d.%d, but XINE (%d.%d.%d)\n", + printf("\n*** 'xine-config --version' returned %d.%d.%d, but XINE (%d.%d.%d)\n", $xine_config_major_version, $xine_config_minor_version, $xine_config_sub_version, XINE_MAJOR_VERSION, XINE_MINOR_VERSION, XINE_SUB_VERSION); printf ("*** was found! If xine-config was correct, then it is best\n"); @@ -124,7 +124,7 @@ main () printf("*** If xine-config was wrong, set the environment variable XINE_CONFIG\n"); printf("*** to point to the correct copy of xine-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); - } + } else { if ((XINE_MAJOR_VERSION > major) || @@ -160,7 +160,7 @@ main () fi if test "x$no_xine" = x ; then AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) if test "$XINE_CONFIG" = "no" ; then @@ -72,15 +72,15 @@ AC_DEFUN([AC_FIND_LIBXV], xv_path=/usr/X11R6/lib fi - if test "x$xv_prefer_shared" = "xyes"; then + if test "x$xv_prefer_shared" = "xyes"; then AC_PATH_LIBXV_IMPL([libXv.so]) else AC_PATH_LIBXV_IMPL([libXv.a]) fi - + # Try the other lib if prefered failed if test x$XV_LIBS = x; then - if ! test "x$xv_prefer_shared" = "xyes"; then + if ! test "x$xv_prefer_shared" = "xyes"; then AC_PATH_LIBXV_IMPL([libXv.so]) else AC_PATH_LIBXV_IMPL([libXv.a]) |