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

Now configure actually finds Lesstif and Qt

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-08-06 17:03:46 +00:00
parent a1a2adef07
commit 496e3a4a03
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
install/unix/configure.in
View File

@@ -265,12 +265,16 @@ SEARCH_INCLUDE="\
\ \
/usr/include \ /usr/include \
/usr/local/include \ /usr/local/include \
/usr/local/include/gtk \
/usr/unsupported/include \ /usr/unsupported/include \
/usr/athena/include \ /usr/athena/include \
/usr/local/x11r5/include \ /usr/local/x11r5/include \
/usr/lpp/Xamples/include \ /usr/lpp/Xamples/include \
\ \
/usr/local/include/gtk \
/usr/X11R6/include/Xm \
/usr/X11/include/Xm \
/usr/include/qt \
\
/usr/openwin/include \ /usr/openwin/include \
/usr/openwin/share/include \ /usr/openwin/share/include \
" "
@@ -916,11 +920,11 @@ fi
if test "$USE_QT" = 1; then if test "$USE_QT" = 1; then
AC_MSG_CHECKING(for Qt includes) AC_MSG_CHECKING(for Qt includes)
AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,qt.h) AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,qapp.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)
AC_MSG_CHECKING(for Qt library) AC_MSG_CHECKING(for Qt library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Qt) AC_PATH_FIND_LIBRARIES($SEARCH_LIB,qt)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE) AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB) AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
@@ -933,7 +937,7 @@ if test "$USE_QT" = 1; then
else else
AC_MSG_ERROR(no) AC_MSG_ERROR(no)
fi fi
GUI_TK_LINK=-lXext -lX11 -lqt -lm GUI_TK_LINK="-lXext -lX11 -lqt -lm"
AC_DEFINE(__WXQT__) AC_DEFINE(__WXQT__)
TOOLKIT=QT TOOLKIT=QT
TOOLKIT_DEF=__WXQT__ TOOLKIT_DEF=__WXQT__
@@ -942,24 +946,24 @@ fi
if test "$USE_MOTIF" = 1; then if test "$USE_MOTIF" = 1; then
AC_MSG_CHECKING(for Motif/Lesstif includes) AC_MSG_CHECKING(for Motif/Lesstif includes)
AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,qt.h) AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,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)
AC_MSG_CHECKING(for Motif/Lesstif library) AC_MSG_CHECKING(for Motif or Lesstif library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm) AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE) AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB) AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link" CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include" CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
AC_MSG_RESULT(found Motif/Lesstif at $ac_find_libraries) AC_MSG_RESULT(found at $ac_find_libraries)
else else
AC_MSG_ERROR(no) AC_MSG_ERROR(no)
fi fi
else else
AC_MSG_ERROR(no) AC_MSG_ERROR(no)
fi fi
GUI_TK_LINK=-lXext -lX11 -lXm -lm GUI_TK_LINK="-lXext -lXt -lX11 -lXm -lm"
AC_DEFINE(__WXMOTIF__) AC_DEFINE(__WXMOTIF__)
TOOLKIT=MOTIF TOOLKIT=MOTIF
TOOLKIT_DEF=__WXMOTIF__ TOOLKIT_DEF=__WXMOTIF__