From 1b83e0e0e9f63d4e98ddfcba7574d4d75fe7c8b5 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Thu, 22 Jun 2023 10:20:05 +0100
Subject: [PATCH] Remove some config items that are just wrong with cross
 compilation

---
 config.mak.in                |  2 +-
 configure.ac                 | 18 ------------------
 scripts/hack_fakeautoconf.sh |  1 -
 src/n2n.c                    |  6 +++---
 win32/winconfig.h            | 11 -----------
 5 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 win32/winconfig.h

diff --git a/config.mak.in b/config.mak.in
index 4f08f4a..684c664 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -1,4 +1,4 @@
-N2N_VERSION=@N2N_VERSION@
+PACKAGE_VERSION=@PACKAGE_VERSION@
 CC=@CC@
 AR=@AR@
 WINDRES=@WINDRES@
diff --git a/configure.ac b/configure.ac
index 0ddf589..997c378 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,6 @@ odnl> Do not add anything above
 AC_INIT([edge], m4_esyscmd([scripts/version.sh | tr -d '\n']))
 dnl> Do not add anything above
 
-N2N_VERSION=${PACKAGE_VERSION}
-
 AC_DEFINE([PACKAGE_BUILDDATE], "[m4_esyscmd([scripts/version.sh date | tr -d '\n'])]", [Last change date])
 
 if test "${CC+set}" != set; then
@@ -134,28 +132,12 @@ AS_IF([test "x$enable_pthread" != xno],
 )
 
 
-MACHINE=`uname -m`
-SYSTEM=`uname -s`
-
-if test $SYSTEM = "Linux"; then
-   if test -f /etc/debian_version; then
-      DEBIAN_VERSION=`cat /etc/debian_version`
-      OSNAME="Debian $DEBIAN_VERSION"
-   else
-      OSNAME=`./config.guess`
-   fi
-else
-dnl> wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
-   OSNAME=`./config.guess`
-fi
-AC_DEFINE_UNQUOTED(PACKAGE_OSNAME, "${OSNAME}", [OS name])
 
 AC_SUBST(CC)
 AC_SUBST(AR)
 AC_SUBST(WINDRES)
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
-AC_SUBST(N2N_VERSION)
 AC_SUBST(N2N_LIBS_EXTRA)
 AC_SUBST(TOOLS_ADDITIONAL)
 AC_CONFIG_HEADERS(include/config.h)
diff --git a/scripts/hack_fakeautoconf.sh b/scripts/hack_fakeautoconf.sh
index 4c6d8cc..0165f2e 100755
--- a/scripts/hack_fakeautoconf.sh
+++ b/scripts/hack_fakeautoconf.sh
@@ -17,6 +17,5 @@ EOF
 
 cat <<EOF >include/config.h
 #define PACKAGE_VERSION "FIXME"
-#define PACKAGE_OSNAME "FIXME"
 #define PACKAGE_BUILDDATE "$(date)"
 EOF
diff --git a/src/n2n.c b/src/n2n.c
index c5a65ad..3d6ce08 100644
--- a/src/n2n.c
+++ b/src/n2n.c
@@ -24,7 +24,7 @@
 #include <string.h>          // for memcmp, memcpy, memset, strlen, strerror
 #include <sys/time.h>        // for gettimeofday, timeval
 #include <time.h>            // for time, localtime, strftime
-#include "config.h"          // for PACKAGE_BUILDDATE, PACKAGE_OSNAME, PACKA...
+#include "config.h"          // for PACKAGE_BUILDDATE, PACKA...
 #include "n2n.h"
 #include "random_numbers.h"  // for n2n_rand
 #include "sn_selection.h"    // for sn_selection_criterion_default
@@ -608,10 +608,10 @@ void hexdump (const uint8_t *buf, size_t len) {
 
 void print_n2n_version () {
 
-    printf("Welcome to n2n v.%s for %s\n"
+    printf("Welcome to n2n v.%s\n"
            "Built on %s\n"
            "Copyright 2007-2022 - ntop.org and contributors\n\n",
-           PACKAGE_VERSION, PACKAGE_OSNAME, PACKAGE_BUILDDATE);
+           PACKAGE_VERSION, PACKAGE_BUILDDATE);
 }
 
 /* *********************************************** */
diff --git a/win32/winconfig.h b/win32/winconfig.h
deleted file mode 100644
index aa9794a..0000000
--- a/win32/winconfig.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* winconfig.h.  Win32 replacement for file generated from config.h.in by configure.  */
-
-/* OS name */
-#ifndef PACKAGE_OSNAME
-#define PACKAGE_OSNAME "windows"
-#endif
-
-/* Define to the version of this package. */
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION N2N_VERSION
-#endif