From 3dcd339676b57edb28bb2956a67592f377d7e403 Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Wed, 15 Oct 2003 21:21:52 +0000 Subject: [PATCH] Don't look for jpeg/tiff (already done in gui) git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@17898 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 4 + config.h.in | 3 + configure | 643 +++++++-------------------------------------------- configure.ac | 125 +--------- 4 files changed, 92 insertions(+), 683 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8454e73..e6224f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-10-15 Adam Fedor + + * configure.ac: Don't look for jpeg/tiff (already linked in by gui). + 2003-10-08 15:58 Alexander Malmberg * Source/xlib/XGContext.m (+initializeBackend): Give NSLog an diff --git a/config.h.in b/config.h.in index bab4cc9..66c1490 100644 --- a/config.h.in +++ b/config.h.in @@ -29,6 +29,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `shmctl' function. */ +#undef HAVE_SHMCTL + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff --git a/configure b/configure index 488cf9c..c441f8a 100755 --- a/configure +++ b/configure @@ -860,10 +860,6 @@ Optional Packages: --with-library-flags=fg Library flags for libraries --with-include-flags=fg Include flags --with-x use the X Window System - --with-jpeg-library=DIR JPEG library file are in DIR - --with-jpeg-include=DIR JPEG include files are in DIR - --with-tiff-library=DIR TIFF library file are in DIR - --with-tiff-include=DIR TIFF include files are in DIR --with-name=PREFIX Set the name of the backend (def=back) Some influential environment variables: @@ -5584,561 +5580,6 @@ fi done -#-------------------------------------------------------------------- -# Find for JPEG -#-------------------------------------------------------------------- - -# Check whether --with-jpeg_library or --without-jpeg_library was given. -if test "${with_jpeg_library+set}" = set; then - withval="$with_jpeg_library" - -else - with_jpeg_library= -fi; - -# Check whether --with-jpeg_include or --without-jpeg_include was given. -if test "${with_jpeg_include+set}" = set; then - withval="$with_jpeg_include" - -else - with_jpeg_include= -fi; - -if test -n "$with_jpeg_library"; then - with_jpeg_library="-L$with_jpeg_library" -fi -if test -n "$with_jpeg_include"; then - with_jpeg_include="-I$with_jpeg_include" -fi - - - -if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then - jpeg_check_lib_save_header=${CPPFLAGS} -CPPFLAGS="${with_jpeg_library} ${with_jpeg_include} ${CPPFLAGS}" - -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" -/* 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>&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.$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 - jpeg_ok=yes -else - jpeg_ok=no -fi - -if test "$jpeg_ok" = yes; then - echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #undef PACKAGE - #undef VERSION - #undef HAVE_STDLIB_H - #include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - jpeg_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - jpeg_ok=no -fi -rm -f conftest.err conftest.$ac_ext - echo "$as_me:$LINENO: result: $jpeg_ok" >&5 -echo "${ECHO_T}$jpeg_ok" >&6 - - if test "$jpeg_ok" = yes; then - GRAPHIC_LFLAGS="${with_jpeg_library} $GRAPHIC_LFLAGS" - GRAPHIC_CFLAGS="${with_jpeg_include} $GRAPHIC_CFLAGS" - fi -fi -CPPFLAGS="${jpeg_check_lib_save_header}" -fi - -#-------------------------------------------------------------------- -# Find for TIFF -#-------------------------------------------------------------------- - -# Check whether --with-tiff_library or --without-tiff_library was given. -if test "${with_tiff_library+set}" = set; then - withval="$with_tiff_library" - -else - with_tiff_library= -fi; - -# Check whether --with-tiff_include or --without-tiff_include was given. -if test "${with_tiff_include+set}" = set; then - withval="$with_tiff_include" - -else - with_tiff_include= -fi; - -if test -n "$with_tiff_library"; then - with_tiff_library="-L$with_tiff_library" -fi -if test -n "$with_tiff_include"; then - with_tiff_include="-I$with_tiff_include" -fi - - - -if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then - tiff_check_lib_save_header=${CPPFLAGS} -tiff_check_lib_save_libs=${LIBS} -CPPFLAGS="${with_tiff_library} ${JPEG_LIB} ${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}" -echo "$as_me:$LINENO: checking for main in -lz" >&5 -echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6 -if test "${ac_cv_lib_z_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - 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_z_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_z_main=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_z_main" >&5 -echo "${ECHO_T}$ac_cv_lib_z_main" >&6 -if test $ac_cv_lib_z_main = yes; then - HAVE_LIBZ=1 -else - HAVE_LIBZ=0 -fi - - -echo "$as_me:$LINENO: checking for -ltiff without -ljpeg nor -lz" >&5 -echo $ECHO_N "checking for -ltiff without -ljpeg nor -lz... $ECHO_C" >&6 -LIBS="-ltiff -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -char TIFFReadScanline(); -int -main () -{ -TIFFReadScanline() - ; - 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 - jpeg_notneeded=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -jpeg_notneeded=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: result: $jpeg_notneeded" >&5 -echo "${ECHO_T}$jpeg_notneeded" >&6 -LIBS=${tiff_check_lib_save_libs} -JPEG= -if test "$jpeg_notneeded" = no; then - JPEG=-ljpeg -fi - -if test $HAVE_LIBZ = 1; then - echo "$as_me:$LINENO: checking for -ltiff without -lz" >&5 -echo $ECHO_N "checking for -ltiff without -lz... $ECHO_C" >&6 - LIBS="-ltiff $JPEG -lm $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -char TIFFReadScanline(); -int -main () -{ -TIFFReadScanline() - ; - 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 - libz_notneeded=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -libz_notneeded=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:$LINENO: result: $libz_notneeded" >&5 -echo "${ECHO_T}$libz_notneeded" >&6 - LIBS=${tiff_check_lib_save_libs} - if test "$libz_notneeded" = no; then - JPEG="$JPEG -lz" - fi -fi - -echo "$as_me:$LINENO: checking for TIFFReadScanline in -ltiff" >&5 -echo $ECHO_N "checking for TIFFReadScanline in -ltiff... $ECHO_C" >&6 -if test "${ac_cv_lib_tiff_TIFFReadScanline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff $JPEG -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* 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 TIFFReadScanline (); -int -main () -{ -TIFFReadScanline (); - ; - 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_tiff_TIFFReadScanline=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_tiff_TIFFReadScanline=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_tiff_TIFFReadScanline" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadScanline" >&6 -if test $ac_cv_lib_tiff_TIFFReadScanline = yes; then - tiff_ok=yes -else - tiff_ok=no -fi - -if test "$tiff_ok" = yes; then - if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tiffio_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 - -fi -if test $ac_cv_header_tiffio_h = yes; then - tiff_ok=yes -else - tiff_ok=no -fi - - - if test "$tiff_ok" = yes; then - GRAPHIC_LFLAGS="${with_tiff_library} $GRAPHIC_LFLAGS" - GRAPHIC_CFLAGS="${with_tiff_include} $GRAPHIC_CFLAGS" - GRAPHIC_LIBS="-ltiff $JPEG -lm $GRAPHIC_LIBS" - else - { echo "$as_me:$LINENO: WARNING: Cannot find libtiff header tiffio" >&5 -echo "$as_me: WARNING: Cannot find libtiff header tiffio" >&2;} - echo "* The GUI library requres the TIFF library" - echo "* Use --with-tiff-include to specify the tiff header directory" - echo "* and --with-tiff-library to specify the tiff library directory" - echo "* if it is not in the usual place(s)" - { { echo "$as_me:$LINENO: error: gnustep-gui will not compile without tiff includes" >&5 -echo "$as_me: error: gnustep-gui will not compile without tiff includes" >&2;} - { (exit 1); exit 1; }; } - fi -else - { echo "$as_me:$LINENO: WARNING: Cannot find libtiff" >&5 -echo "$as_me: WARNING: Cannot find libtiff" >&2;} - echo "* The GUI library reqiures the TIFF library" - echo "* Use --with-tiff-library to specify the tiff library" - echo "* directory if it is not in the usual place(s)" - echo "* You may also have to specify --with-jpeg-library if the jpeg" - echo "* library is needed by tiff", - { { echo "$as_me:$LINENO: error: gnustep-gui will not compile without tiff" >&5 -echo "$as_me: error: gnustep-gui will not compile without tiff" >&2;} - { (exit 1); exit 1; }; } -fi -CPPFLAGS="${tiff_check_lib_save_header}" -fi - save_CPPFLAGS=${CPPFLAGS} CPPFLAGS="$CPPFLAGS $GRAPHIC_CFLAGS" @@ -6197,6 +5638,90 @@ fi done + +for ac_func in shmctl +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + 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 + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + CPPFLAGS="$save_CPPFLAGS" #-------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 28b3926..a788029 100644 --- a/configure.ac +++ b/configure.ac @@ -275,135 +275,12 @@ fi #-------------------------------------------------------------------- AC_HAVE_FUNCS(usleep) -#-------------------------------------------------------------------- -# Find for JPEG -#-------------------------------------------------------------------- -AC_ARG_WITH(jpeg_library, - [ --with-jpeg-library=DIR JPEG library file are in DIR], , - with_jpeg_library=) -AC_ARG_WITH(jpeg_include, - [ --with-jpeg-include=DIR JPEG include files are in DIR], , - with_jpeg_include=) - -if test -n "$with_jpeg_library"; then - with_jpeg_library="-L$with_jpeg_library" -fi -if test -n "$with_jpeg_include"; then - with_jpeg_include="-I$with_jpeg_include" -fi - -AC_DEFUN(AC_CHECK_JPEGLIB, -[jpeg_check_lib_save_header=${CPPFLAGS} -CPPFLAGS="$1 $2 ${CPPFLAGS}" - -AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, - jpeg_ok=yes, - jpeg_ok=no) -if test "$jpeg_ok" = yes; then - AC_MSG_CHECKING([for jpeglib.h]) - AC_TRY_CPP([#include - #undef PACKAGE - #undef VERSION - #undef HAVE_STDLIB_H - #include ], - jpeg_ok=yes, - jpeg_ok=no) - AC_MSG_RESULT($jpeg_ok) - - if test "$jpeg_ok" = yes; then - GRAPHIC_LFLAGS="$1 $GRAPHIC_LFLAGS" - GRAPHIC_CFLAGS="$2 $GRAPHIC_CFLAGS" - fi -fi -CPPFLAGS="${jpeg_check_lib_save_header}"]) - -if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then - AC_CHECK_JPEGLIB(${with_jpeg_library}, ${with_jpeg_include}) -fi - -#-------------------------------------------------------------------- -# Find for TIFF -#-------------------------------------------------------------------- -AC_ARG_WITH(tiff_library, - [ --with-tiff-library=DIR TIFF library file are in DIR], , - with_tiff_library=) -AC_ARG_WITH(tiff_include, - [ --with-tiff-include=DIR TIFF include files are in DIR], , - with_tiff_include=) - -if test -n "$with_tiff_library"; then - with_tiff_library="-L$with_tiff_library" -fi -if test -n "$with_tiff_include"; then - with_tiff_include="-I$with_tiff_include" -fi - -AC_DEFUN(AC_CHECK_TIFFLIB, -[tiff_check_lib_save_header=${CPPFLAGS} -tiff_check_lib_save_libs=${LIBS} -CPPFLAGS="$1 ${JPEG_LIB} $2 ${JPEG_INCLUDE} ${CPPFLAGS}" -AC_CHECK_LIB(z, main, HAVE_LIBZ=1, HAVE_LIBZ=0) - -AC_MSG_CHECKING(for -ltiff without -ljpeg nor -lz) -LIBS="-ltiff -lm $LIBS" -AC_TRY_LINK([char TIFFReadScanline();], [TIFFReadScanline()], - jpeg_notneeded=yes, - jpeg_notneeded=no) -AC_MSG_RESULT($jpeg_notneeded) -LIBS=${tiff_check_lib_save_libs} -JPEG= -if test "$jpeg_notneeded" = no; then - JPEG=-ljpeg -fi - -if test $HAVE_LIBZ = 1; then - AC_MSG_CHECKING(for -ltiff without -lz) - LIBS="-ltiff $JPEG -lm $LIBS" - AC_TRY_LINK([char TIFFReadScanline();], [TIFFReadScanline()], - libz_notneeded=yes, - libz_notneeded=no) - AC_MSG_RESULT($libz_notneeded) - LIBS=${tiff_check_lib_save_libs} - if test "$libz_notneeded" = no; then - JPEG="$JPEG -lz" - fi -fi - -AC_CHECK_LIB(tiff, TIFFReadScanline, tiff_ok=yes, tiff_ok=no, $JPEG -lm) -if test "$tiff_ok" = yes; then - AC_CHECK_HEADER(tiffio.h, tiff_ok=yes, tiff_ok=no) - if test "$tiff_ok" = yes; then - GRAPHIC_LFLAGS="$1 $GRAPHIC_LFLAGS" - GRAPHIC_CFLAGS="$2 $GRAPHIC_CFLAGS" - GRAPHIC_LIBS="-ltiff $JPEG -lm $GRAPHIC_LIBS" - else - AC_MSG_WARN(Cannot find libtiff header tiffio) - echo "* The GUI library requres the TIFF library" - echo "* Use --with-tiff-include to specify the tiff header directory" - echo "* and --with-tiff-library to specify the tiff library directory" - echo "* if it is not in the usual place(s)" - AC_MSG_ERROR(gnustep-gui will not compile without tiff includes) - fi -else - AC_MSG_WARN(Cannot find libtiff) - echo "* The GUI library reqiures the TIFF library" - echo "* Use --with-tiff-library to specify the tiff library" - echo "* directory if it is not in the usual place(s)" - echo "* You may also have to specify --with-jpeg-library if the jpeg" - echo "* library is needed by tiff", - AC_MSG_ERROR(gnustep-gui will not compile without tiff) -fi -CPPFLAGS="${tiff_check_lib_save_header}"]) - -if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then - AC_CHECK_TIFFLIB(${with_tiff_library}, ${with_tiff_include}) -fi - save_CPPFLAGS=${CPPFLAGS} CPPFLAGS="$CPPFLAGS $GRAPHIC_CFLAGS" AC_CHECK_HEADERS(X11/extensions/XShm.h, AC_DEFINE(XSHM,1,[Define if you have X11/extensions/XShm.h]),, [#include ]) +AC_CHECK_FUNCS(shmctl) CPPFLAGS="$save_CPPFLAGS" #--------------------------------------------------------------------