Merge remote-tracking branch 'savannah/sf/ospfd'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/Makefile.am b/Makefile.am
index 8371041..37fea43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,8 @@
update-autotools \
vtysh/Makefile.in vtysh/Makefile.am \
tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
- tools/zebra.el tools/multiple-bgpd.sh
+ tools/zebra.el tools/multiple-bgpd.sh \
+ fpm/fpm.h
if HAVE_LATEX
diff --git a/configure.ac b/configure.ac
index fb6efd7..405693c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,7 @@
if test "x${cflags_specified}" = "x" ; then
case ${COMPILER} in
"ICC")
- CFLAGS="-Os -g -Wall -wd 279,869,981"
+ CFLAGS="-Os -g -Wall"
AC_MSG_RESULT([Intel default])
;;
"GCC")
@@ -195,10 +195,7 @@
[EXTRAVERSION=$withval],)
AC_ARG_WITH(pkg-git-version,
AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]),
- [ if test "x$withval" != "xno"; then
- with_pkg_git_version="1"
- AC_DEFINE(GIT_VERSION, [1], [include git version info])
- fi ],)
+ [ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
AC_ARG_ENABLE(vtysh,
[ --enable-vtysh include integrated vty shell for Quagga])
AC_ARG_ENABLE(ipv6,
@@ -410,7 +407,14 @@
PACKAGE_STRING="${PACKAGE_STRING}${EXTRAVERSION}"
fi
-AM_CONDITIONAL([GIT_VERSION], [test "x$with_pkg_git_version" != "x"])
+if test "x$with_pkg_git_version" = "xyes"; then
+ if test -d "${srcdir}/.git"; then
+ AC_DEFINE(GIT_VERSION, [1], [include git version info])
+ else with_pkg_git_version="no"
+ AC_MSG_WARN([--with-pkg-git-version given, but this is not a git checkout])
+ fi
+fi
+AM_CONDITIONAL([GIT_VERSION], [test "x$with_pkg_git_version" = "xyes"])
dnl ------------------------------------
dnl Check C keywords and standard types
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 690c18f..0ec5b4c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,7 +29,12 @@
privs.h sigevent.h pqueue.h jhash.h zassert.h memtypes.h \
workqueue.h route_types.h
-EXTRA_DIST = regex.c regex-gnu.h memtypes.awk route_types.pl route_types.txt
+EXTRA_DIST = \
+ regex.c regex-gnu.h \
+ queue.h \
+ memtypes.awk \
+ route_types.pl route_types.txt \
+ gitversion.pl
memtypes.h: $(srcdir)/memtypes.c $(srcdir)/memtypes.awk
($(GAWK) -f $(srcdir)/memtypes.awk $(srcdir)/memtypes.c > $@)
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 266812f..96f7bef 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -42,7 +42,8 @@
noinst_HEADERS = \
connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
- interface.h ipforward.h irdp.h router-id.h kernel_socket.h
+ interface.h ipforward.h irdp.h router-id.h kernel_socket.h \
+ rt_netlink.h zebra_fpm.h zebra_fpm_private.h
zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) $(LIB_IPV6)