1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
From: Arnaud Rebillout <arnaudr@kali.org>
Date: Thu, 19 Dec 2024 16:51:58 +0700
Subject: Build without bundled neon
Forwarded: not-needed, Debian-specific
---
Makefile.in | 2 +-
autogen.sh | 2 +-
configure.ac | 18 +++---------------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 03330bb..1ef87b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,7 @@ LIBS = @LIBS@ @NEON_LIBS@ @LIBICONV@
TARGET = $(PACKAGE)
TARGET_DEPS = @TARGET_DEPS@
-SUBDIRS = neon/src
+SUBDIRS =
OBJECTS = src/cadaver.o src/common.o src/commands.o src/ls.o \
src/cmdline.o src/options.o src/utils.o src/edit.o \
src/version.o src/search.o
diff --git a/autogen.sh b/autogen.sh
index da9ce8c..aeef205 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -ex
rm -rf config.cache autom4te*.cache aclocal.m4
-${ACLOCAL:-aclocal} -I m4 -I neon/macros
+${ACLOCAL:-aclocal} -I m4
${AUTOHEADER:-autoheader}
${AUTOCONF:-autoconf}
${LIBTOOLIZE:-libtoolize} --copy --force >/dev/null
diff --git a/configure.ac b/configure.ac
index 3fa8dc7..3e6a5cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_INIT([cadaver],[0.28],,,[https://github.com/notroj/cadaver])
AC_CONFIG_SRCDIR(src/cadaver.c)
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIRS([m4 neon/macros])
+AC_CONFIG_MACRO_DIRS([m4])
AC_USE_SYSTEM_EXTENSIONS
@@ -34,25 +34,15 @@ AC_ARG_ENABLE(netrc,
AS_HELP_STRING([--disable-netrc],[enable .netrc support]),,
enable_netrc=yes)
-NEON_WITH_LIBS
+NEON_LIBRARY
m4_ifndef([NE_MINIMUM_VERSION],
[AC_FATAL([NE_MINIMUM_VERSION macro from neon>=0.34.x required to build.])])
NE_MINIMUM_VERSION(0, 29)
-dnl Don't enable zlib or ACL support in neon
-NEON_WITHOUT_ZLIB
-NEON_WITHOUT_ACL
-
AC_PROVIDE([NE_SNPRINTF])
-NEON_VPATH_BUNDLED(['$(top_srcdir)/neon/src'], [neon/src], [
- NEON_NORMAL_BUILD
- NEON_XML_PARSER
- TARGET_DEPS=neon/src/libneon.a
-])
-
AC_SUBST(TARGET_DEPS)
NE_FORMAT_TIMET
@@ -72,8 +62,6 @@ AC_CHECK_FUNC(getopt_long,,
dnl Check for strcasecmp
AC_CHECK_FUNC(strcasecmp,,[LIBOBJS="$LIBOBJS lib/strcasecmp.o"])
-NEON_REPLACE_SNPRINTF()
-
AC_FUNC_FNMATCH
if test $ac_cv_func_fnmatch_works = no; then
LIBOBJS="$LIBOBJS lib/fnmatch.o"
@@ -127,7 +115,7 @@ NEON_WARNINGS
# Pick up config.h etc; and before any other paths.
CPPFLAGS="-I\$(top_builddir) -I\$(top_srcdir)/lib $CPPFLAGS"
-AC_CONFIG_FILES([Makefile po/Makefile.in neon/src/Makefile])
+AC_CONFIG_FILES([Makefile po/Makefile.in])
AC_CONFIG_COMMANDS([source-directories],
[for f in lib src; do test -d $f || mkdir $f; done])
|
