Lines 1-61
Link Here
|
1 |
--- configure.orig 2004-01-20 18:54:58 UTC |
1 |
--- configure.orig 2004-01-20 18:54:58 UTC |
2 |
+++ configure |
2 |
+++ configure |
3 |
@@ -2337,52 +2337,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
3 |
@@ -2379,7 +2379,7 @@ fi |
4 |
# |
4 |
echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libnet_a" >&5 |
|
|
5 |
echo "${ECHO_T}$ac_cv_file__usr_local_lib_libnet_a" >&6 |
6 |
if test $ac_cv_file__usr_local_lib_libnet_a = yes; then |
7 |
- filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include" |
8 |
+ filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
9 |
fi |
5 |
|
10 |
|
6 |
filechk="yes" |
11 |
fi |
7 |
-echo "$as_me:$LINENO: checking for /usr/lib/libnet.a" >&5 |
12 |
@@ -2530,7 +2530,7 @@ fi |
8 |
-echo $ECHO_N "checking for /usr/lib/libnet.a... $ECHO_C" >&6 |
13 |
echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libpcap_a" >&5 |
9 |
-if test "${ac_cv_file__usr_lib_libnet_a+set}" = set; then |
14 |
echo "${ECHO_T}$ac_cv_file__usr_local_lib_libpcap_a" >&6 |
10 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15 |
if test $ac_cv_file__usr_local_lib_libpcap_a = yes; then |
11 |
-else |
|
|
12 |
- test "$cross_compiling" = yes && |
13 |
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 |
14 |
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} |
15 |
- { (exit 1); exit 1; }; } |
16 |
-if test -r "/usr/lib/libnet.a"; then |
17 |
- ac_cv_file__usr_lib_libnet_a=yes |
18 |
-else |
19 |
- ac_cv_file__usr_lib_libnet_a=no |
20 |
-fi |
21 |
-fi |
22 |
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_lib_libnet_a" >&5 |
23 |
-echo "${ECHO_T}$ac_cv_file__usr_lib_libnet_a" >&6 |
24 |
-if test $ac_cv_file__usr_lib_libnet_a = yes; then |
25 |
- : |
26 |
-else |
27 |
- filechk="no" |
28 |
-fi |
29 |
- |
30 |
-if test "$filechk" = "no"; then |
31 |
- echo "$as_me:$LINENO: checking for /usr/local/lib/libnet.a" >&5 |
32 |
-echo $ECHO_N "checking for /usr/local/lib/libnet.a... $ECHO_C" >&6 |
33 |
-if test "${ac_cv_file__usr_local_lib_libnet_a+set}" = set; then |
34 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
35 |
-else |
36 |
- test "$cross_compiling" = yes && |
37 |
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 |
38 |
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} |
39 |
- { (exit 1); exit 1; }; } |
40 |
-if test -r "/usr/local/lib/libnet.a"; then |
41 |
- ac_cv_file__usr_local_lib_libnet_a=yes |
42 |
-else |
43 |
- ac_cv_file__usr_local_lib_libnet_a=no |
44 |
-fi |
45 |
-fi |
46 |
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libnet_a" >&5 |
47 |
-echo "${ECHO_T}$ac_cv_file__usr_local_lib_libnet_a" >&6 |
48 |
-if test $ac_cv_file__usr_local_lib_libnet_a = yes; then |
49 |
- filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include" |
16 |
- filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include" |
50 |
-fi |
17 |
+ filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
51 |
- |
18 |
fi |
52 |
-fi |
|
|
53 |
+CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`" |
54 |
+LDFLAGS="${LDFLAGS} `libnet-config --libs`" |
55 |
|
19 |
|
56 |
if test "$filechk" = "no"; then { { echo "$as_me:$LINENO: error: |
20 |
fi |
|
|
21 |
@@ -2680,7 +2680,7 @@ fi |
22 |
echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libncurses_a" >&5 |
23 |
echo "${ECHO_T}$ac_cv_file__usr_local_lib_libncurses_a" >&6 |
24 |
if test $ac_cv_file__usr_local_lib_libncurses_a = yes; then |
25 |
- filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include" |
26 |
+ filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
27 |
fi |
57 |
|
28 |
|
58 |
@@ -3045,8 +3001,8 @@ fi |
29 |
fi |
|
|
30 |
@@ -2840,7 +2840,7 @@ fi |
31 |
echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libmenu_a" >&5 |
32 |
echo "${ECHO_T}$ac_cv_file__usr_local_lib_libmenu_a" >&6 |
33 |
if test $ac_cv_file__usr_local_lib_libmenu_a = yes; then |
34 |
- filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include" |
35 |
+ filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
36 |
fi |
37 |
|
38 |
fi |
39 |
@@ -3045,8 +3045,8 @@ fi |
59 |
|
40 |
|
60 |
CFLAGS="-Wall -O2" |
41 |
CFLAGS="-Wall -O2" |
61 |
;; |
42 |
;; |