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

move addition of -lX11 to better place

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2011-09-06 16:35:53 +00:00
parent 527479c46e
commit fb6e5bff0e
2 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
configure vendored
View File

@ -24801,13 +24801,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h> /* for off_t */
#include <stdio.h>
#include <stdio.h>
int
main ()
{
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
@ -24847,13 +24845,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
#include <sys/types.h> /* for off_t */
#include <stdio.h>
#include <stdio.h>
int
main ()
{
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
@ -29722,7 +29718,6 @@ if test "$wxUSE_GUI" = "yes"; then
GUI_TK_LIBRARY=
WXGTK12=
WXGTK127=
WXGTK2=
WXGPE=
@ -30095,8 +30090,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
rm -f conf.gtktest
GTK_LIBS="$GTK_LIBS -lX11"
fi
if test -z "$wx_cv_lib_gtk"; then
@ -30756,6 +30749,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
if test -z "$wx_cv_lib_gtk"; then
wx_cv_lib_gtk=none
else
GTK_LIBS="$GTK_LIBS -lX11"
wx_cv_cflags_gtk=$GTK_CFLAGS
wx_cv_libs_gtk=$GTK_LIBS
fi
@ -30774,10 +30769,8 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6; }
TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
WXGTK12=1
;;
1.2.3) WXGTK12=1
;;
1.2*) ;;
*) { { echo "$as_me:$LINENO: error:
The development files for GTK+ were not found. For GTK+ 2, please
ensure that pkg-config is in the path and that gtk+-2.0.pc is
@ -31184,9 +31177,6 @@ done
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
AFMINSTALL=afminstall
TOOLKIT=GTK
GUIDIST=GTK_DIST
@ -42969,14 +42959,6 @@ fi
if test "$WXGTK2" = 1 ; then
cat >>confdefs.h <<_ACEOF
#define __WXGTK20__ $WXGTK2
_ACEOF
WXGTK12=1
fi
if test "$WXGTK12" = 1 ; then
cat >>confdefs.h <<_ACEOF
#define __WXGTK12__ $WXGTK12
_ACEOF
fi
@ -43016,6 +42998,8 @@ if test "$wxUSE_DEBUG_FLAG" = "no" ; then
if test "$wxUSE_GTK" = 1 ; then
if test "x$wxGTK_VERSION" = "x1" ; then
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
else
CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
fi
fi
fi
@ -47281,14 +47265,6 @@ _ACEOF
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then
{ echo "$as_me:$LINENO: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&5
echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&2;}
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
"$wxUSE_DFB" = 1; then
{ echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5

7
configure.in
View File

@ -2963,9 +2963,6 @@ if test "$wxUSE_GUI" = "yes"; then
esac
AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
dnl we use symbols from X11 directly so we should link with it
GTK_LIBS="$GTK_LIBS -lX11"
fi
dnl detect GTK1.x
@ -2983,6 +2980,9 @@ if test "$wxUSE_GUI" = "yes"; then
dnl looks better in AC_MSG_RESULT
wx_cv_lib_gtk=none
else
dnl we use symbols from X11 directly so we should link with it
GTK_LIBS="$GTK_LIBS -lX11"
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
dnl subsequent runs
wx_cv_cflags_gtk=$GTK_CFLAGS
@ -3108,7 +3108,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
AFMINSTALL=afminstall
TOOLKIT=GTK
GUIDIST=GTK_DIST