On Wed, 28 Feb 2007 03:24:45 -0700
James Yonan <j...@yonan.net> wrote:

> OpenVPN 2.1_rc2 has been released which includes a number of 
> miscellaneous fixes, including better Vista support on 32-bit x86.

Attached is a patch that cleans up configure on FreeBSD for recent
autotool versions that require that all .h files have to be compiled.

Also, FreeBSD install does not support GNU long options which the
Makefile in easy-rsa/2.0 uses (not checked the others as we don't
install those on Gentoo)

Thanks

Roy Marples
diff -ur openvpn-2.1_rc2.orig/configure.ac openvpn-2.1_rc2/configure.ac
--- openvpn-2.1_rc2.orig/configure.ac	2007-02-28 07:34:32 +0000
+++ openvpn-2.1_rc2/configure.ac	2007-03-05 11:17:24 +0000
@@ -284,12 +284,44 @@
 		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h dnl
 		 stdarg.h unistd.h signal.h stdio.h string.h dnl
 		 strings.h ctype.h errno.h syslog.h pwd.h grp.h dnl
-		 net/if_tun.h net/if.h stropts.h sys/sockio.h dnl
-		 netinet/in.h netinet/in_systm.h netinet/ip.h dnl
-		 netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h dnl
+		 net/if_tun.h stropts.h sys/sockio.h dnl
+		 netinet/in.h netinet/in_systm.h dnl
+		 netinet/tcp.h arpa/inet.h dnl
 		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h dnl
 		 linux/types.h sys/poll.h sys/epoll.h err.h dnl
 )
+AC_CHECK_HEADERS(net/if.h,,,
+		 [#ifdef HAVE_SYS_SOCKET_H 
+		  # include <sys/socket.h>
+		  #endif
+		 ])
+AC_CHECK_HEADERS(netinet/ip.h,,,
+		 [#ifdef HAVE_SYS_TYPES_H
+		  # include <sys/types.h>
+		  #endif
+		  #ifdef HAVE_NETINET_IN_H
+		  # include <netinet/in.h>
+		  #endif
+		  #ifdef HAVE_NETINET_IN_SYSTM_H
+		  # include <netinet/in_systm.h>
+		  #endif
+		 ])
+AC_CHECK_HEADERS(netinet/if_ether.h,,,
+		 [#ifdef HAVE_SYS_TYPES_H
+		  # include <sys/types.h>
+		  #endif
+		  #ifdef HAVE_SYS_SOCKET_H
+		  # include <sys/socket.h>
+		  #endif
+		  #ifdef HAVE_NETINET_IN_H
+		  # include <netinet/in.h>
+		  #endif
+		 ])
+AC_CHECK_HEADERS(resolv.h,,,
+		 [#ifdef HAVE_NETINET_IN_H 
+		  # include <netinet/in.h>
+		  #endif
+		 ])
 AC_CHECK_HEADERS(linux/errqueue.h,,,
 	[#ifdef HAVE_LINUX_TYPES_H
 	 # include <linux/types.h>
diff -ur openvpn-2.1_rc2.orig/easy-rsa/2.0/Makefile openvpn-2.1_rc2/easy-rsa/2.0/Makefile
--- openvpn-2.1_rc2.orig/easy-rsa/2.0/Makefile	2006-10-15 23:30:18 +0100
+++ openvpn-2.1_rc2/easy-rsa/2.0/Makefile	2007-03-05 11:17:29 +0000
@@ -7,7 +7,7 @@
 	echo "Run make install DESTDIR=/usr/share/somewhere"

 install:
-	install -c --directory "${DESTDIR}/${PREFIX}"
-	install -c --mode=0755 build-* "${DESTDIR}/${PREFIX}"
-	install -c --mode=0755 clean-all list-crl inherit-inter pkitool revoke-full sign-req whichopensslcnf "${DESTDIR}/${PREFIX}"
-	install -c --mode=0644 openssl-0.9.6.cnf openssl.cnf README vars "${DESTDIR}/${PREFIX}"
+	install -d "${DESTDIR}/${PREFIX}"
+	install -m 0755 build-* "${DESTDIR}/${PREFIX}"
+	install -m 0755 clean-all list-crl inherit-inter pkitool revoke-full sign-req whichopensslcnf "${DESTDIR}/${PREFIX}"
+	install -m 0644 openssl-0.9.6.cnf openssl.cnf README vars "${DESTDIR}/${PREFIX}"

Reply via email to