From 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Tue, 16 Jul 2013 13:28:28 +0200
Subject: configure: uniform the defines to #define HAVE_xxx (0|1)

The configure followed 5 different convetions of defines because the next guy
always wanted to introduce a new better way to uniform it[1]. For an
hypothetic feature 'hurr' you could have had:

  * #define HAVE_HURR 1   / #undef HAVE_DURR
  * #define HAVE_HURR     / #undef HAVE_DURR
  * #define CONFIG_HURR 1 / #undef CONFIG_DURR
  * #define HAVE_HURR 1   / #define HAVE_DURR 0
  * #define CONFIG_HURR 1 / #define CONFIG_DURR 0

All is now uniform and uses:
  * #define HAVE_HURR 1
  * #define HAVE_DURR 0

We like definining to 0 as opposed to `undef` bcause it can help spot typos
and is very helpful when doing big reorganizations in the code.

[1]: http://xkcd.com/927/ related
---
 demux/demux.c     | 6 +++---
 demux/demux_mkv.c | 6 +++---
 demux/mf.c        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'demux')

diff --git a/demux/demux.c b/demux/demux.c
index ba632218ec..eeb979be9d 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -70,16 +70,16 @@ const demuxer_desc_t *const demuxer_list[] = {
     &demuxer_desc_cue,
     &demuxer_desc_rawaudio,
     &demuxer_desc_rawvideo,
-#ifdef CONFIG_TV
+#if HAVE_TV
     &demuxer_desc_tv,
 #endif
-#ifdef CONFIG_ASS
+#if HAVE_LIBASS
     &demuxer_desc_libass,
 #endif
     &demuxer_desc_matroska,
     &demuxer_desc_lavf,
     &demuxer_desc_mf,
-#ifdef CONFIG_MNG
+#if HAVE_MNG
     &demuxer_desc_mng,
 #endif
     &demuxer_desc_playlist,
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index b26cba5a29..eb352e0f64 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -37,7 +37,7 @@
 
 #include "config.h"
 
-#if CONFIG_ZLIB
+#if HAVE_ZLIB
 #include <zlib.h>
 #endif
 
@@ -267,7 +267,7 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type)
         src = dest;  // output from last iteration is new source
 
         if (enc->comp_algo == 0) {
-#if CONFIG_ZLIB
+#if HAVE_ZLIB
             /* zlib encoded track */
 
             if (size == 0)
@@ -457,7 +457,7 @@ static void parse_trackencodings(struct demuxer *demuxer,
                     "[mkv] algorithm (%" PRIu64 "). Skipping track.\n",
                     track->tnum, e.comp_algo);
         }
-#if !CONFIG_ZLIB
+#if !HAVE_ZLIB
         else if (e.comp_algo == 0) {
             mp_tmsg(MSGT_DEMUX, MSGL_WARN,
                     "[mkv] Track %u was compressed with zlib "
diff --git a/demux/mf.c b/demux/mf.c
index 8682e846bf..d1060efc3c 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_GLOB
+#if HAVE_GLOB
 #include <glob.h>
 #else
 #include "osdep/glob.h"
-- 
cgit v1.2.3