From 3c2de6e117f10e76720765001f9377f1625faf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Tue, 8 Nov 2005 20:18:36 +0000
Subject: *BUGFIX* Fixed libraries detection for cross-compiling.

CVS patchset: 7796
CVS date: 2005/11/08 20:18:36
---
 m4/arts.m4    |  6 +++++-
 m4/caca.m4    |  6 +++++-
 m4/dvdnav.m4  |  6 +++++-
 m4/esd.m4     |  6 +++++-
 m4/libFLAC.m4 |  6 +++++-
 m4/libfame.m4 |  6 +++++-
 m4/ogg.m4     |  6 +++++-
 m4/sdl.m4     | 12 +++++++++++-
 m4/speex.m4   |  6 +++++-
 m4/theora.m4  |  6 +++++-
 m4/vorbis.m4  |  6 +++++-
 11 files changed, 61 insertions(+), 11 deletions(-)

(limited to 'm4')

diff --git a/m4/arts.m4 b/m4/arts.m4
index b2ea99549..f1c2963d0 100644
--- a/m4/arts.m4
+++ b/m4/arts.m4
@@ -108,7 +108,11 @@ int main ()
     }
 }
 
-],, no_arts=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_arts=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <artsc.h>
+],       [ return 0; ],, no_arts=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
diff --git a/m4/caca.m4 b/m4/caca.m4
index 5e8c27a19..884256fbe 100644
--- a/m4/caca.m4
+++ b/m4/caca.m4
@@ -108,7 +108,11 @@ int main ()
     }
 }
 
-],, no_caca=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_caca=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <caca.h>
+],       [ return 0; ],, no_caca=yes))
 
       CFLAGS="$ac_save_CFLAGS"
       LIBS="$ac_save_LIBS"
diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4
index aa4a2b0f9..505050676 100644
--- a/m4/dvdnav.m4
+++ b/m4/dvdnav.m4
@@ -126,7 +126,11 @@ main ()
   }
   return 1;
 }
-],, no_dvdnav=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_dvdnav=yes,
+         AC_TRY_LINK([
+#include <dvdnav.h>
+#include <stdio.h>
+],       [ return 0; ],, no_dvdnav=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
diff --git a/m4/esd.m4 b/m4/esd.m4
index 71d9dc4aa..cbe4a8263 100644
--- a/m4/esd.m4
+++ b/m4/esd.m4
@@ -111,7 +111,11 @@ int main ()
     }
 }
 
-],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_esd=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <esd.h>
+],       [ return 0; ],, no_esd=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
diff --git a/m4/libFLAC.m4 b/m4/libFLAC.m4
index cf46bf810..26b4beba1 100644
--- a/m4/libFLAC.m4
+++ b/m4/libFLAC.m4
@@ -58,7 +58,11 @@ int main ()
   return 0;
 }
 
-],, no_libFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_libFLAC=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <FLAC/format.h>
+],       [ return 0; ],, no_libFLAC=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
   fi
diff --git a/m4/libfame.m4 b/m4/libfame.m4
index 5e42da389..74b368e9a 100644
--- a/m4/libfame.m4
+++ b/m4/libfame.m4
@@ -126,7 +126,11 @@ main ()
     }
   return 1;
 }
-],, no_libfame=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_libfame=yes,
+         AC_TRY_LINK([
+#include <fame.h>
+#include <stdio.h>
+],       [ return 0; ],, no_libfame=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
diff --git a/m4/ogg.m4 b/m4/ogg.m4
index 811c47607..30a9fa17d 100644
--- a/m4/ogg.m4
+++ b/m4/ogg.m4
@@ -45,7 +45,11 @@ int main ()
   return 0;
 }
 
-],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_ogg=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],       [ return 0; ],, no_ogg=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
   fi
diff --git a/m4/sdl.m4 b/m4/sdl.m4
index 62bbfa680..4e62c3fea 100644
--- a/m4/sdl.m4
+++ b/m4/sdl.m4
@@ -118,7 +118,17 @@ int main (int argc, char *argv[])
     }
 }
 
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_sdl=yes,
+       AC_TRY_LINK([
+#include <stdio.h>
+#include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
+],      [ return 0; ],, no_sdl=yes))
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
diff --git a/m4/speex.m4 b/m4/speex.m4
index a39e1dd6a..5e763a946 100644
--- a/m4/speex.m4
+++ b/m4/speex.m4
@@ -45,7 +45,11 @@ int main ()
   return 0;
 }
 
-],, no_speex=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_speex=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <speex.h>
+],       [ return 0; ],, no_speex=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
   fi
diff --git a/m4/theora.m4 b/m4/theora.m4
index 9118f47cd..879a1ceec 100644
--- a/m4/theora.m4
+++ b/m4/theora.m4
@@ -46,7 +46,11 @@ int main ()
   return 0;
 }
 
-],, no_theora=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_theora=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <theora/theora.h>
+],       [ return 0; ],, no_theora=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
   fi
diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
index cefa28980..12dd5bedc 100644
--- a/m4/vorbis.m4
+++ b/m4/vorbis.m4
@@ -47,7 +47,11 @@ int main ()
   return 0;
 }
 
-],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+],, no_vorbis=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <vorbis/codec.h>
+],       [ return 0; ],, no_vorbis=yes))
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
   fi
-- 
cgit v1.2.3