*BUGFIX*

Improved cross-compiling: detect and precedence of the host-specific libs
W32dll: enabled by platforms as originaly, user can override it
Fixed shell errors in the Makefile of the hackersguide
Detect the place of SDL header independently on platform
Fixed spelling in CDDA, include the header sys/param.h if available
Fixed format strings (fix warnings (or even bugs) on Gentoo/FreeBSD)

CVS patchset: 7815
CVS date: 2005/11/28 12:24:56

11 files changed, 33 insertions, 19 deletions

diff --git a/m4/aa.m4 b/m4/aa.m4
index 2dc0021fa..319bf79b9 100644
--- a/m4/aa.m4
+++ b/m4/aa.m4
@@ -69,7 +69,7 @@ AC_ARG_ENABLE(aalibtest,
     if test ! -x "$AALIB_CONFIG"; then
       AALIB_CONFIG=""
     fi
-    AC_PATH_PROG(AALIB_CONFIG, aalib-config, no)
+    AC_PATH_TOOL(AALIB_CONFIG, aalib-config, no)
 
     if test "$AALIB_CONFIG" = "no" ; then
 
@@ -93,7 +93,7 @@ dnl aalib-config is missing, check for old aainfo
       fi
 
       if test x"$aalib_config_prefix" = "x"; then
-        AC_PATH_PROG(AAINFO, aainfo, no)
+        AC_PATH_TOOL(AAINFO, aainfo, no)
       else
         AC_MSG_CHECKING(for $AAINFO)
         if test -x $AAINFO; then 
diff --git a/m4/arts.m4 b/m4/arts.m4
index f1c2963d0..b44d26a21 100644
--- a/m4/arts.m4
+++ b/m4/arts.m4
@@ -21,7 +21,7 @@ AC_ARG_ENABLE(artstest, AC_HELP_STRING([--disable-artstest], [do not try to comp
      fi
   fi
 
-  AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
+  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)
diff --git a/m4/caca.m4 b/m4/caca.m4
index 884256fbe..7e59dedf4 100644
--- a/m4/caca.m4
+++ b/m4/caca.m4
@@ -44,7 +44,7 @@ AC_ARG_ENABLE(cacatest,
     if test ! -x "$CACA_CONFIG"; then
       CACA_CONFIG=""
     fi
-    AC_PATH_PROG(CACA_CONFIG, caca-config, no)
+    AC_PATH_TOOL(CACA_CONFIG, caca-config, no)
 
     if test "$CACA_CONFIG" = "no" ; then
 dnl
diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4
index 505050676..9254ca533 100644
--- a/m4/dvdnav.m4
+++ b/m4/dvdnav.m4
@@ -57,7 +57,7 @@ AC_ARG_ENABLE(dvdnavtest,
   if test "x$enable_dvdnavtest" != "xyes" ; then
     AC_MSG_CHECKING([for DVDNAV-LIB version >= $min_dvdnav_version])
   else
-    AC_PATH_PROG(DVDNAV_CONFIG, dvdnav-config, no)
+    AC_PATH_TOOL(DVDNAV_CONFIG, dvdnav-config, no)
     AC_MSG_CHECKING([for DVDNAV-LIB version >= $min_dvdnav_version])
     no_dvdnav=""
     if test "$DVDNAV_CONFIG" = "no" ; then
diff --git a/m4/esd.m4 b/m4/esd.m4
index cbe4a8263..3af67a25c 100644
--- a/m4/esd.m4
+++ b/m4/esd.m4
@@ -31,7 +31,7 @@ AC_ARG_ENABLE(esdtest, AC_HELP_STRING([--disable-esdtest], [do not try to compil
      fi
   fi
 
-  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
+  AC_PATH_TOOL(ESD_CONFIG, esd-config, no)
   min_esd_version=ifelse([$1], ,0.2.7,$1)
   AC_MSG_CHECKING([for ESD - version >= $min_esd_version])
   no_esd=""
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
index d894b5fb4..5fc51bda9 100644
--- a/m4/freetype2.m4
+++ b/m4/freetype2.m4
@@ -13,7 +13,7 @@ AC_DEFUN([AM_PATH_FREETYPE2], [
   )
 
   if test x"$enable_freetype" = "xyes"; then
-    AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+    AC_PATH_TOOL(FREETYPE_CONFIG, freetype-config, no)
     if test "$FREETYPE_CONFIG" = "no" ; then
       AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled **
   ])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index a27be9a65..80d877ef2 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -122,7 +122,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
 	     dnl Search for GNU msgfmt in the PATH.
 	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 	       [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
-	     AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	     AC_PATH_TOOL(GMSGFMT, gmsgfmt, $MSGFMT)
 
 	     dnl Search for GNU xgettext in the PATH.
 	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
@@ -144,7 +144,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
         INTLOBJS="\$(GETTOBJS)"
         AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 	  [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+        AC_PATH_TOOL(GMSGFMT, gmsgfmt, $MSGFMT)
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	  [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
         AC_SUBST(MSGFMT)
diff --git a/m4/libfame.m4 b/m4/libfame.m4
index 74b368e9a..b6a14ed34 100644
--- a/m4/libfame.m4
+++ b/m4/libfame.m4
@@ -27,7 +27,7 @@ AC_ARG_ENABLE(libfametest, AC_HELP_STRING([--disable-libfametest], [do not try t
      fi
   fi
 
-  AC_PATH_PROG(LIBFAME_CONFIG, libfame-config, no)
+  AC_PATH_TOOL(LIBFAME_CONFIG, libfame-config, no)
   min_libfame_version=ifelse([$1], , 0.9.0, $1)
   AC_MSG_CHECKING(for libfame - version >= $min_libfame_version)
   no_libfame=""
diff --git a/m4/pkg.m4 b/m4/pkg.m4
index f2bfc2d49..7e5c1479d 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -6,7 +6,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+    AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
diff --git a/m4/sdl.m4 b/m4/sdl.m4
index 4e62c3fea..389b79646 100644
--- a/m4/sdl.m4
+++ b/m4/sdl.m4
@@ -35,11 +35,11 @@ AC_DEFUN([AM_PATH_SDL],
      fi
   fi
 
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+  AC_PATH_TOOL(SDL_CONFIG, sdl-config, no)
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   no_sdl=""
   if test "$SDL_CONFIG" = "no" ; then
+    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
     no_sdl=yes
   else
     SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
@@ -61,11 +61,17 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity
 dnl checks the results of sdl-config to some extent
 dnl
       rm -f conf.sdltest
+      AC_CHECK_HEADERS([SDL11/SDL.h])
+      AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
       AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "SDL.h"
+#ifdef HAVE_SDL11_SDL_H
+# include <SDL11/SDL.h>
+#else
+# include <SDL.h>
+#endif
 
 char*
 my_strdup (char *str)
@@ -121,9 +127,13 @@ int main (int argc, char *argv[])
 ],, no_sdl=yes,
        AC_TRY_LINK([
 #include <stdio.h>
-#include "SDL.h"
+#ifdef HAVE_SDL11_SDL_H
+# include <SDL11/SDL.h>
+#else
+# include <SDL.h>
+#endif
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv@<:@@:>@)
 { return 0; }
 #undef  main
 #define main K_and_R_C_main
@@ -152,9 +162,13 @@ int main(int argc, char *argv[])
           LIBS="$LIBS $SDL_LIBS"
           AC_TRY_LINK([
 #include <stdio.h>
-#include "SDL.h"
+#ifdef HAVE_SDL11_SDL_H
+# include <SDL11/SDL.h>
+#else
+# include <SDL.h>
+#endif
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv@<:@@:>@)
 { return 0; }
 #undef  main
 #define main K_and_R_C_main
diff --git a/m4/xine.m4 b/m4/xine.m4
index 316ca4918..1b21bbbab 100644
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -57,7 +57,7 @@ AC_ARG_ENABLE(xinetest,
   if test "x$enable_xinetest" != "xyes" ; then
     AC_MSG_CHECKING([for XINE-LIB version >= $min_xine_version])
   else
-    AC_PATH_PROG(XINE_CONFIG, xine-config, no)
+    AC_PATH_TOOL(XINE_CONFIG, xine-config, no)
     AC_MSG_CHECKING([for XINE-LIB version >= $min_xine_version])
     no_xine=""
     if test "$XINE_CONFIG" = "no" ; then