Mercurial > emacs
changeset 33677:131dfbc3b5d1
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 21 Nov 2000 12:50:59 +0000 |
| parents | cc2cd2cf0f67 |
| children | 22b21b3ab3b0 |
| files | ChangeLog configure src/ChangeLog |
| diffstat | 3 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 21 12:33:01 2000 +0000 +++ b/ChangeLog Tue Nov 21 12:50:59 2000 +0000 @@ -3,6 +3,9 @@ * configure.in (HAVE_PNG): Check for the presence of png_get_channels to rule out older PNG libs. + * configure.in (AC_OUTPUT): Arrange to emit definitions of + GCC and NON_GNU_CPP into config.status. + 2000-11-20 Dave Love <fx@gnu.org> * configure.in: Fix last change.
--- a/configure Tue Nov 21 12:33:01 2000 +0000 +++ b/configure Tue Nov 21 12:50:59 2000 +0000 @@ -3504,7 +3504,7 @@ int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x = {0,0}; +typedef int charset[2]; const charset x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -5370,9 +5370,9 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for png_set_expand in -lpng""... $ac_c" 1>&6 -echo "configure:5375: checking for png_set_expand in -lpng" >&5 -ac_lib_var=`echo png'_'png_set_expand | sed 'y%./+-%__p_%'` + echo $ac_n "checking for png_get_channels in -lpng""... $ac_c" 1>&6 +echo "configure:5375: checking for png_get_channels in -lpng" >&5 +ac_lib_var=`echo png'_'png_get_channels | 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 @@ -5384,10 +5384,10 @@ /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char png_set_expand(); +char png_get_channels(); int main() { -png_set_expand() +png_get_channels() ; return 0; } EOF if { (eval echo configure:5394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@ -5652,7 +5652,7 @@ #include "confdefs.h" #include <alloca.h> int main() { -void *p = alloca(2 * sizeof(int)); +char *p = alloca(2 * sizeof(int)); ; return 0; } EOF if { (eval echo configure:5659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@ -9277,7 +9277,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CPP="$CPP" CPPFLAGS="$CPPFLAGS" +GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS" EOF cat >> $CONFIG_STATUS <<\EOF @@ -9359,3 +9359,4 @@ rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +
--- a/src/ChangeLog Tue Nov 21 12:33:01 2000 +0000 +++ b/src/ChangeLog Tue Nov 21 12:50:59 2000 +0000 @@ -1,7 +1,6 @@ 2000-11-21 Gerd Moellmann <gerd@gnu.org> - * buffer.c (mmap_free_1): Use a cast to avoid an anoying compiler - warning on some systems. + * buffer.c (mmap_free_1): Avoid a compiler warning. * term.c, cm.c: Don't try to include termcap.h; see comment there.