From a16843922c37313f009c2341b86c791d968fe82c Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 18 Aug 2011 19:54:55 +0000 Subject: Fix kvirc FTBFS git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1247958 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/config.h.in | 38 ++++++++++++++++++++++------ src/kvi_configstatus.h | 56 ++++++++++++++++++++++++++++------------- src/modules/options/instances.h | 2 +- 3 files changed, 70 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/config.h.in b/src/config.h.in index a03a7c5b..3084f017 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -88,7 +88,7 @@ /* define if you have libgsm and want the GSM code to be compiled */ #undef COMPILE_USE_GSM -/* define if you want to compile the TQt 4.x support */ +/* define if you want to compile the Qt 4.x support */ #undef COMPILE_USE_QT4 /* define if you trust your memmove() function */ @@ -172,6 +172,10 @@ /* Define to 1 if you have the `unsetenv' function. */ #undef HAVE_UNSETENV +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -187,6 +191,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -220,6 +227,28 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION @@ -229,13 +258,6 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif - /* Define to 1 if on MINIX. */ #undef _MINIX diff --git a/src/kvi_configstatus.h b/src/kvi_configstatus.h index 7a23d15f..9e1eec82 100644 --- a/src/kvi_configstatus.h +++ b/src/kvi_configstatus.h @@ -2,16 +2,16 @@ /* src/config.h.in. Generated from configure.in by autoheader. */ /* define this to the number of average channel users */ -#define AVERAGE_CHANNEL_USERS 101 +#define AVERAGE_CHANNEL_USERS 349 /* define this if you are on a big endian machine */ /* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */ /* this is the build date (configure date rather) */ -#define BUILD_DATE "Thu Mar 13 02:29:23 UTC 2008" +#define BUILD_DATE "Thu Aug 18 18:45:24 UTC 2011" /* these are the build flags */ -#define BUILD_FLAGS "x86_64-cfgikopsAGTZ" +#define BUILD_FLAGS "i686-bcefiopsxAGTZ" /* define if you want to enable the Arts daemon support */ /* #undef COMPILE_ARTS_SUPPORT */ @@ -26,7 +26,7 @@ /* #undef COMPILE_DISABLE_DCC_VOICE */ /* define if you want to enable the Esound daemon support */ -/* #undef COMPILE_ESD_SUPPORT */ +#define COMPILE_ESD_SUPPORT 1 /* define if you have the SIOCGIFADDR ioctl and the related headers */ #define COMPILE_GET_INTERFACE_ADDRESS 1 @@ -41,7 +41,7 @@ #define COMPILE_IPV6_SUPPORT 1 /* define if you want to compile the KDE 3.x support */ -#define COMPILE_KDE_SUPPORT 1 +/* #undef COMPILE_KDE_SUPPORT */ /* define if you want the memory checks */ /* #undef COMPILE_MEMORY_CHECKS */ @@ -89,7 +89,7 @@ /* define if you have libgsm and want the GSM code to be compiled */ #define COMPILE_USE_GSM 1 -/* define if you want to compile the TQt 4.x support */ +/* define if you want to compile the Qt 4.x support */ /* #undef COMPILE_USE_QT4 */ /* define if you trust your memmove() function */ @@ -102,7 +102,7 @@ #define COMPILE_ZLIB_SUPPORT 1 /* define if you want the i386 asm code */ -/* #undef COMPILE_ix86_ASM */ +#define COMPILE_ix86_ASM 1 /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -173,6 +173,10 @@ /* Define to 1 if you have the `unsetenv' function. */ #define HAVE_UNSETENV 1 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + /* Name of package */ #define PACKAGE "kvirc" @@ -188,6 +192,9 @@ /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ #define PACKAGE_VERSION "" @@ -195,7 +202,7 @@ #define SIZEOF_INT 4 /* The size of `long int', as computed by sizeof. */ -#define SIZEOF_LONG_INT 8 +#define SIZEOF_LONG_INT 4 /* The size of `long long int', as computed by sizeof. */ #define SIZEOF_LONG_LONG_INT 8 @@ -207,7 +214,7 @@ #define SIZEOF_UNSIGNED_INT 4 /* The size of `unsigned long int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_INT 8 +#define SIZEOF_UNSIGNED_LONG_INT 4 /* The size of `unsigned long long int', as computed by sizeof. */ #define SIZEOF_UNSIGNED_LONG_LONG_INT 8 @@ -216,11 +223,33 @@ #define SIZEOF_UNSIGNED_SHORT_INT 2 /* The size of `void *', as computed by sizeof. */ -#define SIZEOF_VOID_P 8 +#define SIZEOF_VOID_P 4 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + /* Version number of package */ #define VERSION "3.4.0" @@ -230,13 +259,6 @@ /* Define to 1 if the X Window System is missing or not being used. */ /* #undef X_DISPLAY_MISSING */ -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* # undef _ALL_SOURCE */ -#endif - /* Define to 1 if on MINIX. */ /* #undef _MINIX */ diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h index c5564d9e..69fb3527 100644 --- a/src/modules/options/instances.h +++ b/src/modules/options/instances.h @@ -61,7 +61,7 @@ typedef struct _KviOptionsWidgetInstanceEntry class KviOptionsInstanceManager : public TQObject { Q_OBJECT - TQ_OBJECT + TQ_OBJECT public: KviOptionsInstanceManager(); virtual ~KviOptionsInstanceManager(); -- cgit v1.2.1