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

configure fix for OS/2 from Dave Parsons and David Webster

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-03-25 16:32:45 +00:00
parent 7e02769822
commit 63c4f6da73
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.5.4.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.5.5.
#
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
PACKAGE_VERSION='2.5.4'
PACKAGE_STRING='wxWidgets 2.5.4'
PACKAGE_VERSION='2.5.5'
PACKAGE_STRING='wxWidgets 2.5.5'
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
ac_unique_file="wx-config.in"
@@ -794,7 +794,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures wxWidgets 2.5.4 to adapt to many kinds of systems.
\`configure' configures wxWidgets 2.5.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -860,7 +860,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wxWidgets 2.5.4:";;
short | recursive ) echo "Configuration of wxWidgets 2.5.5:";;
esac
cat <<\_ACEOF
@@ -1195,7 +1195,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
wxWidgets configure 2.5.4
wxWidgets configure 2.5.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1209,7 +1209,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by wxWidgets $as_me 2.5.4, which was
It was created by wxWidgets $as_me 2.5.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1660,8 +1660,8 @@ test -n "$target_alias" &&
wx_major_version_number=2
wx_minor_version_number=5
wx_release_number=4
wx_subrelease_number=2
wx_release_number=5
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -1669,9 +1669,9 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
WX_CURRENT=4
WX_CURRENT=5
WX_REVISION=0
WX_AGE=4
WX_AGE=5
@@ -13435,7 +13435,7 @@ echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
enable_omf=yes
fi
if test "$wxUSE_OMF" = "yes"; then
LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
LDFLAGS="$LDFLAGS -Zomf -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
fi
;;
*)
@@ -43875,7 +43875,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by wxWidgets $as_me 2.5.4, which was
This file was extended by wxWidgets $as_me 2.5.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -43938,7 +43938,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
wxWidgets config.status 2.5.4
wxWidgets config.status 2.5.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

2
configure.in
View File

@@ -1622,7 +1622,7 @@ case "${host}" in
enable_omf=yes
fi
if test "$wxUSE_OMF" = "yes"; then
LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
LDFLAGS="$LDFLAGS -Zomf -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
fi
dnl (end of OS/2-only piece)
;;