Logoj0ke.net Open Build Service > Projects > server:search > clucene-contrib-unstable > clucene-contrib-0.9.16_libdir.patch
Sign Up | Log In

File clucene-contrib-0.9.16_libdir.patch of Package clucene-contrib-unstable

x
 
1
Index: m4/acx_clucene.m4
2
===================================================================
3
--- m4/acx_clucene.m4.orig
4
+++ m4/acx_clucene.m4
5
@@ -24,17 +24,19 @@ AC_MSG_CHECKING([how to include clucene]
6
 CLUCENE_CXXFLAGS=
7
 CLUCENE_LIBS=
8
 for flag in $with_clucene; do
9
-   if test -z "$clucene_set_failed"; then
10
-       if test -e "$flag/include/CLucene/StdHeader.h"; then
11
-           if test -e "$flag/lib/CLucene/clucene-config.h"; then
12
-               if test -e "$flag/lib/libclucene.la"; then
13
-                   CLUCENE_LIBS="-L$flag/lib -lclucene"
14
-                   CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
15
-                   clucene_set_failed=$flag
16
+   for cltest_libdir in lib64 lib ; do
17
+       if test -z "$clucene_set_failed"; then
18
+           if test -e "$flag/include/CLucene/StdHeader.h"; then
19
+               if test -e "$flag/$cltest_libdir/CLucene/clucene-config.h"; then
20
+                   if test -e "$flag/$cltest_libdir/libclucene.la"; then
21
+                       CLUCENE_LIBS="-L$flag/$cltest_libdir -lclucene"
22
+                       CLUCENE_CXXFLAGS="-I$flag/include -I$flag/$cltest_libdir"
23
+                       clucene_set_failed=$flag
24
+                   fi
25
                fi
26
            fi
27
        fi
28
-   fi
29
+   done
30
 
31
    if test -z "$clucene_set_failed"; then
32
        if test -e "$flag/src/CLucene/StdHeader.h"; then
33
Index: configure
34
===================================================================
35
--- configure.orig
36
+++ configure
37
@@ -19669,17 +19669,19 @@ echo $ECHO_N "checking how to include cl
38
 CLUCENE_CXXFLAGS=
39
 CLUCENE_LIBS=
40
 for flag in $with_clucene; do
41
-   if test -z "$clucene_set_failed"; then
42
-       if test -e "$flag/include/CLucene/StdHeader.h"; then
43
-           if test -e "$flag/lib/CLucene/clucene-config.h"; then
44
-               if test -e "$flag/lib/libclucene.la"; then
45
-                   CLUCENE_LIBS="-L$flag/lib -lclucene"
46
-                   CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
47
-                   clucene_set_failed=$flag
48
+   for cltest_libdir in lib64 lib ; do
49
+       if test -z "$clucene_set_failed"; then
50
+           if test -e "$flag/include/CLucene/StdHeader.h"; then
51
+               if test -e "$flag/$cltest_libdir/CLucene/clucene-config.h"; then
52
+                   if test -e "$flag/$cltest_libdir/libclucene.la"; then
53
+                       CLUCENE_LIBS="-L$flag/$cltest_libdir -lclucene"
54
+                       CLUCENE_CXXFLAGS="-I$flag/include -I$flag/$cltest_libdir"
55
+                       clucene_set_failed=$flag
56
+                   fi
57
                fi
58
            fi
59
        fi
60
-   fi
61
+   done
62
 
63
    if test -z "$clucene_set_failed"; then
64
        if test -e "$flag/src/CLucene/StdHeader.h"; then
65