diff options
| author | Gerd Moellmann | 2000-07-06 16:09:00 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-07-06 16:09:00 +0000 |
| commit | 6c6d2e33780af3c5a7150f7e0de11801ddf38b65 (patch) | |
| tree | e8fe5955407dc376c22a7c5eaf769a39a505814c | |
| parent | e4b31601431f022e9805a01e342f7e98ac43b18d (diff) | |
| download | emacs-6c6d2e33780af3c5a7150f7e0de11801ddf38b65.tar.gz emacs-6c6d2e33780af3c5a7150f7e0de11801ddf38b65.zip | |
*** empty log message ***
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 10 |
2 files changed, 10 insertions, 5 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-07-06 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * configure.in (HAVE_XPM): Check for XpmReturnAllocPixels | ||
| 4 | instead of XpmReadFileToPixmap. | ||
| 5 | |||
| 1 | 2000-07-05 Ken Raeburn <raeburn@gnu.org> | 6 | 2000-07-05 Ken Raeburn <raeburn@gnu.org> |
| 2 | 7 | ||
| 3 | * configure.in: Check for <soundcard.h>. Look for ossaudio | 8 | * configure.in: Check for <soundcard.h>. Look for ossaudio |
| @@ -4595,9 +4595,9 @@ rm -f conftest* | |||
| 4595 | fi | 4595 | fi |
| 4596 | if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | 4596 | if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then |
| 4597 | echo "$ac_t""yes" 1>&6 | 4597 | echo "$ac_t""yes" 1>&6 |
| 4598 | echo $ac_n "checking for XpmReadFileToPixmap in -lXpm""... $ac_c" 1>&6 | 4598 | echo $ac_n "checking for XpmReturnAllocPixels in -lXpm""... $ac_c" 1>&6 |
| 4599 | echo "configure:4600: checking for XpmReadFileToPixmap in -lXpm" >&5 | 4599 | echo "configure:4600: checking for XpmReturnAllocPixels in -lXpm" >&5 |
| 4600 | ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'` | 4600 | ac_lib_var=`echo Xpm'_'XpmReturnAllocPixels | sed 'y%./+-%__p_%'` |
| 4601 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | 4601 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
| 4602 | echo $ac_n "(cached) $ac_c" 1>&6 | 4602 | echo $ac_n "(cached) $ac_c" 1>&6 |
| 4603 | else | 4603 | else |
| @@ -4609,10 +4609,10 @@ cat > conftest.$ac_ext <<EOF | |||
| 4609 | /* Override any gcc2 internal prototype to avoid an error. */ | 4609 | /* Override any gcc2 internal prototype to avoid an error. */ |
| 4610 | /* We use char because int might match the return type of a gcc2 | 4610 | /* We use char because int might match the return type of a gcc2 |
| 4611 | builtin and then its argument prototype would still apply. */ | 4611 | builtin and then its argument prototype would still apply. */ |
| 4612 | char XpmReadFileToPixmap(); | 4612 | char XpmReturnAllocPixels(); |
| 4613 | 4613 | ||
| 4614 | int main() { | 4614 | int main() { |
| 4615 | XpmReadFileToPixmap() | 4615 | XpmReturnAllocPixels() |
| 4616 | ; return 0; } | 4616 | ; return 0; } |
| 4617 | EOF | 4617 | EOF |
| 4618 | if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | 4618 | if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |