Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 112375 | Differences between
and this patch

Collapse All | Expand All

(-)tinc-1.0.4.orig/configure (-11 / +12 lines)
Lines 11074-11086 Link Here
11074
done
11144
done
11075
11145
11076
11146
11077
  echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo" >&5
11147
  echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo2" >&5
11078
echo $ECHO_N "checking for lzo1x_1_compress in -llzo... $ECHO_C" >&6
11148
echo $ECHO_N "checking for lzo1x_1_compress in -llzo2... $ECHO_C" >&6
11079
if test "${ac_cv_lib_lzo_lzo1x_1_compress+set}" = set; then
11149
if test "${ac_cv_lib_lzo2_lzo1x_1_compress+set}" = set; then
11080
  echo $ECHO_N "(cached) $ECHO_C" >&6
11150
  echo $ECHO_N "(cached) $ECHO_C" >&6
11081
else
11151
else
11082
  ac_check_lib_save_LIBS=$LIBS
11152
  ac_check_lib_save_LIBS=$LIBS
11083
LIBS="-llzo  $LIBS"
11153
LIBS="-llzo2  $LIBS"
11084
cat >conftest.$ac_ext <<_ACEOF
11154
cat >conftest.$ac_ext <<_ACEOF
11085
/* confdefs.h.  */
11155
/* confdefs.h.  */
11086
_ACEOF
11156
_ACEOF
Lines 11112-11118 Link Here
11112
  cat conftest.err >&5
11182
  cat conftest.err >&5
11113
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
11183
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
11114
  (exit $ac_status); } &&
11184
  (exit $ac_status); } &&
11115
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
11185
	 { ac_try='test -z "$ac_c_werror_flag"
11186
			 || test ! -s conftest.err'
11116
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11187
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11117
  (eval $ac_try) 2>&5
11188
  (eval $ac_try) 2>&5
11118
  ac_status=$?
11189
  ac_status=$?
Lines 11124-11144 Link Here
11124
  ac_status=$?
11195
  ac_status=$?
11125
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
11196
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
11126
  (exit $ac_status); }; }; then
11197
  (exit $ac_status); }; }; then
11127
  ac_cv_lib_lzo_lzo1x_1_compress=yes
11198
  ac_cv_lib_lzo2_lzo1x_1_compress=yes
11128
else
11199
else
11129
  echo "$as_me: failed program was:" >&5
11200
  echo "$as_me: failed program was:" >&5
11130
sed 's/^/| /' conftest.$ac_ext >&5
11201
sed 's/^/| /' conftest.$ac_ext >&5
11131
11202
11132
ac_cv_lib_lzo_lzo1x_1_compress=no
11203
ac_cv_lib_lzo2_lzo1x_1_compress=no
11133
fi
11204
fi
11134
rm -f conftest.err conftest.$ac_objext \
11205
rm -f conftest.err conftest.$ac_objext \
11135
      conftest$ac_exeext conftest.$ac_ext
11206
      conftest$ac_exeext conftest.$ac_ext
11136
LIBS=$ac_check_lib_save_LIBS
11207
LIBS=$ac_check_lib_save_LIBS
11137
fi
11208
fi
11138
echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo1x_1_compress" >&5
11209
echo "$as_me:$LINENO: result: $ac_cv_lib_lzo2_lzo1x_1_compress" >&5
11139
echo "${ECHO_T}$ac_cv_lib_lzo_lzo1x_1_compress" >&6
11210
echo "${ECHO_T}$ac_cv_lib_lzo2_lzo1x_1_compress" >&6
11140
if test $ac_cv_lib_lzo_lzo1x_1_compress = yes; then
11211
if test $ac_cv_lib_lzo2_lzo1x_1_compress = yes; then
11141
  LIBS="$LIBS -llzo"
11212
  LIBS="$LIBS -llzo2"
11142
else
11213
else
11143
  { { echo "$as_me:$LINENO: error: \"lzo libraries not found.\"" >&5
11214
  { { echo "$as_me:$LINENO: error: \"lzo libraries not found.\"" >&5
11144
echo "$as_me: error: \"lzo libraries not found.\"" >&2;}
11215
echo "$as_me: error: \"lzo libraries not found.\"" >&2;}
(-)tinc-1.0.4.orig/m4/lzo.m4 (-2 / +2 lines)
Lines 26-33 Link Here
26
    [AC_MSG_ERROR("lzo header files not found."); break]
26
    [AC_MSG_ERROR("lzo header files not found."); break]
27
  )
27
  )
28
28
29
  AC_CHECK_LIB(lzo, lzo1x_1_compress,
29
  AC_CHECK_LIB(lzo2, lzo1x_1_compress,
30
    [LIBS="$LIBS -llzo"],
30
    [LIBS="$LIBS -llzo2"],
31
    [AC_MSG_ERROR("lzo libraries not found.")]
31
    [AC_MSG_ERROR("lzo libraries not found.")]
32
  )
32
  )
33
])
33
])

Return to bug 112375