cache results of Motif 2 and Motif-is-Lesstif tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fa1346df91
commit
72e4e6a397
31
configure.in
31
configure.in
@ -3165,7 +3165,9 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
|
|||||||
|
|
||||||
save_CFLAGS=$CFLAGS
|
save_CFLAGS=$CFLAGS
|
||||||
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
|
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
|
||||||
AC_MSG_CHECKING([for Motif 2])
|
|
||||||
|
AC_CACHE_CHECK([for Motif 2],
|
||||||
|
wx_cv_lib_motif2,
|
||||||
AC_TRY_COMPILE([
|
AC_TRY_COMPILE([
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
],
|
],
|
||||||
@ -3174,16 +3176,16 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
|
|||||||
Not Motif 2
|
Not Motif 2
|
||||||
#endif
|
#endif
|
||||||
],
|
],
|
||||||
[
|
wx_cv_lib_motif2="yes",
|
||||||
|
wx_cv_lib_motif2="no"))
|
||||||
|
if test "$wx_cv_lib_motif2" = "yes"; then
|
||||||
AC_DEFINE(__WXMOTIF20__,1)
|
AC_DEFINE(__WXMOTIF20__,1)
|
||||||
AC_MSG_RESULT([found])
|
else
|
||||||
],
|
|
||||||
[
|
|
||||||
AC_DEFINE(__WXMOTIF20__,0)
|
AC_DEFINE(__WXMOTIF20__,0)
|
||||||
AC_MSG_RESULT([not found])
|
fi
|
||||||
])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether Motif is Lesstif])
|
AC_CACHE_CHECK([whether Motif is Lesstif],
|
||||||
|
wx_cv_lib_lesstif,
|
||||||
AC_TRY_COMPILE([
|
AC_TRY_COMPILE([
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
],
|
],
|
||||||
@ -3192,14 +3194,15 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
|
|||||||
Not Lesstif
|
Not Lesstif
|
||||||
#endif
|
#endif
|
||||||
],
|
],
|
||||||
[
|
wx_cv_lib_lesstif="yes",
|
||||||
|
wx_cv_lib_lesstif="no")
|
||||||
|
)
|
||||||
|
if test "$wx_cv_lib_lesstif" = "yes"; then
|
||||||
AC_DEFINE(__WXLESSTIF__,1)
|
AC_DEFINE(__WXLESSTIF__,1)
|
||||||
AC_MSG_RESULT([yes])
|
else
|
||||||
],
|
|
||||||
[
|
|
||||||
AC_DEFINE(__WXLESSTIF__,0)
|
AC_DEFINE(__WXLESSTIF__,0)
|
||||||
AC_MSG_RESULT([no])
|
fi
|
||||||
])
|
|
||||||
CFLAGS=$save_CFLAGS
|
CFLAGS=$save_CFLAGS
|
||||||
|
|
||||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
|
GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
|
||||||
|
Loading…
Reference in New Issue
Block a user