blob: 33c3a3b6ef05b8288dc9dbb7fee06736143e2341 [file] [log] [blame]
Index: openvpn/configure.ac
===================================================================
--- openvpn.orig/configure.ac
+++ openvpn/configure.ac
@@ -1312,10 +1312,6 @@ if test "${enable_werror}" = "yes"; then
CFLAGS="${CFLAGS} -Werror"
fi
-if test "${WIN32}" = "yes"; then
- test -z "${MAN2HTML}" && AC_MSG_ERROR([man2html is required for win32])
-fi
-
if test "${enable_plugin_auth_pam}" = "yes"; then
PLUGIN_AUTH_PAM_CFLAGS="${LIBPAM_CFLAGS}"
if test "${enable_pam_dlopen}" = "yes"; then
@@ -1418,28 +1414,11 @@ fi
AC_CONFIG_FILES([
version.sh
Makefile
- build/Makefile
- build/msvc/Makefile
- build/msvc/msvc-generate/Makefile
- distro/Makefile
- distro/systemd/Makefile
include/Makefile
src/Makefile
src/compat/Makefile
src/openvpn/Makefile
- src/openvpnserv/Makefile
src/plugins/Makefile
- src/plugins/auth-pam/Makefile
src/plugins/down-root/Makefile
- tests/Makefile
- tests/unit_tests/Makefile
- tests/unit_tests/example_test/Makefile
- tests/unit_tests/openvpn/Makefile
- tests/unit_tests/plugins/Makefile
- tests/unit_tests/plugins/auth-pam/Makefile
- vendor/Makefile
- sample/Makefile
- doc/Makefile
])
-AC_CONFIG_FILES([tests/t_client.sh], [chmod +x tests/t_client.sh])
AC_OUTPUT
Index: openvpn/src/Makefile.am
===================================================================
--- openvpn.orig/src/Makefile.am
+++ openvpn/src/Makefile.am
@@ -12,4 +12,4 @@
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in
-SUBDIRS = compat openvpn openvpnserv plugins
+SUBDIRS = compat openvpn plugins
Index: openvpn/src/openvpn/Makefile.am
===================================================================
--- openvpn.orig/src/openvpn/Makefile.am
+++ openvpn/src/openvpn/Makefile.am
@@ -9,7 +9,7 @@
# Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
#
-include $(top_srcdir)/build/ltrc.inc
+include $(top_srcdir)/ltrc.inc
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in
Index: openvpn/src/plugins/Makefile.am
===================================================================
--- openvpn.orig/src/plugins/Makefile.am
+++ openvpn/src/plugins/Makefile.am
@@ -12,4 +12,4 @@
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in
-SUBDIRS = auth-pam down-root
+SUBDIRS = down-root
Index: openvpn/Makefile.am
===================================================================
--- openvpn.orig/Makefile.am
+++ openvpn/Makefile.am
@@ -53,26 +53,14 @@ BUILT_SOURCES = \
config-version.h
endif
-SUBDIRS = build distro include src sample doc vendor tests
+SUBDIRS = include src
dist_doc_DATA = \
- README \
- README.IPv6 \
- README.mbedtls \
- Changes.rst \
- COPYRIGHT.GPL \
- COPYING
+ README.IPv6
+ LICENSE
dist_noinst_DATA = \
- .gitignore \
- .gitattributes \
- PORTS \
- README.IPv6 TODO.IPv6 \
- README.mbedtls \
- openvpn.sln \
- msvc-env.bat \
- msvc-dev.bat \
- msvc-build.bat
+ README.IPv6
dist_noinst_HEADERS = \
config-msvc.h \