diff --git a/configure b/configure index 1219e079229c43756ec94ab1056d2ec5799b7c03..0a8c05883c4d75ad75c82482ef855e43ca5e6f2e 100755 --- a/configure +++ b/configure @@ -3127,68 +3127,9 @@ fi else - LDFLAGS="-L${JPEG_PREFIX}/lib" - echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6 -if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char jpeg_destroy_decompress (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -jpeg_destroy_decompress (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_jpeg_jpeg_destroy_decompress=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_jpeg_jpeg_destroy_decompress=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6 -if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then - VERSION_FLAGS="${VERSION_FLAGS} -DHAVE_LIBJPEG" - GUI_INCLUDE="${GUI_INCLUDE} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include" - GUI_LIBS="${GUI_LIBS} -L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib -ljpeg" -fi - + VERSION_FLAGS="${VERSION_FLAGS} -DHAVE_LIBJPEG" + GUI_INCLUDE="${GUI_INCLUDE} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include" + GUI_LIBS="${GUI_LIBS} -L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib -ljpeg") fi else diff --git a/configure.in b/configure.in index 536cf94aba3da031e5fa1af91a75ff662048eda4..bb21812b66f6592c51023c40a1ea3e6dfe208c1a 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl "$Id: configure.in,v 1.18 2003-02-17 01:43:21 geuzaine Exp $" +dnl "$Id: configure.in,v 1.19 2003-02-17 01:46:39 geuzaine Exp $" dnl dnl Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle dnl @@ -107,6 +107,7 @@ if test "x$enable_gui" != "xno"; then GUI_LIBS="${GUI_LIBS} -ljpeg")) else dnl Find the libs/includes even if jpeg is _not_ properly installed (ugly hack!) + LDFLAGS="-L${JPEG_PREFIX}/lib" AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, VERSION_FLAGS="${VERSION_FLAGS} -DHAVE_LIBJPEG" GUI_INCLUDE="${GUI_INCLUDE} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include"