mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 16:41:11 +02:00
Move OpenSolaris special config to the configure script
This commit is contained in:
parent
8dcc879ca0
commit
15fe4f786f
7
Makefile
7
Makefile
|
@ -49,8 +49,6 @@ ifeq ($(shell uname -o),Msys)
|
||||||
CONFIG_TARGET=mingw
|
CONFIG_TARGET=mingw
|
||||||
else ifeq ($(shell uname -s),Darwin)
|
else ifeq ($(shell uname -s),Darwin)
|
||||||
CONFIG_TARGET=darwin
|
CONFIG_TARGET=darwin
|
||||||
else ifeq ($(shell uname), SunOS)
|
|
||||||
CONFIG_TARGET=sunos
|
|
||||||
else
|
else
|
||||||
CONFIG_TARGET=generic
|
CONFIG_TARGET=generic
|
||||||
endif
|
endif
|
||||||
|
@ -162,11 +160,6 @@ LINT_CCODE=\
|
||||||
LDLIBS+=-ln2n
|
LDLIBS+=-ln2n
|
||||||
LDLIBS+=$(LDLIBS_EXTRA)
|
LDLIBS+=$(LDLIBS_EXTRA)
|
||||||
|
|
||||||
#For OpenSolaris (Solaris too?)
|
|
||||||
ifeq ($(CONFIG_TARGET), sunos)
|
|
||||||
LDLIBS+=-lsocket -lnsl
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_TARGET),mingw)
|
ifeq ($(CONFIG_TARGET),mingw)
|
||||||
CFLAGS+=-I. -I./win32
|
CFLAGS+=-I. -I./win32
|
||||||
LDLIBS+=$(abspath win32/n2n_win32.a)
|
LDLIBS+=$(abspath win32/n2n_win32.a)
|
||||||
|
|
|
@ -12,6 +12,14 @@ AC_PROG_CC
|
||||||
AC_CHECK_TOOL([AR], [ar], [false])
|
AC_CHECK_TOOL([AR], [ar], [false])
|
||||||
AC_CHECK_TOOL([WINDRES], [windres], [windres])
|
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
|
# TODO: ideally, should use AC_ARG_ENABLE
|
||||||
AC_ARG_WITH([edgex],
|
AC_ARG_WITH([edgex],
|
||||||
AS_HELP_STRING([--with-edgex], [Build for Ubiquity-X]),
|
AS_HELP_STRING([--with-edgex], [Build for Ubiquity-X]),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user