]>
Commit | Line | Data |
---|---|---|
a34f52c2 AM |
1 | diff -urN jed-B0.99-17.111.org/autoconf/aclocal.m4 jed-B0.99-17.111/autoconf/aclocal.m4 |
2 | --- jed-B0.99-17.111.org/autoconf/aclocal.m4 2005-07-25 06:37:22.000000000 +0200 | |
3 | +++ jed-B0.99-17.111/autoconf/aclocal.m4 2005-09-16 09:55:30.489122128 +0200 | |
4 | @@ -207,11 +207,7 @@ | |
5 | # the other directories may have a better chance of containing a more recent | |
6 | # version. | |
7 | ||
8 | -JD_Search_Dirs="$JD_Search_Dirs \ | |
76184646 PS |
9 | - /usr/local/include,/usr/local/lib \ |
10 | - /usr/include,/usr/lib \ | |
11 | - /usr/include/$1,/usr/lib \ | |
12 | - /usr/include/$1,/usr/lib/$1" | |
a34f52c2 | 13 | +JD_Search_Dirs="/usr/include/$1,$libdir" |
76184646 PS |
14 | |
15 | echo looking for the JD_UP_NAME library | |
16 | ||
a34f52c2 | 17 | @@ -221,21 +217,13 @@ |
89c0729c PS |
18 | generic_include=`echo $include_and_lib | tr ',' ' ' | awk '{print [$]1}'` |
19 | generic_lib=`echo $include_and_lib | tr ',' ' ' | awk '{print [$]2}'` | |
20 | echo Looking for $1.h in $generic_include | |
21 | - echo and lib$1.a in $generic_lib | |
22 | - if test -r $generic_include/$1.h && test -r $generic_lib/lib$1.a | |
23 | + echo and lib$1.so in $generic_lib | |
24 | + if test -r $generic_include/$1.h && test -r $generic_lib/lib$1.so | |
25 | then | |
26 | echo Found it. | |
27 | JD_UP_NAME[]_LIB_DIR="$generic_lib" | |
28 | JD_UP_NAME[]_INCLUDE="$generic_include" | |
29 | break | |
30 | - else | |
31 | - if test -r $generic_include/$1.h && test -r $generic_lib/lib$1.so | |
32 | - then | |
33 | - echo Found it. | |
34 | - JD_UP_NAME[]_LIB_DIR="$generic_lib" | |
35 | - JD_UP_NAME[]_INCLUDE="$generic_include" | |
36 | - break | |
37 | - fi | |
38 | fi | |
39 | done | |
40 |