[vlc-devel] commit: Remove COMPILE_DOMAIN, merge into COMPILE_HOST ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 19 23:28:03 2010 +0200| [00dc86ba39fe6862a4598be7f322769469eb9f74] | committer: Rémi Denis-Courmont 

Remove COMPILE_DOMAIN, merge into COMPILE_HOST

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=00dc86ba39fe6862a4598be7f322769469eb9f74
---

 configure.ac                     |    3 +--
 include/vlc_common.h             |    1 -
 modules/control/http/http.c      |    2 --
 modules/gui/qt4/dialogs/help.cpp |    3 +--
 src/libvlc.c                     |    4 ++--
 src/libvlccore.sym               |    1 -
 src/version.c                    |    3 +--
 7 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index c27d7d7..f8be2f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4912,8 +4912,7 @@ AC_SUBST(VERSION_REVISION)
 AC_SUBST(VERSION_EXTRA)
 AC_SUBST(COPYRIGHT_YEARS)
 AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s 2>/dev/null || hostname`", [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_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
 dnl Win32 need s a numerical version_extra.
 case $( echo ${VERSION_EXTRA}|wc -m ) in
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 14a3081..20d2232 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -861,7 +861,6 @@ static inline void *xrealloc (void *ptr, size_t len)
 VLC_EXPORT( const char *, VLC_Version, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_CompileBy, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
 
 /*****************************************************************************
diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 7475a05..69756fd 100644
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -431,8 +431,6 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
     mvar_AppendNewVar( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
     mvar_AppendNewVar( p_args->vars, "vlc_compile_host",
                            VLC_CompileHost() );
-    mvar_AppendNewVar( p_args->vars, "vlc_compile_domain",
-                           VLC_CompileDomain() );
     mvar_AppendNewVar( p_args->vars, "vlc_compiler", VLC_Compiler() );
     mvar_AppendNewVar( p_args->vars, "stream_position", position );
     mvar_AppendNewVar( p_args->vars, "stream_time", time );
diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 90b47d0..e37a372 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -116,8 +116,7 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf)
                 "VLC uses its internal codecs and works on essentially every "
                 "popular platform.\n\n" )
             + qtr( "This version of VLC was compiled by:\n " )
-            + qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + "."
-            + qfu( VLC_CompileDomain() ) + ".\n"
+            + qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + ".\n"
             + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n"
             + qtr( "You are using the Qt4 Interface.\n\n" )
             + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS
diff --git a/src/libvlc.c b/src/libvlc.c
index b6b9901..cd31fe6 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1971,8 +1971,8 @@ static void Version( void )
 
     utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
                   psz_vlc_changeset );
-    utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
-             VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
+    utf8_fprintf( stdout, _("Compiled by %s on %s\n"),
+             VLC_CompileBy(), VLC_CompileHost() );
     utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
     utf8_fprintf( stdout, "%s", LICENSE_MSG );
 
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index f498526..8a6bbd7 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -461,7 +461,6 @@ vlc_b64_encode_binary
 vlc_cancel
 vlc_clone
 VLC_CompileBy
-VLC_CompileDomain
 VLC_CompileHost
 VLC_Compiler
 vlc_cond_broadcast
diff --git a/src/version.c b/src/version.c
index 5d6c935..0dc70f3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -41,7 +41,7 @@ char const * VLC_Version( void )
 }
 
 /*****************************************************************************
- * VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain,
+ * VLC_CompileBy, VLC_CompileHost
  * VLC_Compiler, VLC_Changeset
  *****************************************************************************/
 #define DECLARE_VLC_VERSION( func, var )                                    \
@@ -52,5 +52,4 @@ const char * VLC_##func ( void )                                            \
 
 DECLARE_VLC_VERSION( CompileBy, COMPILE_BY )
 DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST )
-DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN )
 DECLARE_VLC_VERSION( Compiler, COMPILER )