[gftp/autotools: 3/12] configure.ca: Do not use deprecated autoconf macros
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gftp/autotools: 3/12] configure.ca: Do not use deprecated autoconf macros
- Date: Mon, 30 Sep 2013 11:46:33 +0000 (UTC)
commit b6ca826ada7f597db702a93c0003c0910894971e
Author: Javier Jardón <jjardon gnome org>
Date: Sun Sep 29 23:18:35 2013 +0100
configure.ca: Do not use deprecated autoconf macros
acinclude.m4 | 14 --------------
configure.ac | 18 +++---------------
src/uicommon/gftpui.c | 4 ++--
3 files changed, 5 insertions(+), 31 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index ec9f294..a531827 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -41,17 +41,3 @@ AC_DEFUN([AC_INTL_PRINTF],
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
])
-
-# serial 1
-
-dnl Brian Masney <masneyb gftp org>
-
-AC_DEFUN([AC_TYPE_INTPTR_T],
- [AC_MSG_CHECKING([for intptr_t in stdint.h])
- AC_TRY_COMPILE([#include <stdint.h>],
- [intptr_t i = 0;],
- [AC_MSG_RESULT(yes)],
- [AC_DEFINE(intptr_t,long,Need to define intptr_t as a long because it should be in stdint.h)
- AC_MSG_RESULT(no)])
- ])
-
diff --git a/configure.ac b/configure.ac
index dc21cf8..2c1348e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lib/gftp.h)
+AC_INIT
+AC_CONFIG_SRCDIR([lib/gftp.h])
+AC_CONFIG_HEADERS([config.h])
-AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(gftp,2.0.19)
-AC_GNU_SOURCE
AC_USE_SYSTEM_EXTENSIONS
AC_ARG_ENABLE(gtk20,
@@ -36,9 +36,6 @@ AC_PROG_CC
AC_EXEEXT
AC_PROG_RANLIB
AC_SYS_LARGEFILE
-dnl AC_ISC_POSIX
-AM_C_PROTOTYPES
-AC_C_CONST
AC_C_INLINE
AC_INTL_PRINTF
@@ -49,27 +46,18 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h libutil.h limits.h malloc.h pty.h strings.h sys/ioctl.h sys/time.h unistd.h
stdint.h sys/mkdev.h inttypes.h)
-dnl AM_TYPE_PTRDIFF_T
AC_TYPE_SOCKLEN_T
AC_TYPE_MODE_T
AC_TYPE_INTPTR_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
AC_CHECK_SIZEOF(off_t)
AC_FUNC_ALLOCA
-AC_PROG_GCC_TRADITIONAL
AC_FUNC_MMAP
-AC_TYPE_SIGNAL
-AC_FUNC_STRFTIME
-AC_FUNC_UTIME_NULL
AC_CHECK_FUNCS(gai_strerror getaddrinfo getcwd gettimeofday getwd mkdir mktime putenv rmdir select socket
strdup strstr strtod strtol uname grantpt openpty getdtablesize)
# This is needed by fsplib. This check is from configure.ac in that distribution.
diff --git a/src/uicommon/gftpui.c b/src/uicommon/gftpui.c
index a7a3d5d..3a0e51f 100644
--- a/src/uicommon/gftpui.c
+++ b/src/uicommon/gftpui.c
@@ -97,7 +97,7 @@ gftpui_common_run_callback_function (gftpui_callback_data * cdata)
}
-static RETSIGTYPE
+static void
gftpui_common_signal_handler (int signo)
{
signal (signo, gftpui_common_signal_handler);
@@ -107,7 +107,7 @@ gftpui_common_signal_handler (int signo)
}
-static RETSIGTYPE
+static void
gftpui_common_sig_child (int signo)
{
int ret;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]