enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-16 15:31:10 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Move OpenSolaris special config to the configure script

Browse Source
This commit is contained in:
Hamish Coleman 2023-07-02 15:31:44 +01:00
parent 8dcc879ca0
commit 15fe4f786f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -49,8 +49,6 @@ ifeq ($(shell uname -o),Msys)
CONFIG_TARGET=mingw
else ifeq ($(shell uname -s),Darwin)
CONFIG_TARGET=darwin
else ifeq ($(shell uname), SunOS)
CONFIG_TARGET=sunos
else
CONFIG_TARGET=generic
endif
@ -162,11 +160,6 @@ LINT_CCODE=\
LDLIBS+=-ln2n
LDLIBS+=$(LDLIBS_EXTRA)
#For OpenSolaris (Solaris too?)
ifeq ($(CONFIG_TARGET), sunos)
LDLIBS+=-lsocket -lnsl
endif
ifeq ($(CONFIG_TARGET),mingw)
CFLAGS+=-I. -I./win32
LDLIBS+=$(abspath win32/n2n_win32.a)

8
configure.ac
View File

@ -12,6 +12,14 @@ AC_PROG_CC
AC_CHECK_TOOL([AR], [ar], [false])
AC_CHECK_TOOL([WINDRES], [windres], [windres])
case "$host_os" in
*-solaris*)
# Was in Makefile with the test `uname` -eq "SunOS"
# and comment "For OpenSolaris (Solaris too?)"
LIBS="-lsocket -lnsl $LIBS"
;;
esac
# TODO: ideally, should use AC_ARG_ENABLE
AC_ARG_WITH([edgex],
AS_HELP_STRING([--with-edgex], [Build for Ubiquity-X]),