Author: nicodvb Date: Wed Apr 25 19:54:06 2007 New Revision: 901 Log: link against -lpthread Added: trunk/libdvdnav/misc/dvdnav-config2.sh - copied, changed from r900, /trunk/libdvdnav/misc/dvdnav-config.in Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/configure2 Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Wed Apr 25 19:54:06 2007 @@ -86,7 +86,7 @@ ${LIB}: version.h $(.OBJDIR) $(OBJS) $(B cd $(.OBJDIR) && $(RANLIB) $@ ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS) - cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -o $@ $(SHOBJS) + cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) $(THREADLIB) -o $@ $(SHOBJS) .c.so: $(BUILDDEPS) cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $< Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Wed Apr 25 19:54:06 2007 @@ -54,6 +54,7 @@ PREFIX=/usr/local/ INSTALLSTRIP=-s USEDEBUG=-g optimizations="-O3" +threadlib="-lpthread" for opt do optval="${opt#*=}" @@ -129,6 +130,7 @@ PREFIX=$PREFIX libdir=$libdir shlibdir=$shlibdir incdir=$incdir +THREADLIB=$threadlib BUILD_SHARED=$SHARED BUILD_STATIC=$STATIC SHLIB_VERSION=$dvdnav_sh_version Copied: trunk/libdvdnav/misc/dvdnav-config2.sh (from r900, /trunk/libdvdnav/misc/dvdnav-config.in) ============================================================================== --- /trunk/libdvdnav/misc/dvdnav-config.in (original) +++ trunk/libdvdnav/misc/dvdnav-config2.sh Wed Apr 25 19:54:06 2007 @@ -1,10 +1,3 @@ -#!/bin/sh -# -# - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no usage() { @@ -12,7 +5,6 @@ usage() Usage: dvdnav-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] - [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] @@ -31,24 +23,11 @@ while test $# -gt 0; do esac case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; --prefix) echo_prefix=yes ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; --version) - echo @DVDNAV_MAJOR@.@DVDNAV_MINOR@.@DVDNAV_SUB@ + echo $version ;; --cflags) echo_cflags=yes @@ -67,14 +46,10 @@ if test "$echo_prefix" = "yes"; then echo $prefix fi -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - if test "$echo_cflags" = "yes"; then - echo -I@includedir@ -I@includedir@/dvdnav @THREAD_CFLAGS@ + echo -I$prefix -I$prefix/dvdnav @THREAD_CFLAGS@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -ldvdnav @THREAD_LIBS@ + echo -L$prefix -ldvdnav @THREAD_LIBS@ fi