Mercurial > hg > xemacs-beta

comparison configure.ac @ 2667:4f72b178ae35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-03-15 12:37:07 by malcolmp] configure.ac OpenBSD, --with-cflags-optimization, PNG and TIFF fixes.
author malcolmp
date Tue, 15 Mar 2005 12:37:14 +0000
parents d5a00a8fb31a
children b26d8b5d0d30
comparison
equal deleted inserted replaced
2666:7bf1f40e6acb 2667:4f72b178ae35
9 [ac_ext=c 9 [ac_ext=c
10 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' 10 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
11 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' 11 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
12 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard' 12 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
13 ac_cpp='$CPP '"$xe_cppflags" 13 ac_cpp='$CPP '"$xe_cppflags"
14 ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD' 14 ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
15 ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD' 15 ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD'
16 ac_compiler_gnu=$ac_cv_c_compiler_gnu 16 ac_compiler_gnu=$ac_cv_c_compiler_gnu
17 ]) 17 ])
18 18
19 dnl ------------------------------------------------------------------------- 19 dnl -------------------------------------------------------------------------
1704 if test "${with_cflags_warning-unset}" != unset 1704 if test "${with_cflags_warning-unset}" != unset
1705 then cflags_warning_specified=yes; 1705 then cflags_warning_specified=yes;
1706 else cflags_warning_specified=no; 1706 else cflags_warning_specified=no;
1707 fi 1707 fi
1708 1708
1709 if test "${cflags_optimization-unset}" != unset 1709 if test "${with_cflags_optimization-unset}" != unset
1710 then cflags_optimization_specified=yes; 1710 then cflags_optimization_specified=yes;
1711 else cflags_optimization_specified=no; 1711 else cflags_optimization_specified=no;
1712 fi 1712 fi
1713 1713
1714 if test "${cflags_debugging-unset}" != unset 1714 if test "${with_cflags_debugging-unset}" != unset
1715 then cflags_debugging_specified=yes; 1715 then cflags_debugging_specified=yes;
1716 else cflags_debugging_specified=no; 1716 else cflags_debugging_specified=no;
1717 fi 1717 fi
1718 1718
1719 xe_save_CFLAGS="$CFLAGS" 1719 xe_save_CFLAGS="$CFLAGS"
2046 fi 2046 fi
2047 2047
2048 dnl Calculate optimization flags. These will be off by default in beta 2048 dnl Calculate optimization flags. These will be off by default in beta
2049 dnl versions and on in release versions. 2049 dnl versions and on in release versions.
2050 2050
2051 if test -z "$with_optimization" ; then 2051 if test -z "$with_optimization"; then
2052 if test -n "$emacs_is_beta" ; then 2052 if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then
2053 with_optimization=yes
2054 else
2053 with_optimization=no 2055 with_optimization=no
2054 else
2055 with_optimization=yes
2056 fi 2056 fi
2057 fi 2057 fi
2058 2058
2059 2059
2060 dnl #### We should be checking C_OPTIMIZE_SWITCH in m/*, s/*. 2060 dnl #### We should be checking C_OPTIMIZE_SWITCH in m/*, s/*.
3809 3809
3810 dnl autodetect PNG 3810 dnl autodetect PNG
3811 png_problem="" 3811 png_problem=""
3812 test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) } 3812 test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) }
3813 test -z "$with_png" && { AC_CHECK_HEADER(png.h, ,with_png=no) } 3813 test -z "$with_png" && { AC_CHECK_HEADER(png.h, ,with_png=no) }
3814 test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) } 3814 test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no,[-lz]) }
3815 if test -z "$with_png"; then 3815 if test -z "$with_png"; then
3816 AC_MSG_CHECKING(for workable png version information) 3816 AC_MSG_CHECKING(for workable png version information)
3817 xe_check_libs="-lpng -lz" 3817 xe_check_libs="-lpng -lz"
3818 AC_RUN_IFELSE([AC_LANG_SOURCE([#include <png.h> 3818 AC_RUN_IFELSE([AC_LANG_SOURCE([#include <png.h>
3819 int main(int c, char **v) { 3819 int main(int c, char **v) {
3845 XE_PREPEND(-lpng, libs_x) 3845 XE_PREPEND(-lpng, libs_x)
3846 fi 3846 fi
3847 3847
3848 dnl autodetect TIFF 3848 dnl autodetect TIFF
3849 test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h, ,with_tiff=no) } 3849 test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h, ,with_tiff=no) }
3850 test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no) } 3850 test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no,[-lz]) }
3851 test -z "$with_tiff" && with_tiff=yes 3851 test -z "$with_tiff" && with_tiff=yes
3852 if test "$with_tiff" = "yes"; then 3852 if test "$with_tiff" = "yes"; then
3853 AC_DEFINE(HAVE_TIFF) 3853 AC_DEFINE(HAVE_TIFF)
3854 XE_PREPEND(-ltiff, libs_x) 3854 XE_PREPEND(-ltiff, libs_x)
3855 fi 3855 fi