diff options
Diffstat (limited to 'common/configure')
| -rwxr-xr-x | common/configure | 107 |
1 files changed, 54 insertions, 53 deletions
diff --git a/common/configure b/common/configure index 10a9c029..085e4fa7 100755 --- a/common/configure +++ b/common/configure @@ -896,61 +896,10 @@ else fi fi -for ac_declaration in \ - ''\ - '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat > conftest.$ac_ext <<EOF -#line 910 "configure" -#include "confdefs.h" -#include <stdlib.h> -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue -fi -rm -f conftest* - cat > conftest.$ac_ext <<EOF -#line 928 "configure" -#include "confdefs.h" -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - - # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:954: checking for $ac_word" >&5 +echo "configure:903: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -978,7 +927,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:982: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:931: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1043,6 +992,57 @@ if test "$GXX" = yes; then fi fi +echo $ac_n "checking for dmICCreate in -ldmedia""... $ac_c" 1>&6 +echo "configure:997: checking for dmICCreate in -ldmedia" >&5 +ac_lib_var=`echo dmedia'_'dmICCreate | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldmedia $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1005 "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 dmICCreate(); + +int main() { +dmICCreate() +; return 0; } +EOF +if { (eval echo configure:1019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DMEDIA 1 +EOF + + PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixDMJpegCompressor.cxx" + PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixDMIC_RawToJpeg.cxx" + LIBS="$LIBS -ldmedia" +else + echo "$ac_t""no" 1>&6 +fi + + + # Check whether --with-installed-zlib or --without-installed-zlib was given. if test "${with_installed_zlib+set}" = set; then withval="$with_installed_zlib" @@ -1438,6 +1438,7 @@ s%@CC@%$CC%g s%@CXX@%$CXX%g s%@RANLIB@%$RANLIB%g s%@SET_MAKE@%$SET_MAKE%g +s%@PLATFORM_CXXSRCS@%$PLATFORM_CXXSRCS%g s%@ZLIB_DIR@%$ZLIB_DIR%g s%@ZLIB_INCLUDE@%$ZLIB_INCLUDE%g s%@ZLIB_LIB@%$ZLIB_LIB%g |