[gnome-user-share] configure.ac: Do not use deprecated autoconf/libtool macros



commit f9d3e353b3306f75199a267729c9a24589640aab
Author: Javier JardÃn <jjardon gnome org>
Date:   Wed Mar 21 18:37:07 2012 +0000

    configure.ac: Do not use deprecated autoconf/libtool macros
    
    Also Its safely assume C89 semantics that RETSIGTYPE is void in
    our code, so AC_TYPE_SIGNAL is not needed anymore

 configure.in     |   26 +++++++++++++-------------
 src/user_share.c |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/configure.in b/configure.in
index b3debce..798f26f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(gnome-user-share, 3.0.1)
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 # Enable silent build when available (Automake 1.11)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -9,27 +9,25 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE([enable])
 
-IT_PROG_INTLTOOL([0.35.0])
-
-GNOME_DOC_INIT
-
+# Check for programs
 AC_C_CONST
-AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AM_DISABLE_STATIC
-AM_PROG_LIBTOOL
 AC_PATH_XTRA
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
+# Initialize libtool
+LT_INIT([disable-static])
+
 AC_TYPE_PID_T
-AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
+GNOME_DOC_INIT
+
 AC_ARG_WITH([httpd],
 	    [AS_HELP_STRING([--with-httpd],[Specify the binary used for the Apache httpd binary (default: httpd)])],
 	    [HTTPD=$withval])
@@ -100,6 +98,7 @@ installdir="`eval echo $libexecdir`"
 AC_SUBST(installdir, $installdir)
 
 dnl ==========================================================================
+IT_PROG_INTLTOOL([0.35.0])
 
 GETTEXT_PACKAGE=gnome-user-share
 AC_SUBST(GETTEXT_PACKAGE)
@@ -172,9 +171,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"
 		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                                  [has_option=yes],
+                                  [has_option=no])
 		if test $has_option = no; then
 			CFLAGS="$SAVE_CFLAGS"
 		fi
@@ -187,7 +186,7 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 data/Makefile
 data/icons/Makefile
@@ -200,6 +199,7 @@ po/Makefile.in
 src/Makefile
 help/Makefile
 ])
+AC_OUTPUT
 
 echo "
 Do note Apache 2.2 and mod_dnssd 0.6 are required to use gnome-user-share.
diff --git a/src/user_share.c b/src/user_share.c
index 1976424..e54c5ed 100644
--- a/src/user_share.c
+++ b/src/user_share.c
@@ -415,7 +415,7 @@ file_sharing_bluetooth_obexpush_notify_changed (GConfClient* client,
 	obexpush_set_notify (gconf_client_get_bool (client, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY, NULL));
 }
 
-static RETSIGTYPE
+static void
 cleanup_handler (int sig)
 {
 	http_down ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]