From daac380b7cb568cc9af037675ab9c13c08bd224b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 7 Sep 2021 16:05:58 +0200 Subject: Fix the initialization of the automake project. Delete generated configure.in from sources. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- configure.in | 322 -------------------------------------------------------- configure.in.in | 4 +- 2 files changed, 3 insertions(+), 323 deletions(-) delete mode 100644 configure.in diff --git a/configure.in b/configure.in deleted file mode 100644 index a89ee7a..0000000 --- a/configure.in +++ /dev/null @@ -1,322 +0,0 @@ -dnl ======================================================= -dnl FILE: ./admin/configure.in.min -dnl ======================================================= - -dnl This file is part of the KDE libraries/packages -dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org) - -dnl This file is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Library General Public -dnl License as published by the Free Software Foundation; either -dnl version 2 of the License, or (at your option) any later version. - -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Library General Public License for more details. - -dnl You should have received a copy of the GNU Library General Public License -dnl along with this library; see the file COPYING.LIB. If not, write to -dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -dnl Boston, MA 02110-1301, USA. - -# Original Author was Kalle@kde.org -# I lifted it in some mater. (Stephan Kulow) -# I used much code from Janos Farkas - -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(acinclude.m4) dnl a source file from your sub dir - -dnl This is so we can use kde-common -AC_CONFIG_AUX_DIR(admin) - -dnl This ksh/zsh feature conflicts with `cd blah ; pwd` -unset CDPATH - -dnl Checking host/target/build systems, for make, install etc. -AC_CANONICAL_SYSTEM -dnl Perform program name transformation -AC_ARG_PROGRAM - -dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(kftpgrabber-0.8.1, "3.5.6") dnl searches for some needed programs - -KDE_SET_PREFIX - -dnl generate the config header -AM_CONFIG_HEADER(config.h) dnl at the distribution this done - -dnl Checks for programs. -AC_CHECK_COMPILERS -AC_ENABLE_SHARED(yes) -AC_ENABLE_STATIC(no) -KDE_PROG_LIBTOOL - -dnl for NLS support. Call them in this order! -dnl WITH_NLS is for the po files -AM_KDE_WITH_NLS - -KDE_USE_TQT(3.2) -AC_PATH_KDE -dnl ======================================================= -dnl FILE: configure.in.in -dnl ======================================================= - -#MIN_CONFIG(3.2) -CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" - -if test "$build_arts" = "yes"; then - AC_DEFINE(USE_ARTS, 1, [If we use arts volume]) - LIB_ARTS="-lartskde" - AC_SUBST(LIB_ARTS) -fi - -KDE_INIT_DOXYGEN([KEG Network API Reference], [Version $VERSION]) - -dnl ======================================================= -dnl FILE: ./kftpgrabber/configure.in.in -dnl ======================================================= - -#MIN_CONFIG(3.2.0) - -dnl PACKAGE set before - -dnl Check for the 3.4 kde version (for tdednssd) -AC_DEFUN([CHECK_TDEDNSSD], -[ - AC_MSG_CHECKING(for TDEDNSSD support) - AC_CACHE_VAL(ac_cv_tdednssd, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - save_CXXFLAGS="$CXXFLAGS" - - CXXFLAGS="$CXXFLAGS $all_includes" - - AC_TRY_LINK([ - #include - ], - [ - #if ! KDE_IS_VERSION(3,4,0) - KDE_choke me - #endif - ], - ac_cv_tdednssd=yes, - ac_cv_tdednssd=no - ) - CXXFLAGS="$save_CXXFLAGS" - AC_LANG_RESTORE - ]) - - if test "$ac_cv_tdednssd" = "yes"; then - AC_MSG_RESULT(yes) - LIB_TDEDNSSD="-ltdednssd" - else - AC_MSG_RESULT(no) - LIB_TDEDNSSD="" - fi - - AC_SUBST(LIB_TDEDNSSD) -]) - - -dnl Check for the correct kde version -AC_DEFUN([CHECK_KDEVERSION], -[ - AC_MSG_CHECKING(for KDE >= 3.3) - AC_CACHE_VAL(ac_cv_kde33, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - save_CXXFLAGS="$CXXFLAGS" - - CXXFLAGS="$CXXFLAGS $all_includes" - - AC_TRY_LINK([ - #include - ], - [ - #if ! KDE_IS_VERSION(3,3,0) - KDE_choke me - #endif - ], - ac_cv_kde33=yes, - ac_cv_kde33=no - ) - CXXFLAGS="$save_CXXFLAGS" - AC_LANG_RESTORE - ]) - - if test "$ac_cv_kde33" = "yes"; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - - echo "" - echo " * You don't have KDE 3.3 or later installed on your system." - echo " * KFTPGrabber requires at least KDE 3.3 or later." - echo "" - exit 1 - fi -]) - -dnl Stuff required for libssh -AC_CHECK_LIB([resolv],[gethostbyname]) -AC_CHECK_LIB([nsl],[gethostbyname]) - -AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h \ -sys/time.h termios.h unistd.h openssl/aes.h openssl/blowfish.h zlib.h \ -sys/poll.h ]) - -AC_FUNC_MALLOC -AC_FUNC_MEMCMP -AC_FUNC_REALLOC -AC_FUNC_SELECT_ARGTYPES -AC_TYPE_SIGNAL -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([endpwent gethostbyaddr gethostbyname getpass memmove memset \ - select socket strchr strdup strerror strstr poll]) - -dnl Check for some stuff -KDE_CHECK_SSL -CHECK_KDEVERSION -CHECK_TDEDNSSD - -AC_C_BIGENDIAN -AC_CHECK_KDEMAXPATHLEN -KDE_CREATE_SUBDIRSLIST -AM_CONDITIONAL(kftpgrabber_SUBDIR_included, test "x$kftpgrabber_SUBDIR_included" = xyes) -AM_CONDITIONAL(translations_SUBDIR_included, test "x$translations_SUBDIR_included" = xyes) -AC_CONFIG_FILES([ Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/engine/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/customcommands/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/interfaces/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/libs/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/libs/ssh/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/plugins/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/plugins/bookmarkimport/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/ui/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/widgets/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/widgets/bookmarks/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/widgets/browser/Makefile ]) -AC_CONFIG_FILES([ kftpgrabber/src/widgets/queueview/Makefile ]) -AC_CONFIG_FILES([ translations/Makefile ]) -AC_CONFIG_FILES([ translations/ar/Makefile ]) -AC_CONFIG_FILES([ translations/ar/messages/Makefile ]) -AC_CONFIG_FILES([ translations/bg/Makefile ]) -AC_CONFIG_FILES([ translations/bg/messages/Makefile ]) -AC_CONFIG_FILES([ translations/br/Makefile ]) -AC_CONFIG_FILES([ translations/br/messages/Makefile ]) -AC_CONFIG_FILES([ translations/cs/Makefile ]) -AC_CONFIG_FILES([ translations/cs/messages/Makefile ]) -AC_CONFIG_FILES([ translations/cy/Makefile ]) -AC_CONFIG_FILES([ translations/cy/messages/Makefile ]) -AC_CONFIG_FILES([ translations/da/Makefile ]) -AC_CONFIG_FILES([ translations/da/messages/Makefile ]) -AC_CONFIG_FILES([ translations/de/Makefile ]) -AC_CONFIG_FILES([ translations/de/messages/Makefile ]) -AC_CONFIG_FILES([ translations/el/Makefile ]) -AC_CONFIG_FILES([ translations/el/messages/Makefile ]) -AC_CONFIG_FILES([ translations/en_GB/Makefile ]) -AC_CONFIG_FILES([ translations/en_GB/messages/Makefile ]) -AC_CONFIG_FILES([ translations/es/Makefile ]) -AC_CONFIG_FILES([ translations/es/messages/Makefile ]) -AC_CONFIG_FILES([ translations/et/Makefile ]) -AC_CONFIG_FILES([ translations/et/messages/Makefile ]) -AC_CONFIG_FILES([ translations/fr/Makefile ]) -AC_CONFIG_FILES([ translations/fr/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ga/Makefile ]) -AC_CONFIG_FILES([ translations/ga/messages/Makefile ]) -AC_CONFIG_FILES([ translations/gl/Makefile ]) -AC_CONFIG_FILES([ translations/gl/messages/Makefile ]) -AC_CONFIG_FILES([ translations/hu/Makefile ]) -AC_CONFIG_FILES([ translations/hu/messages/Makefile ]) -AC_CONFIG_FILES([ translations/it/Makefile ]) -AC_CONFIG_FILES([ translations/it/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ja/Makefile ]) -AC_CONFIG_FILES([ translations/ja/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ka/Makefile ]) -AC_CONFIG_FILES([ translations/ka/messages/Makefile ]) -AC_CONFIG_FILES([ translations/lt/Makefile ]) -AC_CONFIG_FILES([ translations/lt/messages/Makefile ]) -AC_CONFIG_FILES([ translations/nl/Makefile ]) -AC_CONFIG_FILES([ translations/nl/messages/Makefile ]) -AC_CONFIG_FILES([ translations/pl/Makefile ]) -AC_CONFIG_FILES([ translations/pl/messages/Makefile ]) -AC_CONFIG_FILES([ translations/pt/Makefile ]) -AC_CONFIG_FILES([ translations/pt/messages/Makefile ]) -AC_CONFIG_FILES([ translations/rw/Makefile ]) -AC_CONFIG_FILES([ translations/rw/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sk/Makefile ]) -AC_CONFIG_FILES([ translations/sk/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sr/Makefile ]) -AC_CONFIG_FILES([ translations/sr/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sr@Latn/Makefile ]) -AC_CONFIG_FILES([ translations/sr@Latn/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sv/Makefile ]) -AC_CONFIG_FILES([ translations/sv/messages/Makefile ]) -AC_CONFIG_FILES([ translations/tr/Makefile ]) -AC_CONFIG_FILES([ translations/tr/messages/Makefile ]) -AC_CONFIG_FILES([ translations/zh_CN/Makefile ]) -AC_CONFIG_FILES([ translations/zh_CN/messages/Makefile ]) -AC_OUTPUT -dnl Put here things to be done at the very end - telling users -dnl about additional packages to install. Better yet is giving -dnl each project / subdr its own configure.in.bot. - -# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure -if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then - # And if so, warn when they don't match - if test "$kde_libs_prefix" != "$given_prefix"; then - # And if kde doesn't know about the prefix yet - echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null - if test $? -ne 0; then - echo "" - echo "Warning: you chose to install this package in $given_prefix," - echo "but TDE was found in $kde_libs_prefix." - echo "For this to work, you will need to tell TDE about the new prefix, by ensuring" - echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" - echo "Then restart TDE." - echo "" - fi - fi -fi - -if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then - echo "" - echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility" - echo "was not included. Therefore, GCC symbol visibility support remains disabled." - echo "" - echo "For better performance, consider including the Qt visibility supporting patch" - echo "located at:" - echo "" - echo "http://bugs.kde.org/show_bug.cgi?id=109386" - echo "" - echo "and recompile all of TQt and TDE. Note, this is entirely optional and" - echo "everything will continue to work just fine without it." - echo "" -fi - -if test "$all_tests" = "bad"; then - if test ! "$cache_file" = "/dev/null"; then - echo "" - echo "Please remove the file $cache_file after changing your setup" - echo "so that configure will find the changes next time." - echo "" - fi -else - echo "" - echo "Good - your configure finished. Start make now" - echo "" -fi diff --git a/configure.in.in b/configure.in.in index a781b76..08f6492 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,4 +1,7 @@ #MIN_CONFIG(3.2) + +AM_INIT_AUTOMAKE(kftpgrabber, "0.8.1") + CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" if test "$build_arts" = "yes"; then @@ -8,4 +11,3 @@ if test "$build_arts" = "yes"; then fi KDE_INIT_DOXYGEN([KEG Network API Reference], [Version $VERSION]) - -- cgit v1.2.1