Branch: master

70033bc3 2019-05-10 07:47:07 Michele Calgaro
Removed unnecessary files and drop dependency on admin module.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M .gitmodules
R Makefile.am.in
R admin
R configure.in.bot
R configure.in.in
R configure.in.mid
R qtinterface/Makefile.am
R qtinterface/configure.in.in
R qtinterface/filelist.txt
R qtinterface/kdemacros.h.in

.gitmodules

diff --git a/.gitmodules b/.gitmodules
index 4fce771..5b98c56 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "admin"]
-	path = admin
-	url = http://system@.../scm/git/tde-common-admin
 [submodule "cmake"]
 	path = cmake
 	url = http://system@.../scm/git/tde-common-cmake

Makefile.am.in

diff --git a/Makefile.am.in b/Makefile.am.in
deleted file mode 100644
index 69b14fb..0000000
--- a/Makefile.am.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#    This file is part of the KDE libraries
-#    Copyright (C) 1996-1997 Matthias Kalle Dalheimer (kalle@...)
-#              (C) 1997,1998 Stephan Kulow (coolo@...)
-
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Library General Public
-#    License as published by the Free Software Foundation; either
-#    version 2 of the License, or (at your option) any later version.
-
-#    This library is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#    Library General Public License for more details.
-
-#    You should have received a copy of the GNU Library General Public License
-#    along with this library; see the file COPYING.LIB.  If not, write to
-#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
-
-
-COMPILE_FIRST = libltdl qtinterface
-# COMPILE_BEFORE_doc = qtinterface
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
-
-AUTOMAKE_OPTIONS = foreign 1.6.1
-
-EXTRA_DIST = admin \
-	COMPILING DEBUG \
-	NAMING tqtinterface.lsm \
-	configure.in.in configure.in.mid configure.in.bot
-
-MAINTAINERCLEANFILES = configure.files subdirs
-
-dist-hook:
-	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
-

admin

diff --git a/admin b/admin
deleted file mode 160000
index 68f2355..0000000
--- a/admin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 68f23556e638353e46b444d3a4863a64936bd36a

configure.in.bot

diff --git a/configure.in.bot b/configure.in.bot
deleted file mode 100644
index 797c194..0000000
--- a/configure.in.bot
+++ /dev/null
@@ -1,2 +0,0 @@
-dnl put here things which have to be done as very last part of configure
-

configure.in.in

diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index 9754a3e..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,363 +0,0 @@
-# Original Author was Kalle@...
-# 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 Setting the prefix for tdelibs uses a special version of KDE_SET_PREFIX
-dnl (since that one normally looks for existing kde installations)
-KDE_SET_PREFIX_CORE
-
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-AM_MAINTAINER_MODE
-
-AC_PROG_INSTALL
-
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_LIBLTDL_CONVENIENCE
-
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-KDE_PROG_LIBTOOL
-
-AC_LANG_SAVE
-AC_LANG_C
-KDE_LIB_LTDL
-AC_LANG_RESTORE
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files, GNU_GETTEXT for the sources
-AM_KDE_WITH_NLS
-AM_KDE_GNU_GETTEXT
-
-dnl Checks for header files.
-KDE_CHECK_STL
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h)
-
-AC_ARG_WITH(acl,
-  [AC_HELP_STRING(--with-acl,
-    [enable support for POSIX ACLs @<:@default=check@:>@])],
-  [], with_acl=check)
-
-ACL_LIBS=""
-if test "x$with_acl" != xno; then
-  USE_POSIX_ACL=yes
-  HAVE_NON_POSIX_ACL_EXTENSIONS=no
-  KDE_CHECK_HEADER(sys/acl.h, ,[USE_POSIX_ACL="no"])
-  HAVE_SYS_XATTR_H=no
-  KDE_CHECK_HEADER(sys/xattr.h,[HAVE_SYS_XATTR_H="yes"],)
-  if test "$HAVE_SYS_XATTR_H" = "yes" ; then
-    AC_DEFINE([HAVE_SYS_XATTR_H], 1, [Define if system has the sys/xattr.h header.])
-  fi
-
-  case $host in
-      *-*-freebsd*)
-              KDE_CHECK_LIB(c,acl_init,[ACL_LIBS="-lc"],[USE_POSIX_ACL="no"])
-              ;;
-      *)
-              KDE_CHECK_HEADER(attr/libattr.h, ,[USE_POSIX_ACL="no"])
-              KDE_CHECK_LIB(acl,acl_init,[ACL_LIBS="-lacl -lattr"],[USE_POSIX_ACL="no"])
-              KDE_CHECK_HEADER(acl/libacl.h,[HAVE_NON_POSIX_ACL_EXTENSIONS="yes"],)
-              if test "$HAVE_SYS_XATTR_H" = "no" ; then
-                USE_POSIX_ACL="no"
-              fi
-              ;;
-  esac
-
-  if test "$USE_POSIX_ACL" = "yes" ; then
-    AC_DEFINE([USE_POSIX_ACL], 1, [Define if system has POSIX ACL support.])
-    if test "$HAVE_NON_POSIX_ACL_EXTENSIONS" = "yes" ; then
-      AC_DEFINE([HAVE_NON_POSIX_ACL_EXTENSIONS], 1, [Define if system has non-POSIX extensions to the ACL support.])
-    fi
-  fi
-
-  if test "x$with_acl" != xcheck && test "$USE_POSIX_ACL" != "yes"; then
-    AC_MSG_ERROR([--with-acl was given, but test for POSIX ACLs failed])
-  fi
-fi
-AC_SUBST(ACL_LIBS)
-
-DCOPIDL2CPP="compiled"
-DCOPIDL="compiled"
-DCOPIDLNG="compiled"
-MEINPROC="compiled"
-KDECONFIG="compiled"
-KCONFIG_COMPILER="compiled"
-MAKETDEWIDGETS="compiled"
-
-dnl Checks for libraries etc
-
-ac_cpp_safe=$ac_cpp
-ac_CPPFLAGS_safe=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $X_INCLUDES"
-ac_cpp='$CXXCPP $CPPFLAGS'
-KDE_CHECK_HEADERS(X11/extensions/shape.h,,,
-[
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-])
-KDE_CHECK_HEADERS(X11/extensions/XShm.h, 
-  [have_mitshm=yes], [have_mitshm=no], [#include <X11/Xlib.h>])
-KDE_CHECK_HEADERS(X11/ICE/ICElib.h)
-KDE_CHECK_HEADER(sys/sendfile.h, [have_sendfile=yes], )
-ac_cpp=$ac_cpp_safe
-CPPFLAGS=$ac_CPPFLAGS_safe
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_TIME
-
-AC_LANG_SAVE
-AC_LANG_C
-dnl AC_C_BIGENDIAN has a bug (one of its tests uses "main()" instead of
-dnl "int main()") so C++ compilers would break. Thats why we switch languages
-AC_C_BIGENDIAN
-AC_LANG_RESTORE
-
-dnl check if the compiler has bool
-AC_CHECK_BOOL
-
-dnl Checks for library functions.
-AC_CHECK_SETENV
-AC_CHECK_UNSETENV
-AC_CHECK_RANDOM
-AC_CHECK_MKSTEMPS
-AC_CHECK_MKSTEMP
-AC_CHECK_MKDTEMP
-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr)
-
-AH_BOTTOM([
-/* provide a definition for a 32 bit entity, usable as a typedef, possibly
-   extended by "unsigned" */
-#undef INT32_BASETYPE
-#ifdef SIZEOF_INT
-#if SIZEOF_INT == 4
-#define INT32_BASETYPE int
-#endif
-#endif
-#if !defined(INT32_BASETYPE) && defined(SIZEOF_LONG)
-#if SIZEOF_LONG == 4
-#define INT32_BASETYPE long
-#endif
-#endif
-#ifndef INT32_BASETYPE
-#define INT32_BASETYPE int
-#endif
-
-#ifndef HAVE_SETEUID
-#define HAVE_SETEUID
-#define HAVE_SETEUID_FAKE
-#ifdef __cplusplus
-extern "C"
-#endif
-int seteuid(INT32_BASETYPE euid); /* defined in fakes.c */
-#endif
-])
-
-AC_CHECK_USLEEP
-AC_CHECK_GETHOSTNAME
-AC_CHECK_RANDOM
-AC_CHECK_S_ISSOCK
** Diff limit reached (max: 250 lines) **