[DVDnav-discuss] [RFC] MPlayer integration hack

[Reimar Döffinger]

On Wed, Dec 31, 2008 at 11:18:57AM +0100, Nico Sabbi wrote:
> Il giorno mar, 30/12/2008 alle 16.36 +0100, Reimar Döffinger ha scritto:
> > Hello,
> > this hack:
> > Index: dvdnav.c
> > ===================================================================
> > --- dvdnav.c    (revision 1160)
> > +++ dvdnav.c    (working copy)
> > @@ -21,9 +21,8 @@
> >  #ifdef HAVE_CONFIG_H
> >  #include "config.h"
> >  #endif
> > +#include "version.h"
> >  
> >  /*
> >  #define LOG_DEBUG
> > 
> > is what I currently use to build libdvdnav directly from within MPlayer.
> > It is ugly for that use because it uses MPlayer's version string dvdnav ;-)
> > But on the other hand it seems the quickest way to get a working
> > solution.
> > Another possibility would be to add an
> > #else
> > #define VERSION ...
> > Which would also make sense, because a HAVE_CONFIG_H without which
> > nothing works at all does not make much sense either...
> > 
> 
> I like the second solution much better

Actually just removing the #ifdef HAVE_CONFIG_H would probably make it
workable too, especially if config.h was replaced by something more
specific like dvdnavconfig.h
Anyway, this patch works as well if it fits your plan better, and as
said there probably are "a million" other possibilities, but I don't
know which one matches the intended meaning of config.h/HAVE_CONFIG_H.

Index: dvdnav.c
===================================================================
--- dvdnav.c    (revision 1162)
+++ dvdnav.c    (working copy)
@@ -20,6 +20,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#else
+#define VERSION "custom build"
 #endif
 
 /*