vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

opm: don't assume we have netinet/tcp.h

Browse source 
Instead, check for it in librb
This commit is contained in:
Elizabeth Myers 2016-03-31 01:08:38 -05:00
parent 4e85459a7c
commit 468ef960f8
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
authd/providers/opm.c
View file

@ -18,8 +18,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <netinet/tcp.h> #include "rb_lib.h"
#include "stdinc.h" #include "stdinc.h"
#include "setup.h" #include "setup.h"
#include "authd.h" #include "authd.h"

9
librb/configure.ac
View file

@ -104,7 +104,7 @@ AC_TYPE_UID_T
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS([crypt.h unistd.h sys/socket.h sys/stat.h sys/time.h time.h netinet/in.h arpa/inet.h errno.h sys/uio.h spawn.h sys/poll.h sys/epoll.h sys/select.h sys/devpoll.h sys/event.h port.h signal.h sys/signalfd.h sys/timerfd.h linux/tcp.h]) AC_CHECK_HEADERS([crypt.h unistd.h sys/socket.h sys/stat.h sys/time.h time.h netinet/in.h netinet/tcp.h arpa/inet.h errno.h sys/uio.h spawn.h sys/poll.h sys/epoll.h sys/select.h sys/devpoll.h sys/event.h port.h signal.h sys/signalfd.h sys/timerfd.h linux/tcp.h])
AC_HEADER_TIME AC_HEADER_TIME
dnl Networking Functions dnl Networking Functions
@ -546,6 +546,10 @@ if test "x$rb_netinet_in_h" = "xyes"; then
echo '#include <netinet/in.h>' >> $outfile echo '#include <netinet/in.h>' >> $outfile
fi fi
if test "x$rb_netinet_tcp_h" == "xyes"; then
echo '#include <netinet/tcp.h>' >> $outfile
fi
if test "x$rb_arpa_inet_h" = "xyes"; then if test "x$rb_arpa_inet_h" = "xyes"; then
echo '#include <arpa/inet.h>' >> $outfile echo '#include <arpa/inet.h>' >> $outfile
fi fi
@ -632,6 +636,9 @@ fi
if test x$ac_cv_header_netinet_in_h = xyes; then if test x$ac_cv_header_netinet_in_h = xyes; then
rb_netinet_in_h=yes rb_netinet_in_h=yes
fi fi
if test x$ac_cv_header_netinet_tcp_h = xyes; then
rb_netinet_tcp_h=yes
fi
if test x$ac_cv_header_crypt_h = xyes; then if test x$ac_cv_header_crypt_h = xyes; then
rb_crypt_h=yes rb_crypt_h=yes