[prev in list] [next in list] [prev in thread] [next in thread]
List: pidgin-commits
Subject: /pidgin/main: 2bb56551e37e: Merged in qulogic/pidgin (pull reque...
From: Gary Kramlich <grim () reaperworld ! com>
Date: 2016-09-21 17:34:22
Message-ID: hg.2bb56551e37e.1474479262.-874508059 () rock ! pidgin ! im
[Download RAW message or body]
Changeset: 2bb56551e37e919e3882d876ac08a887bb95ddf2
Author: Gary Kramlich <grim@reaperworld.com>
Date: 2016-09-21 12:34 -0500
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/2bb56551e37e
Description:
Merged in qulogic/pidgin (pull request #121)
Remove more old build checks
diffstat:
config.h.mingw | 51 ---------------------
configure.ac | 11 +--
finch/getopt.c | 2 -
finch/libfinch.c | 2 -
finch/libgnt/configure.ac | 63 +------------------------
libpurple/protocols/zephyr/Zinternal.c | 18 -------
libpurple/protocols/zephyr/sysdep.h | 34 +-------------
libpurple/util.c | 2 -
pidgin/getopt.c | 2 -
pidgin/libpidgin.c | 30 +-----------
pidgin/plugins/musicmessaging/musicmessaging.c | 5 --
11 files changed, 10 insertions(+), 210 deletions(-)
diffs (truncated from 573 to 300 lines):
diff --git a/config.h.mingw b/config.h.mingw
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -40,9 +40,6 @@
/* Define if you have the external 'altzone' variable. */
/* #undef HAVE_ALTZONE */
-/* Define to 1 if you have the `atexit' function. */
-#define HAVE_ATEXIT 1
-
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
@@ -150,27 +147,12 @@
/* Define to 1 if you have the `socket' library (-lsocket). */
/* #undef HAVE_LIBSOCKET */
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `lrand48' function. */
-/* #define HAVE_LRAND48 1 */
-
/* Define to 1 if you have the <malloc.h> header file. */
#define HAVE_MALLOC_H 1
/* Define if we have support for application media type. */
/* #undef HAVE_MEDIA_APPLICATION */
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
/* Define to 1 if you have the `mono_jit_init' function. */
/* #undef HAVE_MONO_JIT_INIT */
@@ -213,18 +195,9 @@
/* Define to 1 if you have the <prio.h> header file. */
/* #undef HAVE_PRIO_H */
-/* Define to 1 if you have the `random' function. */
-/* #define HAVE_RANDOM 1 */
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
/* Define to 1 if you have the <sgtty.h> header file. */
/* #define HAVE_SGTTY_H 1 */
-/* Define to 1 if you have the <signal.h> header file. */
-/* #define HAVE_SIGNAL_H 1 */
-
/* Define if we have silcmime.h */
#define HAVE_SILCMIME_H 1
@@ -240,36 +213,18 @@
/* Define to 1 if you have the <ssl.h> header file. */
/* #undef HAVE_SSL_H */
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
/* Define to 1 if you have the `strdup' function. */
#define HAVE_STRDUP 1
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
/* Define to 1 if you have a strftime() that supports the %z format string. */
/* #undef HAVE_STRFTIME_Z_FORMAT */
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
/* Define if struct sockaddr has an sa_len member */
/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */
@@ -347,9 +302,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
/*#define HAVE_UNISTD_H 1*/
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
/* Define to 1 if you have X11 */
/* #define HAVE_X11 1 */
@@ -412,9 +364,6 @@
#define STATIC_PROTO_INIT static void static_proto_init(void) { }
#endif
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
/* Use GStreamer for playing sounds */
/* It's defined in global.mak. */
/* #undef USE_GSTREAMER */
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,6 @@ case "$host" in
is_win32="no"
is_not_win32="yes"
PLUGIN_LDFLAGS="-avoid-version"
- AC_CHECK_HEADERS(signal.h)
;;
esac
AM_CONDITIONAL(IS_WIN32, test "x$is_win32" = "xyes")
@@ -164,9 +163,8 @@ AC_SUBST(PIDGIN_LIBS)
AC_SUBST(FINCH_LIBS)
dnl Checks for header files.
-AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h unistd.h locale.h stdint.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h stdint.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_CHECK_SIZEOF(time_t, ,[
@@ -251,7 +249,7 @@ FINCH_PLUGINDIR="\$(libdir)/finch-$PURPL
AC_SUBST([FINCH_PLUGINDIR])
dnl Checks for library functions.
-AC_CHECK_FUNCS(strdup strstr atexit setlocale)
+AC_CHECK_FUNCS(strdup)
dnl Checks for getopt in standard library
AC_CHECK_FUNCS(getopt_long,,
[
@@ -2089,9 +2087,8 @@ fi
AC_MSG_CHECKING(for me pot o' gold)
AC_MSG_RESULT(no)
-AC_CHECK_FUNCS(gethostid lrand48 timegm)
-AC_CHECK_FUNCS(memcpy memmove random strchr strerror vprintf)
-AC_CHECK_HEADERS(malloc.h paths.h sgtty.h stdarg.h sys/cdefs.h)
+AC_CHECK_FUNCS(gethostid timegm)
+AC_CHECK_HEADERS(paths.h sgtty.h sys/cdefs.h)
AC_CHECK_HEADERS(sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h)
AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/wait.h)
AC_CHECK_HEADERS(termios.h)
diff --git a/finch/getopt.c b/finch/getopt.c
--- a/finch/getopt.c
+++ b/finch/getopt.c
@@ -32,9 +32,7 @@
#endif
/* Alver says we need this for IRIX. */
-#if HAVE_STRING_H
#include "string.h"
-#endif
#ifdef __GNUC__
#define alloca __builtin_alloca
diff --git a/finch/libfinch.c b/finch/libfinch.c
--- a/finch/libfinch.c
+++ b/finch/libfinch.c
@@ -284,9 +284,7 @@ init_libpurple(int argc, char **argv)
textdomain(PACKAGE);
#endif
-#ifdef HAVE_SETLOCALE
setlocale(LC_ALL, "");
-#endif
/* scan command-line options */
opterr = 1;
diff --git a/finch/libgnt/configure.ac b/finch/libgnt/configure.ac
--- a/finch/libgnt/configure.ac
+++ b/finch/libgnt/configure.ac
@@ -67,74 +67,22 @@ dnl we don't use autobreak on cygwin!!
dnl AC_CYGWIN
dnl Checks for header files.
-AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h unistd.h locale.h signal.h stdint.h)
+AC_CHECK_HEADERS(unistd.h)
dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_STRUCT_TM
AC_C_BIGENDIAN
dnl Checks for library functions.
-AC_TYPE_SIGNAL
-AC_FUNC_STRFTIME
-AC_CHECK_FUNCS(strdup strstr atexit setlocale)
+AC_CHECK_FUNCS(strdup)
dnl to prevent the g_stat()/g_unlink() crash,
dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in \
configure.ac AC_SYS_LARGEFILE
-AC_MSG_CHECKING(for the %z format string in strftime())
-AC_TRY_RUN([
-#include <time.h>
-#include <stdio.h>
-
-int main()
-{
- char buf[6];
- time_t t = time(NULL);
-
- if (strftime(buf, sizeof(buf), "%z", localtime(&t)) != 5)
- return 1;
-
- fprintf(stderr, "strftime(\"%%z\") yields: \"%s\"\n", buf);
-
- return !((buf[0] == '-' || buf[0] == '+') &&
- (buf[1] >= '0' && buf[1] <= '9') &&
- (buf[2] >= '0' && buf[2] <= '9') &&
- (buf[3] >= '0' && buf[3] <= '9') &&
- (buf[4] >= '0' && buf[4] <= '9')
- );
-}
-],
-[
- AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1],
- [Define to 1 if you have a strftime() that \
supports the %z format string.])
-],
-[
- AC_MSG_RESULT(no)
-],
-[
- # Fallback for Cross Compiling...
- # This will enable the compatibility code.
- AC_MSG_RESULT(no)
-]
-)
-
-
-AC_CHECK_HEADER(sys/utsname.h)
-AC_CHECK_FUNC(uname)
-
if test "x$enable_debug" = "xyes" ; then
AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
- enable_fatal_asserts="yes"
-fi
-
-if test "x$enable_fatal_asserts" = "xyes" ; then
- AC_DEFINE(GAIM_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for \
debugging).]) fi
if test "x$enable_deprecated" = "xno"; then
@@ -231,12 +179,7 @@ AC_SUBST(GLIB_LIBS)
AC_MSG_CHECKING(for me pot o' gold)
AC_MSG_RESULT(no)
-AC_CHECK_FUNCS(gethostid lrand48)
-AC_CHECK_FUNCS(memcpy memmove random strchr strerror vprintf)
-AC_CHECK_HEADERS(malloc.h paths.h sgtty.h stdarg.h sys/cdefs.h)
-AC_CHECK_HEADERS(sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h)
-AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/utsname.h sys/wait.h)
-AC_CHECK_HEADERS(termios.h)
+AC_CHECK_HEADERS(sys/wait.h)
#AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have \
wcwidth function.])]) #AC_VAR_TIMEZONE_EXTERNALS
diff --git a/libpurple/protocols/zephyr/Zinternal.c \
b/libpurple/protocols/zephyr/Zinternal.c
--- a/libpurple/protocols/zephyr/Zinternal.c
+++ b/libpurple/protocols/zephyr/Zinternal.c
@@ -931,7 +931,6 @@ const char *const ZNoticeKinds[] = {
#ifdef Z_DEBUG
#undef Z_debug
-#ifdef HAVE_STDARG_H
void Z_debug (const char *format, ...)
{
va_list pvar;
@@ -941,30 +940,13 @@ void Z_debug (const char *format, ...)
(*__Z_debug_print) (format, pvar, __Z_debug_print_closure);
va_end (pvar);
}
-#else /* stdarg */
-void Z_debug (va_alist) va_dcl
-{
- va_list pvar;
- char *format;
_______________________________________________
Commits mailing list
Commits@pidgin.im
https://pidgin.im/cgi-bin/mailman/listinfo/commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic