[Pkg-wmaker-commits] [wmcoincoin] 39/87: Various autotools fixes.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmcoincoin.

commit 2c47c0f5eeb333d1c9951bf75dd8bd215e7df55b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue Nov 11 12:13:18 2014 -0600

    Various autotools fixes.
    
    In particular:
    - Avoid recursive prefix (files were being installed in DESTDIR/DESTDIR/usr).
    - Avoid "will not overwrite just-created" error caused by installing logo.xpm
      twice.
    - Avoid "AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS" and
      "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS" warnings.
    - Avoid " 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')"
      warning.
    - Avoid "AC_CACHE_VAL(ac_have_backtrace, ...): suspicious cache-id, must
      contain _cv_ to be cached" . Avoid " The 'AM_PROG_MKDIR_P' macro is
      deprecated, and its use is discouraged."
---
 Makefile.am          |  4 ++--
 configure.ac         | 10 ++++++----
 m4/intl.m4           |  2 +-
 m4/po.m4             |  2 +-
 platypus/Makefile.am |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 200452e..b4dd931 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,7 +96,7 @@ ACLOCAL_AMFLAGS = -I m4
 MAINT_CHARSET = latin1
 
 # pour faire plaisir � woof :�)
-prefix=$(DESTDIR)@prefix@
+#prefix=$(DESTDIR)@prefix@
 
 SUBDIRS = intl  m4  po src scripts platypus
 EXTRA_DIST = config.rpath  MACOSX xpms/porte.h xpms/editwin_minib.xcf xpms/editwin_minib.xpm \
@@ -125,6 +125,6 @@ nightly: dist
 	(cd ..; ./up.sh ./wmcoincoin-cvs.tar.gz download/devel)
 
 pkgdata_DATA = options README wmcoincoin.spec xpms/bracket.xpm  xpms/logo.xpm xpms/badnews.xpm \
-	xpms/totoz.xpm pixmaps/cbronson.jpg pixmaps/logoh.png pixmaps/logo.xpm xpms/icon.xpm
+	xpms/totoz.xpm pixmaps/cbronson.jpg pixmaps/logoh.png xpms/icon.xpm
 
 CLEANFILES = stamp-h
diff --git a/configure.ac b/configure.ac
index 9365acd..62d67ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,8 @@ case $host_os in
          * ) CYGWIN=no; EXEEXT="";;
 esac
 
+AC_USE_SYSTEM_EXTENSIONS
+
 dnl internationalization macros
 ALL_LINGUAS="fr"
 AM_GNU_GETTEXT
@@ -463,14 +465,14 @@ if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
 	AC_DEFINE(HAVE_STRUCT_ADDRINFO,1,[struct addrinfo])
 fi
 
-AC_CACHE_CHECK([for execinfo.h and backtrace], ac_have_backtrace, [
+AC_CACHE_CHECK([for execinfo.h and backtrace], ac_cv_have_backtrace, [
         AC_TRY_COMPILE(
                 [ #include <execinfo.h>       
                 ],
                 [ void* trace[256]; int n = backtrace(trace, 256); ],
-                [ ac_have_backtrace="yes" ],
-                [ ac_have_backtrace="no"  ])])
-if test "x$ac_have_backtrace" = "xyes"; then
+                [ ac_cv_have_backtrace="yes" ],
+                [ ac_cv_have_backtrace="no"  ])])
+if test "x$ac_cv_have_backtrace" = "xyes"; then
         AC_DEFINE(HAVE_BACKTRACE,1,[glibc backtrace function])
 fi;     
 
diff --git a/m4/intl.m4 b/m4/intl.m4
index 934408b..fd8b382 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -25,7 +25,7 @@ dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
 AC_DEFUN([AM_INTL_SUBDIR],
 [
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AC_PROG_CC])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([gt_GLIBC2])dnl
diff --git a/m4/po.m4 b/m4/po.m4
index 0734762..e6c75ce 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that
diff --git a/platypus/Makefile.am b/platypus/Makefile.am
index ab449d5..ed7b77d 100644
--- a/platypus/Makefile.am
+++ b/platypus/Makefile.am
@@ -5,5 +5,5 @@ LIBS = `imlib2-config --libs`  `pkg-config --libs x11`
 
 wmcoincoin_player_SOURCES = fmalloc.c giffunc.c gifread.c wmcoincoin_player.c gif.h
 
-INCLUDES = -I. `imlib2-config --cflags`
+AM_CPPFLAGS = -I. `imlib2-config --cflags`
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcoincoin.git