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

don't include X11 path before our own -I because on some systems (FreeBSD) wx headers are installed under /usr/X11R6/include

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-19 17:30:04 +00:00
parent 12232f37d1
commit d714471b30
2 changed files with 353 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

699
configure vendored
View File

File diff suppressed because it is too large Load Diff

15
configure.in
View File

@@ -1844,16 +1844,11 @@ equivalent variable and GTK+ is version 1.2.3 or above.
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
fi fi
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 the path to the X headers/libs is not only needed for motif, but also
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 "$wxUSE_MOTIF" = 1; then
dnl use standard macros to check for X headers/libs, this brings support
dnl for the standard configure options --x-includes and --x-libraries
AC_PATH_XTRA
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
@@ -4467,7 +4462,7 @@ dnl makefile system without libtool
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
dnl all -I options we must pass to the compiler dnl all -I options we must pass to the compiler
INCLUDES="-I. -I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
$FREETYPE_INCLUDE $TOOLKIT_INCLUDE" $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"