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

Ensure -D_FILE_OFFSET_BITS=64 also gets on the command line when

Browse Source 
needed, and also fix wx-config to output the largefile flags


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-09-05 20:12:08 +00:00
parent ae31cc57f7
commit e26c13cffd
3 changed files with 449 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

877
configure vendored
View File

File diff suppressed because it is too large Load Diff

12
configure.in
View File

@@ -1469,11 +1469,12 @@ dnl wx/defs.h which defines these constants leading to inconsistent
dnl sizeof(off_t) in different source files of the same program and linking dnl sizeof(off_t) in different source files of the same program and linking
dnl problems dnl problems
if test "x$wx_largefile" = "xyes"; then if test "x$wx_largefile" = "xyes"; then
if test "x$ac_cv_sys_file_offset_bits" = "xyes"; then if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" WX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
else else
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES" WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
fi fi
CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
fi fi
dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling) dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
@@ -2337,7 +2338,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
for libp in "" " -lXp"; do for libp in "" " -lXp"; do
if test "$libs_found" = "0"; then if test "$libs_found" = "0"; then
for libsm_ice in " -lSM -lICE"; do for libsm_ice in " -lSM -lICE"; do
if test "$libs_found" = "0"; then if test "$libs_found" = "0"; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
@@ -4221,7 +4222,7 @@ fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
dnl There is now experimental generic MDI support dnl There is now experimental generic MDI support
dnl if test "$wxUSE_UNIVERSAL" = "yes"; then dnl if test "$wxUSE_UNIVERSAL" = "yes"; then
dnl AC_MSG_WARN(MDI not yet supported for wxUniversal... disabled) dnl AC_MSG_WARN(MDI not yet supported for wxUniversal... disabled)
dnl wxUSE_MDI_ARCHITECTURE=no dnl wxUSE_MDI_ARCHITECTURE=no
@@ -5089,6 +5090,7 @@ AC_SUBST(WXCONFIG_LIBS_STATIC)
AC_SUBST(WXCONFIG_LIBS_STATIC_GL) AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
AC_SUBST(WXCONFIG_INCLUDE) AC_SUBST(WXCONFIG_INCLUDE)
AC_SUBST(WXCONFIG_RPATH) AC_SUBST(WXCONFIG_RPATH)
AC_SUBST(WX_LARGEFILE_FLAGS)
dnl the list of files to compile/install dnl the list of files to compile/install
AC_SUBST(ALL_OBJECTS) AC_SUBST(ALL_OBJECTS)

4
wx-config.in
View File

@@ -42,9 +42,9 @@ cppflags()
includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes" includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
if test $static_flag = yes ; then if test $static_flag = yes ; then
echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ @WX_LARGEFILE_FLAGS@
else else
echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@ echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@ @WX_LARGEFILE_FLAGS@
fi fi
} }