From 3454813a9fe3a2dca21cf8379b5305accf1d5c65 Mon Sep 17 00:00:00 2001
From: doursse <doursse>
Date: Sat, 19 Apr 2008 05:02:30 +0000
Subject: [PATCH]  * rename lt_auto_import to lt_enable_auto_import  * remove
 warning with newest autoconf's (check of __attribute__)  * fix
 maintainer-clean rule (expecially with libtool 2.2.*)  * formatting of the
 top level Makefile.am

SVN revision: 34307
---
 legacy/eet/Makefile.am         | 44 +++++++++++++++++++++++-----------
 legacy/eet/configure.in        | 16 ++++++-------
 legacy/eet/src/bin/Makefile.am |  2 +-
 legacy/eet/src/lib/Makefile.am |  2 +-
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/legacy/eet/Makefile.am b/legacy/eet/Makefile.am
index 86f8cb154a..20edb9b0e9 100644
--- a/legacy/eet/Makefile.am
+++ b/legacy/eet/Makefile.am
@@ -2,21 +2,37 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
-                       config.h.in config.sub configure install-sh \
-		       ltconfig ltmain.sh missing mkinstalldirs \
-		       stamp-h.in build-stamp configure-stamp depcomp \
-		       eet_docs.tar.gz \
-		       README \
-		       eet.pc \
-		       eet.spec
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+config.guess \
+config.h.in  \
+config.sub  \
+configure  \
+depcomp \
+install-sh \
+ltmain.sh  \
+missing  \
+eet_docs.tar.gz\
+m4/libtool.m4 \
+m4/lt~obsolete.m4 \
+m4/ltoptions.m4 \
+m4/ltsugar.m4 \
+m4/ltversion.m4
 
-EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN eet.c.in \
-	     README.in README \
-	     eet.pc.in \
-	     eet.spec.in eet.spec \
-	     Doxyfile \
-	     doc gendoc
+EXTRA_DIST = \
+AUTHORS \
+COPYING \
+COPYING-PLAIN \
+eet.c.in \
+README.in \
+README \
+eet.pc.in \
+eet.spec.in \
+eet.spec \
+Doxyfile \
+doc \
+gendoc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = eet.pc
diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in
index 787dd56f3f..52f322e46d 100644
--- a/legacy/eet/configure.in
+++ b/legacy/eet/configure.in
@@ -31,7 +31,7 @@ AC_SUBST(version_info)
 WIN32_CFLAGS=""
 WIN32_LIBS=""
 lt_no_undefined=""
-lt_auto_import=""
+lt_enable_auto_import=""
 case "$host_os" in
 	mingw|mingw32*|cegcc)
 		PKG_CHECK_MODULES([EVIL], [evil])
@@ -41,7 +41,7 @@ case "$host_os" in
 		if test "$host_os" = "cegcc" ; then
 			WIN32_CFLAGS="-mwin32"
 			WIN32_LIBS="-lws2"
-			lt_auto_import="-Wl,--enable-auto-import"
+			lt_enable_auto_import="-Wl,--enable-auto-import"
 		else
 			WIN32_LIBS="-lws2_32"
 		fi
@@ -51,23 +51,23 @@ esac
 AC_SUBST(WIN32_CFLAGS)
 AC_SUBST(WIN32_LIBS)
 AC_SUBST(lt_no_undefined)
-AC_SUBST(lt_auto_import)
+AC_SUBST(lt_enable_auto_import)
 
 dnl Checking for __attribute__ support
 AC_MSG_CHECKING([for __attribute__])
-AC_CACHE_VAL(have___attribute__,
+AC_CACHE_VAL(_cv_have___attribute__,
   [
     AC_TRY_COMPILE([#include <stdlib.h>],
       [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
-      [have___attribute__="yes"],
-      [have___attribute__="no"])
+      [_cv_have___attribute__="yes"],
+      [_cv_have___attribute__="no"])
   ]
 )
 
-if test "x${have___attribute__}" = "xyes" ; then
+if test "x${_cv_have___attribute__}" = "xyes" ; then
    AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])
 fi
-AC_MSG_RESULT(${have___attribute__})
+AC_MSG_RESULT(${_cv_have___attribute__})
 
 AC_FUNC_ALLOCA
 
diff --git a/legacy/eet/src/bin/Makefile.am b/legacy/eet/src/bin/Makefile.am
index e5c36f2ad2..8f8ae07fab 100644
--- a/legacy/eet/src/bin/Makefile.am
+++ b/legacy/eet/src/bin/Makefile.am
@@ -12,5 +12,5 @@ AM_CPPFLAGS = \
 bin_PROGRAMS = eet
 
 eet_SOURCES = eet_main.c
-eet_LDADD = $(top_builddir)/src/lib/libeet.la @lt_auto_import@
+eet_LDADD = $(top_builddir)/src/lib/libeet.la @lt_enable_auto_import@
 eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la
diff --git a/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am
index 57bdd60299..d76c056ecb 100644
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@@ -22,6 +22,6 @@ eet_utils.c
 
 libeet_la_LIBADD       = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm
 libeet_la_DEPENDENCIES = $(top_builddir)/config.h
-libeet_la_LDFLAGS      = @lt_no_undefined@ @lt_auto_import@ -version-info @version_info@
+libeet_la_LDFLAGS      = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
 
 EXTRA_DIST = Eet_private.h