From: Laurent Montel <montel@kde.org>
Date: Sun, 26 Nov 2006 10:50:13 +0000 (+0000)
Subject: Clean up
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a15c14e7825bb05104b71882ce8da975a6033b47

Clean up

svn path=/trunk/playground/utils/dolphin/; revision=607924
---

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 7870a16a2..e4219124d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -5,13 +5,10 @@ include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckPrototypeExists)
 include(CheckTypeSize)
-include(MacroBoolTo01)
 # The FindKDE4.cmake module sets _KDE4_PLATFORM_DEFINITIONS with
 # definitions like _GNU_SOURCE that are needed on each platform.
 set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
 
-macro_bool_to_01(KDE4_XMMS HAVE_XMMS)
-
 #now check for dlfcn.h using the cmake supplied CHECK_include_FILE() macro
 # If definitions like -D_GNU_SOURCE are needed for these checks they
 # should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally
@@ -38,10 +35,3 @@ check_include_files(sys/vfs.h     HAVE_SYS_VFS_H)
 
 check_function_exists(isinf      HAVE_FUNC_ISINF)
 
-check_type_size("int" SIZEOF_INT)
-check_type_size("char *"  SIZEOF_CHAR_P)
-check_type_size("long" SIZEOF_LONG)
-check_type_size("short" SIZEOF_SHORT)
-check_type_size("size_t" SIZEOF_SIZE_T)
-check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG)
-
diff --git a/config.h.cmake b/config.h.cmake
index b50c3fa7a..3b5721c10 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,11 +1,8 @@
 /* config.h.  Generated by cmake from config.h.cmake */
 
 
-/* If we have Apple PowerBook support */
-/* #undef HAVE_POWERBOOK */
-
 /* Name of package */
-#define PACKAGE "kdeutils"
+#define PACKAGE "dolphin"
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT ""
@@ -21,133 +18,3 @@
 
 /* Define to the version of this package. */
 #define PACKAGE_VERSION ""
-
-/* The size of a `char *', as computed by sizeof. */
-#define SIZEOF_CHAR_P ${SIZEOF_CHAR_P}
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT ${SIZEOF_INT}
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG ${SIZEOF_LONG}
-
-/* The size of a `short', as computed by sizeof. */
-#define SIZEOF_SHORT ${SIZEOF_SHORT}
-
-/* The size of a `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T ${SIZEOF_SIZE_T}
-
-/* The size of a `unsigned long', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_LONG ${SIZEOF_UNSIGNED_LONG}
-
-/* Version number of package */
-#define VERSION "3.9.02"
-
-/* Defined if compiling without arts */
-#define WITHOUT_ARTS 1
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-
-
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-
-
-
-#if !defined(HAVE_RES_INIT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-int res_init(void);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_SETENV_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-int setenv (const char *, const char *, int);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STATFS_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  int statfs(const char *path, struct statfs *buffer)
-;
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-
-
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-
-
-/* type to use in place of socklen_t if not defined */
-#define kde_socklen_t socklen_t
-
-/* type to use in place of socklen_t if not defined (deprecated, use
-   kde_socklen_t) */
-#define ksize_t socklen_t