mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 00:21:11 +02:00
Remove some config items that are just wrong with cross compilation
This commit is contained in:
parent
3b5855707f
commit
1b83e0e0e9
|
@ -1,4 +1,4 @@
|
|||
N2N_VERSION=@N2N_VERSION@
|
||||
PACKAGE_VERSION=@PACKAGE_VERSION@
|
||||
CC=@CC@
|
||||
AR=@AR@
|
||||
WINDRES=@WINDRES@
|
||||
|
|
18
configure.ac
18
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)
|
||||
|
|
|
@ -17,6 +17,5 @@ EOF
|
|||
|
||||
cat <<EOF >include/config.h
|
||||
#define PACKAGE_VERSION "FIXME"
|
||||
#define PACKAGE_OSNAME "FIXME"
|
||||
#define PACKAGE_BUILDDATE "$(date)"
|
||||
EOF
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
/* *********************************************** */
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue
Block a user