- 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!)

diff --git a/configure.ac b/configure.ac
index 23a5f892b17c74554bdca00ccdaa6a7ee65627ed..1e1fd66662265c8516ad8b7735102c927ccf057d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ CODENAME="Grishenko"
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2])
 AM_CONFIG_HEADER(config.h)
@@ -1315,7 +1315,9 @@ dnl - Linux PPC, gcc 3.x: need <altivec.h> and -fvec
 dnl - Others: test should fail
 AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
   [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"
    AC_TRY_COMPILE([],
      [vec_ld(0, (unsigned char *)0);],
@@ -1348,6 +1350,7 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
         ])
      ])
    CFLAGS="${CFLAGS_save}"
+   ])
   ])
 
 if test "${ac_cv_c_altivec}" != "no"; then

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 608f065f8dc387b8568c0cfd08bd1567c640db4b..d9834f7f8239bae1df48f6b6b10fd8e8942c4124 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -951,7 +951,6 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
 #endif
         wxU(_("The VideoLAN team <videolan@videolan.org>\n"
               "http://www.videolan.org/\n\n")) );
-
     wxMessageBox( msg, wxString::Format(wxU(_("About %s")),
                   wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );
 }