aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-07-06 16:09:00 +0000
committerGerd Moellmann2000-07-06 16:09:00 +0000
commit6c6d2e33780af3c5a7150f7e0de11801ddf38b65 (patch)
treee8fe5955407dc376c22a7c5eaf769a39a505814c
parente4b31601431f022e9805a01e342f7e98ac43b18d (diff)
downloademacs-6c6d2e33780af3c5a7150f7e0de11801ddf38b65.tar.gz
emacs-6c6d2e33780af3c5a7150f7e0de11801ddf38b65.zip
*** empty log message ***
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 53c3afeab2a..f367e8a379a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12000-07-06 Gerd Moellmann <gerd@gnu.org>
2
3 * configure.in (HAVE_XPM): Check for XpmReturnAllocPixels
4 instead of XpmReadFileToPixmap.
5
12000-07-05 Ken Raeburn <raeburn@gnu.org> 62000-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
diff --git a/configure b/configure
index b871a509ede..6cd29048b7d 100755
--- a/configure
+++ b/configure
@@ -4595,9 +4595,9 @@ rm -f conftest*
4595fi 4595fi
4596if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 4596if 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
4599echo "configure:4600: checking for XpmReadFileToPixmap in -lXpm" >&5 4599echo "configure:4600: checking for XpmReturnAllocPixels in -lXpm" >&5
4600ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'` 4600ac_lib_var=`echo Xpm'_'XpmReturnAllocPixels | sed 'y%./+-%__p_%'`
4601if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 4601if 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
4603else 4603else
@@ -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. */
4612char XpmReadFileToPixmap(); 4612char XpmReturnAllocPixels();
4613 4613
4614int main() { 4614int main() {
4615XpmReadFileToPixmap() 4615XpmReturnAllocPixels()
4616; return 0; } 4616; return 0; }
4617EOF 4617EOF
4618if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 4618if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then