configure cannot expect that the user will not pass additional CFLAGS
and LDFLAGS at make time [0]. Use OVS_CFLAGS and OVS_LDFLAGS instead to
collect compiler and linker flags and substitute in Makefile.am.
This allows for:
./configure --with-dpdk=[...]
make CFLAGS=-Wno-error=foo
[0] http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_LDFLAGS = $(SSL_LDFLAGS)
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_LDFLAGS = $(SSL_LDFLAGS)
+AM_LDFLAGS += $(OVS_LDFLAGS)
if WIN32
AM_CPPFLAGS += -I $(top_srcdir)/include/windows
if WIN32
AM_CPPFLAGS += -I $(top_srcdir)/include/windows
AM_CFLAGS = -Wstrict-prototypes
AM_CFLAGS += $(WARNING_FLAGS)
AM_CFLAGS = -Wstrict-prototypes
AM_CFLAGS += $(WARNING_FLAGS)
+AM_CFLAGS += $(OVS_CFLAGS)
if NDEBUG
AM_CPPFLAGS += -DNDEBUG
if NDEBUG
AM_CPPFLAGS += -DNDEBUG
[], [enable_Werror=no])
AC_CONFIG_COMMANDS_PRE(
[if test "X$enable_Werror" = Xyes; then
[], [enable_Werror=no])
AC_CONFIG_COMMANDS_PRE(
[if test "X$enable_Werror" = Xyes; then
- CFLAGS="$CFLAGS -Werror"
+ OVS_CFLAGS="$OVS_CFLAGS -Werror"
fi])])
dnl OVS_CHECK_LINUX
fi])])
dnl OVS_CHECK_LINUX
DPDK_LIB_DIR=$RTE_SDK/lib
DPDK_LIB=-lintel_dpdk
DPDK_LIB_DIR=$RTE_SDK/lib
DPDK_LIB=-lintel_dpdk
+ ovs_save_CFLAGS="$CFLAGS"
+ ovs_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$DPDK_LIB_DIR"
CFLAGS="$CFLAGS -I$DPDK_INCLUDE"
LDFLAGS="$LDFLAGS -L$DPDK_LIB_DIR"
CFLAGS="$CFLAGS -I$DPDK_INCLUDE"
if $found; then :; else
AC_MSG_ERROR([cannot link with dpdk])
fi
if $found; then :; else
AC_MSG_ERROR([cannot link with dpdk])
fi
+ CFLAGS="$ovs_save_CFLAGS"
+ LDFLAGS="$ovs_save_LDFLAGS"
+ OVS_LDFLAGS="$OVS_LDFLAGS -L$DPDK_LIB_DIR"
+ OVS_CFLAGS="$OVS_CFLAGS -I$DPDK_INCLUDE"
# DPDK 1.7.0 pmd drivers are not linked unless --whole-archive is used.
#
# DPDK 1.7.0 pmd drivers are not linked unless --whole-archive is used.
#
OVS_CHECK_LINUX
OVS_CHECK_DPDK
OVS_CHECK_PRAGMA_MESSAGE
OVS_CHECK_LINUX
OVS_CHECK_DPDK
OVS_CHECK_PRAGMA_MESSAGE
+AC_SUBST([OVS_CFLAGS])
+AC_SUBST([OVS_LDFLAGS])
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(datapath/Makefile)
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(datapath/Makefile)
esac],
[coverage=false])
if $coverage; then
esac],
[coverage=false])
if $coverage; then
- CFLAGS="$CFLAGS -O0 --coverage"
- LDFLAGS="$LDFLAGS --coverage"
+ OVS_CFLAGS="$OVS_CFLAGS -O0 --coverage"
+ OVS_LDFLAGS="$OVS_LDFLAGS --coverage"
fi])
dnl Checks for --enable-ndebug and defines NDEBUG if it is specified.
fi])
dnl Checks for --enable-ndebug and defines NDEBUG if it is specified.