Move more to git, add submodules, fix build script, change hgignore to gitignore

6 files changed, 0 insertions, 341 deletions

diff --git a/main/openvpn b/main/openvpn
new file mode 160000
+Subproject 7aaf01766f9718375986600216607aeb6397200
diff --git a/main/openvpn/m4/.keep b/main/openvpn/m4/.keep
deleted file mode 100644
index e69de29b..00000000
--- a/main/openvpn/m4/.keep
+++ /dev/null
diff --git a/main/openvpn/m4/ax_emptyarray.m4 b/main/openvpn/m4/ax_emptyarray.m4
deleted file mode 100644
index c6781c17..00000000
--- a/main/openvpn/m4/ax_emptyarray.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl @synopsis AX_EMPTY_ARRAY
-dnl
-dnl Define EMPTY_ARRAY_SIZE to be either "0"
-dnl or "" depending on which syntax the compiler
-dnl prefers for empty arrays in structs.
-dnl
-dnl @version
-dnl @author James Yonan <jim@yonan.net>
-AC_DEFUN([AX_EMPTY_ARRAY], [
-	AS_VAR_PUSHDEF([VAR],[ax_cv_c_empty_array])dnl
-	AC_CACHE_CHECK(
-		[for C compiler empty array size],
-		[VAR],
-		[AC_COMPILE_IFELSE(
-			[AC_LANG_PROGRAM(
-				,
-				[[
-struct { int foo; int bar[0]; } mystruct;
-				]]
-			)],
-			[VAR=0],
-			[AC_COMPILE_IFELSE(
-				[AC_LANG_PROGRAM(
-					,
-					[[
-struct { int foo; int bar[]; } mystruct;
-					]]
-				)],
-				[VAR=],
-				[AC_MSG_ERROR([C compiler is unable to creaty empty arrays])]
-			)]
-		)]
-	)dnl
-	AC_DEFINE_UNQUOTED(
-		[EMPTY_ARRAY_SIZE],
-		[$VAR],
-		[Dimension to use for empty array declaration]
-	)dnl
-	AS_VAR_POPDEF([VAR])dnl
-])
diff --git a/main/openvpn/m4/ax_socklen_t.m4 b/main/openvpn/m4/ax_socklen_t.m4
deleted file mode 100644
index cd7cad8a..00000000
--- a/main/openvpn/m4/ax_socklen_t.m4
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl -- The following is base of curl's acinclude.m4 --
-dnl Check for socklen_t: historically on BSD it is an int, and in
-dnl POSIX 1g it is a type of its own, but some platforms use different
-dnl types for the argument to getsockopt, getpeername, etc.  So we
-dnl have to test to find something that will work.
-AC_DEFUN([AX_TYPE_SOCKLEN_T], [
-	AC_CHECK_TYPE(
-		[socklen_t],
-		,
-		[
-			AS_VAR_PUSHDEF([VAR],[ax_cv_socklen_t_equiv])dnl
-			AC_CACHE_CHECK(
-				[for socklen_t equivalent],
-				[VAR],
-				[
-					#AS_CASE is not supported on <autoconf-2.60
-					case "${host}" in
-					*-mingw*) VAR=int ;;
-					*)
-						# Systems have either "struct sockaddr *" or
-						# "void *" as the second argument to getpeername
-						for arg2 in "struct sockaddr" void; do
-							for t in int size_t unsigned long "unsigned long"; do
-								AC_COMPILE_IFELSE(
-									[AC_LANG_PROGRAM(
-										[[
-#include <sys/types.h>
-#include <sys/socket.h>
-int getpeername (int, $arg2 *, $t *);
-										]],
-										[[
-$t len;
-getpeername(0,0,&len);
-										]]
-									)],
-									[VAR="$t"; break]
-								)
-							done
-							test -n "$VAR" && break
-						done
-						;;
-					esac
-				]
-				AS_VAR_IF(
-					[VAR],
-					[],
-					[AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])],
-					[AC_DEFINE_UNQUOTED(
-						[socklen_t],
-						[$VAR],
-						[type to use in place of socklen_t if not defined]
-					)]
-				)
-			)
-		],
-		[[
-#include <sys/types.h>
-#ifdef WIN32
-#include <ws2tcpip.h>
-#else
-#include <sys/socket.h>
-#endif
-		]]
-	)
-])
diff --git a/main/openvpn/m4/ax_varargs.m4 b/main/openvpn/m4/ax_varargs.m4
deleted file mode 100644
index c295d21f..00000000
--- a/main/openvpn/m4/ax_varargs.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl @synopsis AX_CPP_VARARG_MACRO_GCC
-dnl
-dnl Test if the preprocessor understands GNU GCC-style vararg macros.
-dnl If it does, defines HAVE_CPP_VARARG_MACRO_GCC to 1.
-dnl
-dnl @version
-dnl @author James Yonan <jim@yonan.net>, Matthias Andree <matthias.andree@web.de>
-AC_DEFUN([AX_CPP_VARARG_MACRO_GCC], [dnl
-	AS_VAR_PUSHDEF([VAR], [ax_cv_cpp_vararg_macro_gcc])dnl
-	AC_CACHE_CHECK(
-		[for GNU GCC vararg macro support],
-		[VAR],
-		[AC_COMPILE_IFELSE(
-			[AC_LANG_PROGRAM(
-				[[
-#define macro(a, b...) func(a, b)
-int func(int a, int b, int c);
-				]],
-				[[
-int i = macro(1, 2, 3);
-				]]
-			)],
-			[VAR=yes],
-			[VAR=no]
-		)]
-	)dnl
-
-	AS_VAR_IF(
-		[VAR],
-		[yes],
-		[AC_DEFINE(
-			[HAVE_CPP_VARARG_MACRO_GCC],
-			[1], 
-			[Define to 1 if your compiler supports GNU GCC-style variadic macros]
-		)]
-	)dnl
-	AS_VAR_POPDEF([VAR])dnl
-])
-
-dnl @synopsis AX_CPP_VARARG_MACRO_ISO
-dnl
-dnl Test if the preprocessor understands ISO C 1999 vararg macros.
-dnl If it does, defines HAVE_CPP_VARARG_MACRO_ISO to 1.
-dnl
-dnl @version
-dnl @author James Yonan <jim@yonan.net>, Matthias Andree <matthias.andree@web.de>
-AC_DEFUN([AX_CPP_VARARG_MACRO_ISO], [dnl
-	AS_VAR_PUSHDEF([VAR],[ax_cv_cpp_vararg_macro_iso])dnl
-	AC_CACHE_CHECK(
-		[for ISO C 1999 vararg macro support],
-		[VAR],
-		[AC_COMPILE_IFELSE(
-			[AC_LANG_PROGRAM(
-				[[
-#define macro(a, ...) func(a, __VA_ARGS__)
-int func(int a, int b, int c);
-				]],
-				[[
-int i = macro(1, 2, 3);
-				]]
-			)],
-			[VAR=yes],
-			[VAR=no]
-		)]
-	)dnl
-
-	AS_VAR_IF(
-		[VAR],
-		[yes],
-		[AC_DEFINE(
-			[HAVE_CPP_VARARG_MACRO_ISO],
-			[1], 
-			[Define to 1 if your compiler supports ISO C99 variadic macros]
-		)]
-	)dnl
-	AS_VAR_POPDEF([VAR])dnl
-])
diff --git a/main/openvpn/m4/pkg.m4 b/main/openvpn/m4/pkg.m4
deleted file mode 100644
index 9a71878c..00000000
--- a/main/openvpn/m4/pkg.m4
+++ /dev/null
@@ -1,159 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES