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

make it clear which GL(U) library we can't find in error messages, otherwise the user has no idea what exactly failed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-27 16:12:13 +00:00
parent 4811590bb5
commit 69120ee48a
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@@ -3628,6 +3628,7 @@ echo "${ECHO_T}no" >&6
fi
if test "$USE_OS2" = "1"; then
DEFAULT_wxUSE_OMF=no
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
@@ -13357,8 +13358,8 @@ fi
else
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi
echo "$as_me:$LINENO: checking for gcc version" >&5
echo $ECHO_N "checking for gcc version... $ECHO_C" >&6
echo "$as_me:$LINENO: checking for gcc/libc version" >&5
echo $ECHO_N "checking for gcc/libc version... $ECHO_C" >&6
if test "${wx_cv_gccversion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13437,9 +13438,6 @@ echo "${ECHO_T}$wx_cv_gccversion" >&6
echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
wxUSE_OMF=yes
enable_omf=yes
fi
if test "$wxUSE_OMF" = "yes"; then
LDFLAGS="$LDFLAGS -Zomf -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
fi
;;
*)
@@ -28981,6 +28979,9 @@ for ac_dir in $SEARCH_LIB /usr/lib;
done
if test "$ac_find_libraries" != "" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
result=$?
@@ -28994,6 +28995,8 @@ for ac_dir in $SEARCH_LIB /usr/lib;
LDFLAGS_GL="$ac_path_to_link"
fi
echo "$as_me:$LINENO: checking for -lGLU" >&5
echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6
ac_find_libraries=
for ac_dir in $SEARCH_LIB /usr/lib;
@@ -29025,12 +29028,16 @@ for ac_dir in $SEARCH_LIB /usr/lib;
OPENGL_LIBS="-lGL -lGLU"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
if test "$found_gl" != 1; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
echo "$as_me:$LINENO: checking for -lMesaGL" >&5
echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6
@@ -43113,6 +43120,15 @@ else
EXE_LINKER="$CXX -o"
fi
if test "$wxUSE_OMF" = "yes"; then
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
LDFLAGS="$LDFLAGS -Zlinker /EXEPACK"
LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
;;
esac
fi
GCC_PRAGMA_FLAGS=""
PCH_FLAGS=""

8
configure.in
View File

@@ -3296,6 +3296,8 @@ if test "$wxUSE_OPENGL" = "yes"; then
AC_MSG_CHECKING([for -lGL])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
if test "$ac_find_libraries" != "" ; then
AC_MSG_RESULT([yes])
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
if test "$ac_path_to_link" != " -L/usr/lib" ; then
LDFLAGS_GL="$ac_path_to_link"
@@ -3304,6 +3306,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
dnl don't suppose that libGL and libGLU are always in the
dnl same directory -- this is not true for some common
dnl distributions
AC_MSG_CHECKING([for -lGLU])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
@@ -3315,11 +3318,14 @@ if test "$wxUSE_OPENGL" = "yes"; then
found_gl=1
OPENGL_LIBS="-lGL -lGLU"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
else
AC_MSG_RESULT([no])
fi
if test "$found_gl" != 1; then
AC_MSG_RESULT([no])
AC_MSG_CHECKING([for -lMesaGL])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
if test "$ac_find_libraries" != "" ; then