Mercurial > hg > xemacs-beta

comparison configure.ac @ 2694:296a5cd2a686

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-03-27 04:21:07 by james] Fix configure's test for XawInit.h. See the xemacs-patches message with ID <pshdjcx0x9.fsf@diannao.ittc.ku.edu>.
author james
date Sun, 27 Mar 2005 04:21:09 +0000
parents 7be4146ed65e
children 2b621542ba7a
comparison
equal deleted inserted replaced
2693:f2018e8a7078 2694:296a5cd2a686
3926 if test "$athena_3d" = "no"; then 3926 if test "$athena_3d" = "no"; then
3927 AC_CHECK_HEADER(X11/Xaw/ThreeD.h, 3927 AC_CHECK_HEADER(X11/Xaw/ThreeD.h,
3928 [AC_MSG_WARN([Could not find a non-3d Athena header set.])], 3928 [AC_MSG_WARN([Could not find a non-3d Athena header set.])],
3929 [AC_CHECK_HEADER(X11/Xaw/XawInit.h, 3929 [AC_CHECK_HEADER(X11/Xaw/XawInit.h,
3930 [athena_h_path=X11/Xaw], 3930 [athena_h_path=X11/Xaw],
3931 [AC_MSG_WARN([Could not find a non-3d Athena header set.])])]) 3931 [AC_MSG_WARN([Could not find a non-3d Athena header set.])],
3932 [
3933 #include <X11/Intrinsic.h>
3934 ])])
3932 else 3935 else
3933 dnl The three-d Athena headers are so much more slippery. 3936 dnl The three-d Athena headers are so much more slippery.
3934 dnl Curse this `Lets replace standard libraries' thing that they did. :/ 3937 dnl Curse this `Lets replace standard libraries' thing that they did. :/
3935 AC_CHECK_HEADER(X11/$athena_variant/XawInit.h, 3938 AC_CHECK_HEADER(X11/$athena_variant/XawInit.h,
3936 [AC_CHECK_HEADER(X11/$athena_variant/ThreeD.h, 3939 [AC_CHECK_HEADER(X11/$athena_variant/ThreeD.h,
3937 [athena_h_path=X11/$athena_variant])],[], 3940 [athena_h_path=X11/$athena_variant])],[],
3938 [ 3941 [
3939 #if HAVE_X11_XFUNCPROTO_H 3942 #if HAVE_X11_XFUNCPROTO_H
3940 #include <X11/Xfuncproto.h> 3943 #include <X11/Xfuncproto.h>
3941 #endif 3944 #endif
3945 #include <X11/Intrinsic.h.>
3942 ]) 3946 ])
3943 3947
3944 dnl Is the variant specific header directory directly under include? 3948 dnl Is the variant specific header directory directly under include?
3945 if test -z "$athena_h_path"; then 3949 if test -z "$athena_h_path"; then
3946 AC_CHECK_HEADER($athena_variant/XawInit.h, 3950 AC_CHECK_HEADER($athena_variant/XawInit.h,
3948 athena_h_path=$athena_variant)],[], 3952 athena_h_path=$athena_variant)],[],
3949 [ 3953 [
3950 #if HAVE_X11_XFUNCPROTO_H 3954 #if HAVE_X11_XFUNCPROTO_H
3951 #include <X11/Xfuncproto.h> 3955 #include <X11/Xfuncproto.h>
3952 #endif 3956 #endif
3957 #include <X11/Intrinsic.h>
3953 ]) 3958 ])
3954 fi 3959 fi
3955 3960
3956 dnl If we couldn't find the specific variant, try the generic Athena 3d headers 3961 dnl If we couldn't find the specific variant, try the generic Athena 3d headers
3957 if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then 3962 if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
3963 ])],[], 3968 ])],[],
3964 [ 3969 [
3965 #if HAVE_X11_XFUNCPROTO_H 3970 #if HAVE_X11_XFUNCPROTO_H
3966 #include <X11/Xfuncproto.h> 3971 #include <X11/Xfuncproto.h>
3967 #endif 3972 #endif
3973 #include <X11/Intrinsic.h>
3968 ]) 3974 ])
3969 fi 3975 fi
3970 3976
3971 dnl Also generic 3d headers directly under include dir 3977 dnl Also generic 3d headers directly under include dir
3972 if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then 3978 if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
3978 ])],[], 3984 ])],[],
3979 [ 3985 [
3980 #if HAVE_X11_XFUNCPROTO_H 3986 #if HAVE_X11_XFUNCPROTO_H
3981 #include <X11/Xfuncproto.h> 3987 #include <X11/Xfuncproto.h>
3982 #endif 3988 #endif
3989 #include <X11/Intrinsic.h>
3983 ]) 3990 ])
3984 fi 3991 fi
3985 3992
3986 dnl If nothing yet found, see if Xaw is a 3d header set... 3993 dnl If nothing yet found, see if Xaw is a 3d header set...
3987 dnl We AC_MSG_WARN if we fail because I am all out of ideas... 3994 dnl We AC_MSG_WARN if we fail because I am all out of ideas...