Commit affe4d59 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

- Don't try altivec compiler flags except on PPC and PPC64

  (some PPC user should review this)
- Don't find canonical build and target (heck, VLC is not a compiler!)
parent 1a79ea4e
...@@ -12,7 +12,7 @@ CODENAME="Grishenko" ...@@ -12,7 +12,7 @@ CODENAME="Grishenko"
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools) AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2]) AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
...@@ -1315,7 +1315,9 @@ dnl - Linux PPC, gcc 3.x: need <altivec.h> and -fvec ...@@ -1315,7 +1315,9 @@ dnl - Linux PPC, gcc 3.x: need <altivec.h> and -fvec
dnl - Others: test should fail dnl - Others: test should fail
AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
[ac_cv_c_altivec], [ac_cv_c_altivec],
[# OS X/PPC test (gcc 4.x) [AS_IF([test "${host_cpu}" != "ppc" -a "${host_cpu}" != "ppc64"], [
ac_cv_c_altivec="no"], [
# OS X/PPC test (gcc 4.x)
CFLAGS="${CFLAGS_save} -mpim-altivec -force_cpusubtype_ALL" CFLAGS="${CFLAGS_save} -mpim-altivec -force_cpusubtype_ALL"
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[vec_ld(0, (unsigned char *)0);], [vec_ld(0, (unsigned char *)0);],
...@@ -1348,6 +1350,7 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], ...@@ -1348,6 +1350,7 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
]) ])
]) ])
CFLAGS="${CFLAGS_save}" CFLAGS="${CFLAGS_save}"
])
]) ])
if test "${ac_cv_c_altivec}" != "no"; then if test "${ac_cv_c_altivec}" != "no"; then
......
...@@ -951,7 +951,6 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) ) ...@@ -951,7 +951,6 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
#endif #endif
wxU(_("The VideoLAN team <videolan@videolan.org>\n" wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) ); "http://www.videolan.org/\n\n")) );
wxMessageBox( msg, wxString::Format(wxU(_("About %s")), wxMessageBox( msg, wxString::Format(wxU(_("About %s")),
wxT("VLC media player")), wxOK | wxICON_INFORMATION, this ); wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment