2009-05-08 Hidehisa Akiyama <akky@users.sourceforge.jp>
* configure.ac:
added zlib checking.
rclm2/base/trunk/configure (diff) rclm2/base/trunk/ChangeLog (diff) rclm2/base/trunk/configure.ac (diff)| @@ -4382,8 +4382,86 @@ | ||
| 4382 | 4382 | CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" |
| 4383 | 4383 | LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" |
| 4384 | 4384 | |
| 4385 | +libz="yes" | |
| 4386 | + | |
| 4387 | +{ $as_echo "$as_me:$LINENO: checking for deflate in -lz" >&5 | |
| 4388 | +$as_echo_n "checking for deflate in -lz... " >&6; } | |
| 4389 | +if test "${ac_cv_lib_z_deflate+set}" = set; then | |
| 4390 | + $as_echo_n "(cached) " >&6 | |
| 4391 | +else | |
| 4392 | + ac_check_lib_save_LIBS=$LIBS | |
| 4393 | +LIBS="-lz $LIBS" | |
| 4394 | +cat >conftest.$ac_ext <<_ACEOF | |
| 4395 | +/* confdefs.h. */ | |
| 4396 | +_ACEOF | |
| 4397 | +cat confdefs.h >>conftest.$ac_ext | |
| 4398 | +cat >>conftest.$ac_ext <<_ACEOF | |
| 4399 | +/* end confdefs.h. */ | |
| 4400 | + | |
| 4401 | +/* Override any GCC internal prototype to avoid an error. | |
| 4402 | + Use char because int might match the return type of a GCC | |
| 4403 | + builtin and then its argument prototype would still apply. */ | |
| 4404 | +#ifdef __cplusplus | |
| 4405 | +extern "C" | |
| 4406 | +#endif | |
| 4407 | +char deflate (); | |
| 4408 | +int | |
| 4409 | +main () | |
| 4410 | +{ | |
| 4411 | +return deflate (); | |
| 4412 | + ; | |
| 4413 | + return 0; | |
| 4414 | +} | |
| 4415 | +_ACEOF | |
| 4416 | +rm -f conftest.$ac_objext conftest$ac_exeext | |
| 4417 | +if { (ac_try="$ac_link" | |
| 4418 | +case "(($ac_try" in | |
| 4419 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| 4420 | + *) ac_try_echo=$ac_try;; | |
| 4421 | +esac | |
| 4422 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
| 4423 | +$as_echo "$ac_try_echo") >&5 | |
| 4424 | + (eval "$ac_link") 2>conftest.er1 | |
| 4425 | + ac_status=$? | |
| 4426 | + grep -v '^ *+' conftest.er1 >conftest.err | |
| 4427 | + rm -f conftest.er1 | |
| 4428 | + cat conftest.err >&5 | |
| 4429 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| 4430 | + (exit $ac_status); } && { | |
| 4431 | + test -z "$ac_c_werror_flag" || | |
| 4432 | + test ! -s conftest.err | |
| 4433 | + } && test -s conftest$ac_exeext && { | |
| 4434 | + test "$cross_compiling" = yes || | |
| 4435 | + $as_test_x conftest$ac_exeext | |
| 4436 | + }; then | |
| 4437 | + ac_cv_lib_z_deflate=yes | |
| 4438 | +else | |
| 4439 | + $as_echo "$as_me: failed program was:" >&5 | |
| 4440 | +sed 's/^/| /' conftest.$ac_ext >&5 | |
| 4441 | + | |
| 4442 | + ac_cv_lib_z_deflate=no | |
| 4443 | +fi | |
| 4444 | + | |
| 4445 | +rm -rf conftest.dSYM | |
| 4446 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| 4447 | + conftest$ac_exeext conftest.$ac_ext | |
| 4448 | +LIBS=$ac_check_lib_save_LIBS | |
| 4449 | +fi | |
| 4450 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 | |
| 4451 | +$as_echo "$ac_cv_lib_z_deflate" >&6; } | |
| 4452 | +if test "x$ac_cv_lib_z_deflate" = x""yes; then | |
| 4453 | + | |
| 4454 | +cat >>confdefs.h <<\_ACEOF | |
| 4455 | +#define HAVE_LIBZ 1 | |
| 4456 | +_ACEOF | |
| 4457 | + | |
| 4458 | + LIBS="-lz $LIBS" | |
| 4459 | +else | |
| 4460 | + libz="no" | |
| 4461 | +fi | |
| 4462 | + | |
| 4463 | + | |
| 4385 | 4464 | # Checks for header files. |
| 4386 | - | |
| 4387 | 4465 | ac_ext=c |
| 4388 | 4466 | ac_cpp='$CPP $CPPFLAGS' |
| 4389 | 4467 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| @@ -1,5 +1,8 @@ | ||
| 1 | 1 | 2009-05-08 Hidehisa Akiyama <akky@users.sourceforge.jp> |
| 2 | 2 | |
| 3 | + * configure.ac: | |
| 4 | + - added zlib checking. | |
| 5 | + | |
| 3 | 6 | * share/rclm2/types/2D_RoundRobin/start: |
| 4 | 7 | * share/rclm2/types/2D_Tournament/start: |
| 5 | 8 | - added "server::max_monitors = 1" |
| @@ -20,6 +20,13 @@ | ||
| 20 | 20 | CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" |
| 21 | 21 | LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" |
| 22 | 22 | |
| 23 | +libz="yes" | |
| 24 | +AC_CHECK_LIB([z], [deflate], | |
| 25 | + [AC_DEFINE([HAVE_LIBZ], [1], | |
| 26 | + [Define to 1 if you have the `z' library (-lz).]) | |
| 27 | + LIBS="-lz $LIBS"], | |
| 28 | + [libz="no"]) | |
| 29 | + | |
| 23 | 30 | # Checks for header files. |
| 24 | 31 | AC_CHECK_HEADERS([netinet/in.h]) |
| 25 | 32 |