Removed USER_NAME and HOST_NAME.

Makefile.in

@@ -293,7 +293,6 @@ GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
 GRIB_API_LIBS = @GRIB_API_LIBS@
 HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
-HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -359,7 +358,6 @@ SZLIB_INCLUDE = @SZLIB_INCLUDE@
 SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LIBS = @THREADS_LIBS@
-USER_NAME = @USER_NAME@
 USE_MPI = @USE_MPI@
 UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
 UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@

app/Makefile.in

@@ -266,7 +266,6 @@ GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
 GRIB_API_LIBS = @GRIB_API_LIBS@
 HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
-HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -332,7 +331,6 @@ SZLIB_INCLUDE = @SZLIB_INCLUDE@
 SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LIBS = @THREADS_LIBS@
-USER_NAME = @USER_NAME@
 USE_MPI = @USE_MPI@
 UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
 UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@

app/cdi.c

@@ -85,8 +85,8 @@ void version(void)
 #if defined (COMP_VERSION)
   fprintf(stderr, " version: %s\n", COMP_VERSION);
 #endif
-#if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
-  fprintf(stderr, "Compiled: by %s on %s (%s)\n", USER_NAME, HOST_NAME, SYSTEM_TYPE);
+#ifdef SYSTEM_TYPE
+  fprintf(stderr, "System: %s\n", SYSTEM_TYPE);
 #endif
 
   fprintf(stderr, "filetype: ");

configure

@@ -709,8 +709,6 @@ PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
 SYSTEM_TYPE
-HOST_NAME
-USER_NAME
 UUID_C_LIB
 UUID_C_INCLUDE
 DCE_UUID_C_LIB
@@ -27159,36 +27157,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
-# Checks for username, hostname and system type
-USERNAME=$LOGNAME
-if test -z "$USERNAME" ; then USERNAME=$USER; fi;
-if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
-
-cat >>confdefs.h <<_ACEOF
-#define USER_NAME "$USERNAME"
-_ACEOF
-
-USER_NAME="$USERNAME"
-
-
-if test -z "$HOST"; then :
-  HOST=unknown
-       if test -x /bin/hostname; then :
-  HOST=$(hostname)
-else
-  if test -x /bin/uname; then :
-  HOST=$(uname -n)
-fi
-fi
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HOST_NAME "$HOST"
-_ACEOF
-
-HOST_NAME="$HOST"
-
-
+# Check for system type
 cat >>confdefs.h <<_ACEOF
 #define SYSTEM_TYPE "$ac_cv_build"

configure.ac

@@ -116,21 +116,7 @@ esac
 if test -z "$COMP_VERSION" ; then COMP_VERSION="unknown"; fi;
 AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
 
-# Checks for username, hostname and system type
-USERNAME=$LOGNAME
-if test -z "$USERNAME" ; then USERNAME=$USER; fi;
-if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
-AC_DEFINE_UNQUOTED([USER_NAME],["$USERNAME"], [User name])
-AC_SUBST([USER_NAME],["$USERNAME"])
-
-AS_IF([test -z "$HOST"],
-      [HOST=unknown
-       AS_IF([test -x /bin/hostname],[HOST=$(hostname)],
-             [AS_IF([test -x /bin/uname],
-                    [HOST=$(uname -n)])])])
-AC_DEFINE_UNQUOTED([HOST_NAME],["$HOST"],[Host name])
-AC_SUBST([HOST_NAME],["$HOST"])
-
+# Check for system type
 AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
 AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
 #  ----------------------------------------------------------------------

examples/Makefile.in

@@ -336,7 +336,6 @@ GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
 GRIB_API_LIBS = @GRIB_API_LIBS@
 HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
-HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -402,7 +401,6 @@ SZLIB_INCLUDE = @SZLIB_INCLUDE@
 SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LIBS = @THREADS_LIBS@
-USER_NAME = @USER_NAME@
 USE_MPI = @USE_MPI@
 UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
 UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@

examples/pio/Makefile.in

@@ -308,7 +308,6 @@ GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
 GRIB_API_LIBS = @GRIB_API_LIBS@
 HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
-HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -374,7 +373,6 @@ SZLIB_INCLUDE = @SZLIB_INCLUDE@
 SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LIBS = @THREADS_LIBS@
-USER_NAME = @USER_NAME@
 USE_MPI = @USE_MPI@
 UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
 UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@

interfaces/Makefile.in

@@ -292,7 +292,6 @@ GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
 GRIB_API_LIBS = @GRIB_API_LIBS@
 HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
-HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -358,7 +357,6 @@ SZLIB_INCLUDE = @SZLIB_INCLUDE@
 SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LIBS = @THREADS_LIBS@
-USER_NAME = @USER_NAME@
 USE_MPI = @USE_MPI@
 UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
 UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@

src/Makefile.in

@@ -380,7 +380,6 @@ GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
 GRIB_API_LIBS = @GRIB_API_LIBS@
 HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
-HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,7 +445,6 @@ SZLIB_INCLUDE = @SZLIB_INCLUDE@
 SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LIBS = @THREADS_LIBS@
-USER_NAME = @USER_NAME@
 USE_MPI = @USE_MPI@
 UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
 UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@

src/config.h.in

@@ -209,9 +209,6 @@
 /* Define to 1 for HIRLAM extensions */
 #undef HIRLAM_EXTENSIONS
 
-/* Host name */
-#undef HOST_NAME
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
@@ -247,9 +244,6 @@
 /* System type */
 #undef SYSTEM_TYPE
 
-/* User name */
-#undef USER_NAME
-
 /* parallel I/O requested and available */
 #undef USE_MPI
 

tests/Makefile.in

@@ -394,7 +394,6 @@ GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
 GRIB_API_LIBS = @GRIB_API_LIBS@
 HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
-HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -460,7 +459,6 @@ SZLIB_INCLUDE = @SZLIB_INCLUDE@
 SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LIBS = @THREADS_LIBS@
-USER_NAME = @USER_NAME@
 USE_MPI = @USE_MPI@
 UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
 UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@