[DVDnav-discuss] r909 - in trunk/libdvdnav: Makefile misc/dvdnav-config2.sh

[nicodvb]

Author: nicodvb
Date: Wed Apr 25 22:21:30 2007
New Revision: 909

Log:
when using external dvdread add to cflags the appropriate -I,
but not when --cflags is specified



Modified:
   trunk/libdvdnav/Makefile
   trunk/libdvdnav/misc/dvdnav-config2.sh

Modified: trunk/libdvdnav/Makefile
==============================================================================
--- trunk/libdvdnav/Makefile	(original)
+++ trunk/libdvdnav/Makefile	Wed Apr 25 22:21:30 2007
@@ -132,6 +132,7 @@ dvdnav-config:
 	echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config
 	echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config
 	echo -e 'dvdread='$(DVDREAD)'\n' >> $(.OBJDIR)/dvdnav-config
+	echo -e 'dvdreaddir='$(DVDREAD_DIR)'\n' >> $(.OBJDIR)/dvdnav-config
 	echo -e 'threadlib='$(THREADLIB)'\n\n' >> $(.OBJDIR)/dvdnav-config
 	cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config
 	chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config

Modified: trunk/libdvdnav/misc/dvdnav-config2.sh
==============================================================================
--- trunk/libdvdnav/misc/dvdnav-config2.sh	(original)
+++ trunk/libdvdnav/misc/dvdnav-config2.sh	Wed Apr 25 22:21:30 2007
@@ -1,6 +1,7 @@
 if test "$dvdread" = "external"; then
     dvdreadlib="-ldvdread"
-    dvdreadmsg="[--minilibs]"
+    dvdreadmsg="[--minilibs --minicflags]"
+    dvdreadcflags="-I$dvdreaddir"
 fi
 
 usage()
@@ -37,6 +38,13 @@ while test $# -gt 0; do
     --cflags)
       echo_cflags=yes
       ;;
+    --minicflags)
+      if test "$dvdread" = "external"; then
+          echo_minicflags=yes
+      else
+          usage 1 1>&2
+      fi
+      ;;
     --libs)
       echo_libs=yes
       ;;
@@ -59,6 +67,10 @@ if test "$echo_prefix" = "yes"; then
 fi
 
 if test "$echo_cflags" = "yes"; then
+      echo -I$prefix/include -I$prefix/include/dvdnav $dvdreadcflags $threadcflags
+fi
+
+if test "$echo_minicflags" = "yes"; then
       echo -I$prefix/include -I$prefix/include/dvdnav $threadcflags
 fi