CVS update by malcolmp MODIFIED: xemacs ...

Tuesday, 15 March 2005

          User: malcolmp
  Date: 05/03/15 13:37:19

  Modified:    xemacs   ChangeLog configure configure.ac
  Log:
  configure.ac OpenBSD, --with-cflags-optimization, PNG and TIFF fixes.

  Revision  Changes    Path
  1.445     +11 -0     XEmacs/xemacs/ChangeLog

  Index: ChangeLog
  ===================================================================
  RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
  retrieving revision 1.444
  retrieving revision 1.445
  diff -u -r1.444 -r1.445
  --- ChangeLog	2005/03/14 12:22:16	1.444
  +++ ChangeLog	2005/03/15 12:37:07	1.445
  ＠＠ -1,3 +1,14 ＠＠
  +2005-03-15  Stephen J. Turnbull  <stephen(a)xemacs.org&gt;
  +
  +	* configure.ac (--with-cflags-optimization):
  +	 (--with-cflags-debugging):
  +	If the user specifies them, use them, and don't make her beg.
  +	* configure.ac (Autodetect PNG): PNG & TIFF need -lz in AC_CHECK_LIB.
  +
  +2005-03-15  Malcolm Purvis  <malcolmp(a)xemacs.org&gt;
  +
  +	* configure.ac: Fix problems with OpenBSD /bin/sh.  
  +
   2005-03-13  Aidan Kehoe  <kehoea(a)parhasard.net&gt;

   	* configure.ac (TAB): Check $ac_cv_build, not $canonical, when

  1.245     +22 -22    XEmacs/xemacs/configure

  Index: configure
  ===================================================================
  RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
  retrieving revision 1.244
  retrieving revision 1.245
  diff -u -r1.244 -r1.245
  --- configure	2005/03/14 12:22:16	1.244
  +++ configure	2005/03/15 12:37:07	1.245
  ＠＠ -1584,7 +1584,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -3468,12 +3468,12 ＠＠
     else cflags_warning_specified=no;
   fi

  -if test "${cflags_optimization-unset}" != unset
  +if test "${with_cflags_optimization-unset}" != unset
     then cflags_optimization_specified=yes;
     else cflags_optimization_specified=no;
   fi

  -if test "${cflags_debugging-unset}" != unset
  +if test "${with_cflags_debugging-unset}" != unset
     then cflags_debugging_specified=yes;
     else cflags_debugging_specified=no;
   fi
  ＠＠ -3485,7 +3485,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   if test -n "$ac_tool_prefix"; then
  ＠＠ -4412,7 +4412,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -4422,7 +4422,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
  ＠＠ -4653,7 +4653,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -4707,7 +4707,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   if test -n "$ac_tool_prefix"; then
  ＠＠ -5433,7 +5433,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -5444,7 +5444,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   if test -n "$ac_tool_prefix"; then
  ＠＠ -6170,7 +6170,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -6181,7 +6181,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   if test -n "$ac_tool_prefix"; then
  ＠＠ -6907,7 +6907,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -6977,7 +6977,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
  ＠＠ -7208,7 +7208,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -7718,11 +7718,11 ＠＠
   fi

  -if test -z "$with_optimization" ; then
  -  if test -n "$emacs_is_beta" ; then
  -    with_optimization=no
  -  else
  +if test -z "$with_optimization"; then
  +  if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" =
"yes"; then
       with_optimization=yes
  +  else
  +    with_optimization=no
     fi
   fi

  ＠＠ -8037,7 +8037,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&5'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&5'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu

  ＠＠ -22645,7 +22645,7 ＠＠
     echo $ECHO_N "(cached) $ECHO_C" >&6
   else
     ac_check_lib_save_LIBS=$LIBS
  -LIBS="-lpng  $LIBS"
  +LIBS="-lpng -lz $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
   /* confdefs.h.  */
   _ACEOF
  ＠＠ -22931,7 +22931,7 ＠＠
     echo $ECHO_N "(cached) $ECHO_C" >&6
   else
     ac_check_lib_save_LIBS=$LIBS
  -LIBS="-ltiff  $LIBS"
  +LIBS="-ltiff -lz $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
   /* confdefs.h.  */
   _ACEOF

  1.4       +9 -9      XEmacs/xemacs/configure.ac

  Index: configure.ac
  ===================================================================
  RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- configure.ac	2005/03/14 12:22:22	1.3
  +++ configure.ac	2005/03/15 12:37:14	1.4
  ＠＠ -11,7 +11,7 ＠＠
   xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system
$ld_switch_x_site $ld_switch_run'
   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'
   ac_cpp='$CPP '"$xe_cppflags"
  -ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext
>&AS_MESSAGE_LOG_FD'
  +ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext
>&AS_MESSAGE_LOG_FD'
   ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"'
>&AS_MESSAGE_LOG_FD'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   ])
  ＠＠ -1706,12 +1706,12 ＠＠
     else cflags_warning_specified=no;
   fi

  -if test "${cflags_optimization-unset}" != unset
  +if test "${with_cflags_optimization-unset}" != unset
     then cflags_optimization_specified=yes;
     else cflags_optimization_specified=no;
   fi

  -if test "${cflags_debugging-unset}" != unset
  +if test "${with_cflags_debugging-unset}" != unset
     then cflags_debugging_specified=yes;
     else cflags_debugging_specified=no;
   fi
  ＠＠ -2048,11 +2048,11 ＠＠
   dnl Calculate optimization flags.  These will be off by default in beta
   dnl versions and on in release versions.

  -if test -z "$with_optimization" ; then
  -  if test -n "$emacs_is_beta" ; then
  -    with_optimization=no
  -  else
  +if test -z "$with_optimization"; then
  +  if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" =
"yes"; then
       with_optimization=yes
  +  else
  +    with_optimization=no
     fi
   fi

  ＠＠ -3811,7 +3811,7 ＠＠
     png_problem=""
     test -z "$with_png" && { AC_CHECK_FUNC(pow,                 
,with_png=no) }
     test -z "$with_png" && { AC_CHECK_HEADER(png.h,             
,with_png=no) }
  -  test -z "$with_png" && { AC_CHECK_LIB(png,
png_read_image,[:],with_png=no) }
  +  test -z "$with_png" && { AC_CHECK_LIB(png,
png_read_image,[:],with_png=no,[-lz]) }
     if test -z "$with_png"; then
       AC_MSG_CHECKING(for workable png version information)
       xe_check_libs="-lpng -lz"
  ＠＠ -3847,7 +3847,7 ＠＠

     dnl autodetect TIFF
     test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h,           
,with_tiff=no) }
  -  test -z "$with_tiff" && { AC_CHECK_LIB(tiff,
TIFFClientOpen,[:],with_tiff=no) }
  +  test -z "$with_tiff" && { AC_CHECK_LIB(tiff,
TIFFClientOpen,[:],with_tiff=no,[-lz]) }
     test -z "$with_tiff" && with_tiff=yes
     if test "$with_tiff" = "yes"; then
       AC_DEFINE(HAVE_TIFF)

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

CVS update by malcolmp MODIFIED: xemacs ...