Skip to content

Commit

Permalink
build: drop the libndp submodule
Browse files Browse the repository at this point in the history
libndp has existed for a while now. 1.0 was released six months
ago. So drop the submodule and just require an installed package.
  • Loading branch information
danwinship committed Feb 3, 2014
1 parent 736bc1c commit dd58d9c
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 39 deletions.
3 changes: 0 additions & 3 deletions .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
13 changes: 1 addition & 12 deletions Makefile.am
Expand Up @@ -20,8 +20,6 @@ SUBDIRS = \
examples \
vapi

DIST_SUBDIRS = $(SUBDIRS) libndp

@GNOME_CODE_COVERAGE_RULES@

EXTRA_DIST = \
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion autogen.sh
Expand Up @@ -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
23 changes: 1 addition & 22 deletions configure.ac
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion libndp
Submodule libndp deleted from 4376e7

0 comments on commit dd58d9c

Please sign in to comment.