diff options
| -rw-r--r-- | config.tests/unix/nis/nis.cpp | 44 | ||||
| -rw-r--r-- | config.tests/unix/nis/nis.pro | 4 | ||||
| -rwxr-xr-x | configure | 31 |
3 files changed, 0 insertions, 79 deletions
diff --git a/config.tests/unix/nis/nis.cpp b/config.tests/unix/nis/nis.cpp deleted file mode 100644 index f2d7f223e3..0000000000 --- a/config.tests/unix/nis/nis.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <sys/types.h> -#include <rpc/rpc.h> -#include <rpcsvc/ypclnt.h> -#include <rpcsvc/yp_prot.h> - -int main(int, char **) -{ - char *d; - yp_get_default_domain(&d); - return 0; -} diff --git a/config.tests/unix/nis/nis.pro b/config.tests/unix/nis/nis.pro deleted file mode 100644 index b7f5693b60..0000000000 --- a/config.tests/unix/nis/nis.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = nis.cpp -CONFIG -= qt dylib -solaris-*:LIBS += -lnsl -else:LIBS += $$QMAKE_LIBS_NIS @@ -708,7 +708,6 @@ CFG_LIBINPUT=auto CFG_OBSOLETE_WAYLAND=no CFG_EVDEV=auto CFG_TSLIB=auto -CFG_NIS=auto CFG_CUPS=auto CFG_ICONV=auto CFG_DBUS=auto @@ -2033,13 +2032,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - nis) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_NIS="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; largefile) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_LARGEFILE="$VAL" @@ -2639,9 +2631,6 @@ Additional options: -silent ............ Reduce the build output so that warnings and errors can be seen more easily. - -no-nis ............ Do not compile NIS support. - * -nis ............... Compile NIS support. - -no-cups ........... Do not compile CUPS support. * -cups .............. Compile CUPS support. Requires cups/cups.h and libcups.so.2. @@ -5014,23 +5003,6 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do esac done -# auto-detect NIS support -if [ "$CFG_NIS" != "no" ]; then - if compileTest unix/nis "NIS"; then - CFG_NIS=yes - else - if [ "$CFG_NIS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "NIS support cannot be enabled due to functionality tests!" - echo " Turn on verbose messaging (-v) to $0 to see the final report." - echo " If you believe this message is in error you may use the continue" - echo " switch (-continue) to $0 to continue." - exit 101 - else - CFG_NIS=no - fi - fi -fi - # auto-detect CUPS support if [ "$CFG_CUPS" != "no" ]; then if compileTest unix/cups "Cups"; then @@ -6444,7 +6416,6 @@ elif [ "$CFG_ZLIB" = "system" ]; then fi [ "$CFG_MTDEV" = "yes" ] && QT_CONFIG="$QT_CONFIG mtdev" -[ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis" [ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups" [ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv" [ "$CFG_ICONV" = "sun" ] && QT_CONFIG="$QT_CONFIG sun-libiconv" @@ -6869,7 +6840,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_INOTIFY" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY" [ "$CFG_EVENTFD" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EVENTFD" [ "$CFG_CLOEXEC" = "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_THREADSAFE_CLOEXEC=1" -[ "$CFG_NIS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS" [ "$CFG_OPENSSL" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL" [ "$CFG_OPENSSL" = "linked" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LINKED_OPENSSL" [ "$CFG_OPENSSL" = "no" ] && [ "$CFG_SECURETRANSPORT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SSL" @@ -7341,7 +7311,6 @@ report_support " libproxy.............." "$CFG_LIBPROXY" report_support " OpenSSL .............." "$CFG_OPENSSL" yes "loading libraries at run-time" linked "linked to the libraries" [ "$XPLATFORM_MAC" = "yes" ] && \ report_support " SecureTransport ......" "$CFG_SECURETRANSPORT" -report_support " NIS ...................." "$CFG_NIS" report_support " OpenGL / OpenVG:" report_support " EGL .................." "$CFG_EGL" report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+" |