[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[fluid-dev] [PATCH 4/9] Update configure.ac as suggested by the autoupda
From: |
Antonio Ospite |
Subject: |
[fluid-dev] [PATCH 4/9] Update configure.ac as suggested by the autoupdate program |
Date: |
Wed, 8 Oct 2014 16:08:20 +0200 |
---
fluidsynth/configure.ac | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac
index 50b6a06..4783992 100644
--- a/fluidsynth/configure.ac
+++ b/fluidsynth/configure.ac
@@ -48,8 +48,8 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
dnl AC_PROG_RANLIB
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+
+LT_INIT(win32-dll)
AC_PROG_MAKE_SET
dnl Check for libraries
@@ -473,7 +473,7 @@ AC_ARG_ENABLE(ipv6, AS_HELP_STRING([--enable-ipv6],
ENABLE_IPV6=yes)
if test "$ENABLE_IPV6" = "yes" ; then
AC_CACHE_VAL(ac_cv_ipv6,
- AC_TRY_RUN([
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -484,10 +484,7 @@ if test "$ENABLE_IPV6" = "yes" ; then
struct sockaddr_in6 foo;
fd = socket(AF_INET6, SOCK_STREAM, 0);
exit(fd >= 0 ? 0 : 1);
- }],
- ac_cv_ipv6=yes,
- ac_cv_ipv6=no,
- ac_cv_ipv6=yes))
+ }]])],[ac_cv_ipv6=yes],[ac_cv_ipv6=no],[ac_cv_ipv6=yes]))
AC_MSG_RESULT($ac_cv_ipv6)
if test $ac_cv_ipv6 = yes ; then
AC_DEFINE(IPV6,1,[check if system supports IPV6])
@@ -497,7 +494,7 @@ if test "$ENABLE_IPV6" = "yes" ; then
fi
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
cmake_admin/Makefile
src/Makefile
@@ -508,6 +505,7 @@ AC_OUTPUT([
include/fluidsynth/version.h
fluidsynth.pc
fluidsynth.spec])
+AC_OUTPUT
echo
echo "***************************************************************"
--
2.1.1
- [fluid-dev] [PATCH 0/9] autotools updates, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 7/9] Remove some autotools files which will be installed by autoreconf, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 9/9] Add a .gitignore file, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 5/9] Fix indentation in configure.ac, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 4/9] Update configure.ac as suggested by the autoupdate program,
Antonio Ospite <=
- [fluid-dev] [PATCH 3/9] Define the default soundfont in configure.ac, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 8/9] Add support for automake silent rules, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 2/9] Don't use the old INCLUDES name in src/Makefile.am, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 6/9] Use autoreconf in autogen.sh instead of calling auto programs manually, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 1/9] Don't use the deprecated AM_INIT_AUTOMAKE two-arguments form, Antonio Ospite, 2014/10/08
- Re: [fluid-dev] [PATCH 0/9] autotools updates, Antonio Ospite, 2014/10/31