Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manually test for X11 headers/libs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-14 15:43:11 +00:00
parent 9e92b089c0
commit d607e6c39d
2 changed files with 420 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1570
configure vendored
View File

File diff suppressed because it is too large Load Diff

36
configure.in
View File

@@ -1603,18 +1603,30 @@ if test "$wxUSE_WINE" = 1; then
fi fi
if test "$wxUSE_MOTIF" = 1; then if test "$wxUSE_MOTIF" = 1; then
dnl find the X11 include and library files AC_MSG_CHECKING(for X11 headers)
dnl defines x_includes and x_libraries WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h)
AC_PATH_XTRA if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes)
if test "$no_x" = "yes"; then else
AC_MSG_ERROR(X11 libraries not found, aborting) AC_MSG_RESULT(no)
AC_MSG_ERROR(please set CFLAGS to contain the location of Xm/Xm.h)
fi fi
TOOLKIT_INCLUDE="$X_CFLAGS" AC_MSG_CHECKING(for X11 libraries)
GUI_TK_LIBRARY="$X_LIBS" WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11)
if test "$ac_find_libraries" != "" ; then
WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
AC_MSG_CHECKING(for Motif/Lesstif includes) GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
AC_MSG_RESULT(found at $ac_find_libraries)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm)
fi
AC_MSG_CHECKING(for Motif/Lesstif headers)
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
if test "$ac_find_includes" != "" ; then if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes) AC_MSG_RESULT(found $ac_find_includes)
@@ -1629,7 +1641,7 @@ if test "$wxUSE_MOTIF" = 1; then
WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found at $ac_find_libraries)
else else
@@ -1641,7 +1653,7 @@ if test "$wxUSE_MOTIF" = 1; then
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found at $ac_find_libraries)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@@ -1653,7 +1665,7 @@ if test "$wxUSE_MOTIF" = 1; then
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
XPM_LINK="-lXpm " XPM_LINK="-lXpm "
AC_DEFINE(wxHAVE_LIB_XPM) AC_DEFINE(wxHAVE_LIB_XPM)
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found at $ac_find_libraries)