From 782d7a3ae4d2ec9d02ee77621c314388dd333360 Mon Sep 17 00:00:00 2001 From: hikerstk Date: Thu, 14 Jul 2011 04:52:11 +0000 Subject: [PATCH] Fixed autoconf files after updating enet. I basically reverted r9250-9252, and restored the configuration files for enet back to the ones used before. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9256 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- configure.ac | 1 - src/enet/Makefile.am | 17 +++++------------ src/enet/configure.in | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 579325d02..b4824552a 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,6 @@ CXXFLAGS="$CXXFLAGS -Wall" AC_PROG_CC AC_PROG_CPP AC_PROG_CXX -AC_PROG_LIBTOOL # This macro defines WORDS_BIGENDIAN if building for a big endian machine. AC_C_BIGENDIAN diff --git a/src/enet/Makefile.am b/src/enet/Makefile.am index acac0bd89..8a9d6b7a7 100644 --- a/src/enet/Makefile.am +++ b/src/enet/Makefile.am @@ -1,8 +1,7 @@ -pkgconfigdir = $(libdir)/pkgconfig -#nodist_pkgconfig_DATA = libenet.pc - -enetincludedir=$(includedir)/enet -enetinclude_HEADERS = \ +noinst_LIBRARIES = libenet.a +EXTRA_DIST = ChangeLog configure design.txt Doxyfile LICENSE tutorial.txt +libenet_a_SOURCES = callbacks.c compress.c host.c list.c packet.c peer.c \ + protocol.c unix.c win32.c \ include/enet/callbacks.h \ include/enet/enet.h \ include/enet/list.h \ @@ -13,10 +12,4 @@ enetinclude_HEADERS = \ include/enet/utility.h \ include/enet/win32.h -lib_LTLIBRARIES = libenet.la -libenet_la_SOURCES = callbacks.c compress.c host.c list.c packet.c peer.c protocol.c unix.c win32.c -# see info '(libtool) Updating version info' before making a release -libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:3:0 -INCLUDES = -Iinclude - -ACLOCAL_AMFLAGS = -Im4 +AM_CPPFLAGS = -I$(srcdir)/include/ diff --git a/src/enet/configure.in b/src/enet/configure.in index eae566b62..47da5feb9 100644 --- a/src/enet/configure.in +++ b/src/enet/configure.in @@ -3,7 +3,6 @@ AM_INIT_AUTOMAKE(libenet.a, 1-8-2008) AC_PROG_CC AC_PROG_RANLIB -AC_PROG_LIBTOOL AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)]) AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])