Lines 1-5
Link Here
|
1 |
--- configure2.orig 2008-08-31 11:27:37.000000000 +0200 |
1 |
--- configure2.orig 2010-09-06 11:36:58.000000000 +0000 |
2 |
+++ configure2 2008-10-04 12:41:51.534005961 +0200 |
2 |
+++ configure2 2010-09-07 13:01:25.216794661 +0000 |
3 |
@@ -26,6 +26,7 @@ |
3 |
@@ -26,6 +26,7 @@ |
4 |
echo " --help print this message" |
4 |
echo " --help print this message" |
5 |
echo " --prefix=PREFIX install in PREFIX [$PREFIX]" |
5 |
echo " --prefix=PREFIX install in PREFIX [$PREFIX]" |
Lines 17-24
Link Here
|
17 |
--shlibdir=*) shlibdir="$optval" |
17 |
--shlibdir=*) shlibdir="$optval" |
18 |
;; |
18 |
;; |
19 |
--incdir=*) incdir="$optval" |
19 |
--incdir=*) incdir="$optval" |
20 |
@@ -95,8 +98,9 @@ |
20 |
@@ -92,11 +95,12 @@ |
21 |
PREFIX=`cd $PREFIX && pwd` |
21 |
esac |
|
|
22 |
done |
23 |
|
24 |
-PREFIX=`cd $PREFIX && pwd` |
25 |
+#PREFIX=`cd $PREFIX && pwd` |
22 |
|
26 |
|
23 |
test -z "$libdir" && libdir=$PREFIX/lib |
27 |
test -z "$libdir" && libdir=$PREFIX/lib |
24 |
+test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig |
28 |
+test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig |
Lines 28-34
Link Here
|
28 |
|
32 |
|
29 |
targetos=`uname -s` |
33 |
targetos=`uname -s` |
30 |
case $targetos in |
34 |
case $targetos in |
31 |
@@ -112,9 +116,9 @@ |
35 |
@@ -110,7 +114,7 @@ |
|
|
36 |
|
37 |
echo -n "Checking if we're big-endian... " |
38 |
bigendian=no |
39 |
-TMPD=`mktemp -d` |
40 |
+TMPD=`mktemp -d temp.XXXX` |
41 |
TMPC=$TMPD/endian.c |
42 |
TMPO=$TMPD/endian.o |
43 |
cat > $TMPC <<EOF |
44 |
@@ -125,9 +129,9 @@ |
32 |
# Automatically generated by configure, do not edit |
45 |
# Automatically generated by configure, do not edit |
33 |
PREFIX=$PREFIX |
46 |
PREFIX=$PREFIX |
34 |
libdir=$libdir |
47 |
libdir=$libdir |
Lines 39-41
Link Here
|
39 |
BUILD_SHARED=$SHARED |
52 |
BUILD_SHARED=$SHARED |
40 |
BUILD_STATIC=$STATIC |
53 |
BUILD_STATIC=$STATIC |
41 |
SHLIB_VERSION=$dvdread_sh_version |
54 |
SHLIB_VERSION=$dvdread_sh_version |
|
|
55 |
@@ -149,7 +153,7 @@ |
56 |
/* Automatically generated by configure, do not edit */ |
57 |
#include "version.h" |
58 |
EOF |
59 |
-test "$bigendian" == "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h |
60 |
+test "$bigendian" = "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h |
61 |
|
62 |
# build tree in object directory if source path is different from current one |
63 |
if test "$source_path_used" != "no"; then |