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

moved check for x include/library paths from motif configuration section to main scope of confiure.in; added opengl libs to freebsd target if configured with opengl support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (NI)
2000-07-21 10:37:26 +00:00
parent 919ae91ad7
commit 264de0cc03
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.in
View File

@@ -1701,13 +1701,18 @@ if test "$wxUSE_WINE" = 1; then
GUIDIST=MSW_DIST GUIDIST=MSW_DIST
fi fi
if test "$wxUSE_MOTIF" = 1; then dnl use standard macros to check for X headers/libs, this brings support
dnl use standard macros to check for X headers/libs, this brings support dnl for the standard configure options --x-includes and --x-libraries;
dnl for the standard configure options --x-includes and --x-libraries dnl the path to the X headers/libs is not only needed for motif, but also
AC_PATH_XTRA dnl by the OpenGL and XKBlib.h checks further down
AC_PATH_XTRA
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
if test "$wxUSE_MOTIF" = 1; then
if test "$no_x" = "yes"; then if test "$no_x" = "yes"; then
AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options) AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
fi fi
GUI_TK_LIBRARY="$X_LIBS" GUI_TK_LIBRARY="$X_LIBS"
@@ -2098,8 +2103,13 @@ if test "$wxUSE_SHARED" = "yes"; then
*-*-freebsd* | *-*-netbsd*) *-*-freebsd* | *-*-netbsd*)
SHARED_LD="${CC} -shared -o" SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC" PIC_FLAG="-fPIC"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL="CREATE_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
else
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
;; ;;
*-*-osf* ) *-*-osf* )
SHARED_LD="${CXX} -shared -o" SHARED_LD="${CXX} -shared -o"