diff options
author | Daniel Friesel <derf@derf.homelinux.org> | 2010-03-04 14:53:43 +0100 |
---|---|---|
committer | Daniel Friesel <derf@derf.homelinux.org> | 2010-03-04 14:53:43 +0100 |
commit | 3933366661c81e49fd932aaa7844118e6453b403 (patch) | |
tree | b7fb99f171a90fc458a51c7af64c11a876647957 | |
parent | ee50584d807bc51057184e82983936ee2a1bd6f4 (diff) |
configure: Remove unneeded libjpeg test (yes, should've used autoreconf, don't care)
-rwxr-xr-x | configure | 76 |
1 files changed, 1 insertions, 75 deletions
@@ -3191,7 +3191,7 @@ GIBLIB_CFLAGS=`giblib-config --cflags` CFLAGS="-I/usr/X11R6/include $CFLAGS" -LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg" +LIBS="-L/usr/X11R6/lib $LIBS -lm" echo "$as_me:$LINENO: checking for XMissingExtension in -lXext" >&5 echo $ECHO_N "checking for XMissingExtension in -lXext... $ECHO_C" >&6 @@ -3345,80 +3345,6 @@ fi -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 -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end 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 (); -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>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (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); }; } && - { 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 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_jpeg_jpeg_destroy_decompress=no -fi -rm -f conftest.err 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 - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBJPEG 1 -_ACEOF - - LIBS="-ljpeg $LIBS" - -fi - - - echo "checking for pr0n.... found" ac_config_files="$ac_config_files Makefile feh.spec cam/Makefile src/Makefile src/ttfonts/Makefile" |