From dd58d9c70330a4e0dc92a3b912e783984368ae74 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Mon, 3 Feb 2014 12:04:51 +0100
Subject: [PATCH] build: drop the libndp submodule

libndp has existed for a while now. 1.0 was released six months
ago. So drop the submodule and just require an installed package.
---
 .gitmodules  |  3 ---
 Makefile.am  | 13 +------------
 autogen.sh   |  2 +-
 configure.ac | 23 +----------------------
 libndp       |  1 -
 5 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 160000 libndp

diff --git a/.gitmodules b/.gitmodules
index c31ff2a616..e93bbea6db 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "libgsystem"]
 	path = libgsystem
 	url = git://git.gnome.org/libgsystem
-[submodule "libndp"]
-	path = libndp
-	url = git://github.com/jpirko/libndp.git
diff --git a/Makefile.am b/Makefile.am
index ab2941cc6c..edeadf56a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,6 @@ SUBDIRS = \
 	examples \
 	vapi
 
-DIST_SUBDIRS = $(SUBDIRS) libndp
-
 @GNOME_CODE_COVERAGE_RULES@
 
 EXTRA_DIST = \
@@ -64,13 +62,4 @@ libgsystem_libs = $(GLIB_LIBS)
 include libgsystem/Makefile-libgsystem.am
 noinst_LTLIBRARIES = libgsystem.la
 
-if BUILD_LIBNDP
-noinst_DATA = libndp
-libndp:
-	(cd libndp && $(MAKE))
-
-clean-local:
-	(cd libndp && $(MAKE) clean)
-endif
-
-.PHONY: cscope libndp
+.PHONY: cscope
diff --git a/autogen.sh b/autogen.sh
index 9e3d3d3cf7..1b56207af9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,5 +35,5 @@ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
 cd $olddir
 if test -z "$NOCONFIGURE"; then
-	exec $srcdir/configure --enable-maintainer-mode "$@" --enable-static=libndp
+	exec $srcdir/configure --enable-maintainer-mode "$@"
 fi
diff --git a/configure.ac b/configure.ac
index aa075ba396..7e87b7171d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -672,28 +672,7 @@ else
 fi
 AM_CONDITIONAL(WITH_CONCHECK, test "${enable_concheck}" = "yes")
 
-dnl libndp
-AC_ARG_WITH(system-libndp, AS_HELP_STRING([--with-system-libndp=yes|no|auto], [use system libndp rather than bundled one (default: auto)]),
-            [with_system_libndp=${withval}], [with_system_libndp=auto])
-if test "$with_system_libndp" = yes; then
-    PKG_CHECK_MODULES(LIBNDP, [libndp])
-elif test "$with_system_libndp" = auto; then
-    PKG_CHECK_MODULES(LIBNDP, [libndp], [build_libndp=no],[build_libndp=yes])
-else
-    build_libndp=yes
-fi
-AM_CONDITIONAL(BUILD_LIBNDP, test "${build_libndp}" = yes)
-if test "$build_libndp" = yes; then
-    LIBNDP_CFLAGS='-I$(top_srcdir)/libndp/include'
-    LIBNDP_LIBS='$(top_builddir)/libndp/libndp/.libs/libndp.a'
-    AC_SUBST(LIBNDP_CFLAGS)
-    AC_SUBST(LIBNDP_LIBS)
-    libndp_location=bundled
-else
-    # temporary bug workaround
-    LIBNDP_CFLAGS=`echo $LIBNDP_CFLAGS | sed -e 's:/ndp.h::'`
-    libndp_location=system
-fi
+PKG_CHECK_MODULES(LIBNDP, [libndp])
 
 AC_ARG_WITH(nmtui, AS_HELP_STRING([--with-nmtui=yes|no], [Build nmtui]))
 if test "$with_nmtui" != no; then
diff --git a/libndp b/libndp
deleted file mode 160000
index 4376e752c8..0000000000
--- a/libndp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4376e752c822444f1a26b5e1e974ddd7104ae15c