[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/9] configure.ac: do not mix library and device support checks
From: |
Ladislav Michl |
Subject: |
[PATCH 3/9] configure.ac: do not mix library and device support checks |
Date: |
Sat, 25 Jan 2020 10:45:21 +0100 |
---
configure.ac | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
index c4ca15af..512a620d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,6 +356,26 @@ AC_ARG_WITH(readline,
AC_SUBST(TERMLIBS)
AC_SUBST(TERMLDFLAGS)
+dnl ======================== Checks for gethostbyname support
+AC_CHECK_FUNC(gethostbyname, ,
+ AC_CHECK_LIB(nsl, gethostbyname, TCP_LIBS="-lnsl"
+ AC_SUBST(TCP_LIBS)))
+dnl Haiku requires -lnetwork for socket functions
+AC_CHECK_FUNC(gethostbyname, ,
+ AC_CHECK_LIB(network, gethostbyname, TCP_LIBS="-lnetwork"
+ AC_SUBST(TCP_LIBS)))
+
+dnl ======================== Defines location for gettext
+AC_ARG_WITH(gettext,
+ [ --with-gettext=DIR specifies the base gettext],
+ [ if test x$withval = xyes; then
+ AC_MSG_WARN(Usage is: --with-gettext=DIR)
+ else
+ CFLAGS="$CFLAGS -I$withval"
+ fi
+ ]
+)
+
dnl ======================== Check for libical
AC_ARG_WITH(libical,
[ --with-libical=DIR specifies the base libical],
@@ -454,15 +474,6 @@ if test "$enable_phonet" = "yes"; then
#include <linux/phonet.h>])
fi
-dnl ======================== Checks for gethostbyname support
-AC_CHECK_FUNC(gethostbyname, ,
- AC_CHECK_LIB(nsl, gethostbyname, TCP_LIBS="-lnsl"
- AC_SUBST(TCP_LIBS)))
-dnl Haiku requires -lnetwork for socket functions
-AC_CHECK_FUNC(gethostbyname, ,
- AC_CHECK_LIB(network, gethostbyname, TCP_LIBS="-lnetwork"
- AC_SUBST(TCP_LIBS)))
-
dnl ======================== Checks for Linux IrDA support
USE_IRDA="no"
AC_ARG_ENABLE(irda,
@@ -479,17 +490,6 @@ if test "$enable_irda" = "yes"; then
#include <linux/types.h>])
fi
-dnl ======================== Defines location for gettext
-AC_ARG_WITH(gettext,
- [ --with-gettext=DIR specifies the base gettext],
- [ if test x$withval = xyes; then
- AC_MSG_WARN(Usage is: --with-gettext=DIR)
- else
- CFLAGS="$CFLAGS -I$withval"
- fi
- ]
-)
-
dnl ======================== Checks for Bluetooth support
USE_BLUETOOTH="no"
AC_ARG_WITH(bluetooth,
--
2.25.0
- [PATCH 0/9] Refactor devices build, Ladislav Michl, 2020/01/25
- [PATCH 1/9] Move device_script into separate file, Ladislav Michl, 2020/01/25
- [PATCH 2/9] Cleanup device includes, Ladislav Michl, 2020/01/25
- [PATCH 3/9] configure.ac: do not mix library and device support checks,
Ladislav Michl <=
- [PATCH 4/9] Remove nowhere used device_reset(), Ladislav Michl, 2020/01/25
- [PATCH 5/9] Remove misleading comments from tcp device, Ladislav Michl, 2020/01/25
- [PATCH 6/9] dku2libusb: move definitions into C file, Ladislav Michl, 2020/01/25
- [PATCH 7/9] dku2libusb: whitespace cleanup, Ladislav Michl, 2020/01/25
- [PATCH 8/9] libfunctions: reimplement gn_lib_is_connectiontype_supported, Ladislav Michl, 2020/01/25
- [PATCH 9/9] Refactor devices build, Ladislav Michl, 2020/01/25
- Re: [PATCH 0/9] Refactor devices build, Pawel Kot, 2020/01/26