mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-04 23:31:19 +00:00
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.
This commit is contained in:
parent
736bc1c7db
commit
dd58d9c703
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -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
Makefile.am
13
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
|
||||
|
|
|
@ -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
|
||||
|
|
21
configure.ac
21
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
|
||||
|
||||
AC_ARG_WITH(nmtui, AS_HELP_STRING([--with-nmtui=yes|no], [Build nmtui]))
|
||||
if test "$with_nmtui" != no; then
|
||||
|
|
1
libndp
1
libndp
|
@ -1 +0,0 @@
|
|||
Subproject commit 4376e752c822444f1a26b5e1e974ddd7104ae15c
|
Loading…
Reference in a new issue