Fix hostname reporting on some weirdly configured systems like mine (actually, use...

Fix qt4 interface of displaying it in About dialog the same way as wx interface does.

diff --git a/configure.ac b/configure.ac
index db027c60b089b994112cefb06ed30236f1930392..039a9569ea1982a01e680bc79ba8cd2ec3853132 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6092,7 +6092,7 @@ AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_REVISION)
 AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) 
-AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) 
+AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure]) 
 AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) 
 AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) 
 

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index a1c7c90c052dd44aacd50195a4f5787eeb4576f8..5f14227a553c12bb35b1823419beca76de011b7c 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -112,6 +112,7 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
                  "works on many platforms.\n\n" )
             + qtr( "You are using the new Qt4 Interface.\n" )
             + qtr( "Compiled by " ) + qfu( VLC_CompileBy() )+ "@"
+            + qfu( VLC_CompileHost() ) + "."
             + qfu( VLC_CompileDomain() ) + ".\n"
             + "Compiler: " + qfu( VLC_Compiler() ) + ".\n"
             + qtr( "Based on SVN revision: " ) + qfu( VLC_Changeset() )