[xine-cvs] CVS: xine-lib ChangeLog,1.632,1.633 configure.ac,1.346,1.347

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1657

Modified Files:
	ChangeLog configure.ac 
Log Message:
*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)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/xine-lib/ChangeLog,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- ChangeLog	28 Nov 2005 12:20:24 -0000	1.632
+++ ChangeLog	28 Nov 2005 12:24:56 -0000	1.633
@@ -39,6 +39,7 @@
 
 xine-lib (1.0.3)
   * tiny doc update
+  * build fixes and cross build improvements
               
 xine-lib (1.0.2)
   * fixed playback of single-session Real RTSP streams, such as

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- configure.ac	15 Nov 2005 14:58:52 -0000	1.346
+++ configure.ac	28 Nov 2005 12:24:56 -0000	1.347
@@ -871,7 +871,7 @@
 dnl Find pkg-config
 dnl ---------------------------------------------
 
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
 if test x$PKG_CONFIG = xno ; then
   echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net"
   echo "*** All of DIRECTFB dependent parts will be disabled"
@@ -1240,7 +1240,7 @@
   [with_imagemagick=$enableval], [with_imagemagick=yes])
 
 if test "x$with_imagemagick" = "xyes"; then
-  AC_PATH_PROG(WAND_CONFIG, Wand-config, no)
+  AC_PATH_TOOL(WAND_CONFIG, Wand-config, no)
   if test "$WAND_CONFIG" = "no" ; then
     AC_MSG_RESULT([*** All Imagemagick dependent parts will be disabled, Wand-config not found. ***])
     have_imagemagick="no"
@@ -1788,6 +1788,33 @@
 
 
 dnl ---------------------------------------------
+dnl Win32 DLL codecs
+dnl ---------------------------------------------
+AC_ARG_ENABLE([w32dll],
+  AC_HELP_STRING([--disable-w32dll], [Disable Win32 DLL support]),
+  enable_w32dll=$enableval, [
+    AC_MSG_CHECKING([whether to enable Win32 DLL support])
+    case "$host_or_hostalias" in
+      *-mingw* | *-cygwin)
+        enable_w32dll="no"
+        ;;
+      i?86-* | k?-* | athlon-* | pentium*-)
+        enable_w32dll="yes"
+        ;;
+      *)
+        enable_w32dll="no"
+    esac
+    AC_MSG_RESULT([$enable_w32dll])])
+AM_CONDITIONAL(HAVE_W32DLL, test x"$enable_w32dll" = "xyes")
+if test x"$enable_w32dll" = "xyes"; then
+   W32DLL_DEP=""
+else 
+   W32DLL_DEP="#"
+fi
+AC_SUBST(W32DLL_DEP)
+
+
+dnl ---------------------------------------------
 dnl ip_mreqn
 dnl ---------------------------------------------
 
@@ -1865,7 +1892,6 @@
 
 AC_OPTIMIZATIONS
 
-enable_w32dll="no"
 enable_ffmmx="no"
 enable_armv4l="no"
 
@@ -1880,14 +1906,9 @@
     AC_DEFINE_UNQUOTED(ARCH_X86,,[Define this if you're running x86 architecture])
     AC_DEFINE(FPM_INTEL,1,[Define to select libmad fixed point arithmetic implementation])
     enable_ffmmx="yes"
-    enable_w32dll="yes"
 
     case "$host_or_hostalias" in
-      *-*-mingw*)
-        enable_w32dll="no" 
-        ;;
       *-*-cygwin) 
-        enable_w32dll="no" 
         LIBS="$LIBS @INTLLIBS@ -lkernel32"
         ;;
     esac
@@ -1974,14 +1995,6 @@
 
 AM_CONDITIONAL(HOST_OS_DARWIN, test x"$HOST_OS_DARWIN" = "x1")
 
-AM_CONDITIONAL(HAVE_W32DLL, test x"$enable_w32dll" = "xyes")
-if test x"$enable_w32dll" = "xyes"; then
-   W32DLL_DEP=""
-else 
-   W32DLL_DEP="#"
-fi
-AC_SUBST(W32DLL_DEP)
-
 AM_CONDITIONAL(HAVE_FFMMX, test x"$enable_ffmmx" = "xyes")
 
 dnl ---------------------------------------------