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

[nicodvb]

Author: nicodvb
Date: Wed Apr 25 21:26:34 2007
New Revision: 905

Log:
added appropriate flags to dvdnav-config to handle --minilibs (to be used when dvdread is external)

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

Modified: trunk/libdvdnav/Makefile
==============================================================================
--- trunk/libdvdnav/Makefile	(original)
+++ trunk/libdvdnav/Makefile	Wed Apr 25 21:26:34 2007
@@ -131,6 +131,7 @@ distclean: clean
 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 '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 21:26:34 2007
@@ -1,3 +1,7 @@
+if test "$dvdread" = "external"; then
+    dvdreadlib="-ldvdread"
+    dvdreadmsg="[--minilibs]"
+fi
 
 usage()
 {
@@ -8,6 +12,7 @@ Options:
 	[--version]
         [--libs]
 	[--cflags]
+        $dvdreadmsg
 EOF
 	exit $1
 }
@@ -35,6 +40,13 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
+    --minilibs)
+      if test "$dvdread" = "external"; then
+          echo_minilibs=yes
+      else
+          usage 1 1>&2
+      fi
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -51,5 +63,9 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L$prefix -ldvdnav $threadlib
+      echo -L$prefix -ldvdnav $dvdreadlib $threadlib
 fi      
+
+if test "$echo_minilibs" = "yes"; then
+      echo -L$prefix -ldvdnav $threadlib
+fi