Clean 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) -- Roy Marples

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1861 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/configure.ac b/configure.ac
index c443f68f08af3d46b59749055c63a830798470b3..4d1e2ece06a64bcbcdf4e5e2680cb22f3efd073f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -284,12 +284,44 @@ AC_CHECK_HEADERS(sys/time.h sys/socket.h sys/ioctl.h sys/stat.h dnl
                 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 --git a/easy-rsa/2.0/Makefile b/easy-rsa/2.0/Makefile
index 902d78fc0075080ef1c60477fe19f9e9b0ce423b..125ac519815b6f7acd101bbf15208da233ec6a1f 100644 (file)
--- a/easy-rsa/2.0/Makefile
+++ b/easy-rsa/2.0/Makefile
@@ -7,7 +7,7 @@ all:
        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}"