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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index e79cc2618f7c4d4ce791ce025caad2d73f42e23f..7c50e2ddb487ec74ae81f997bc2103505255e97d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
 #! /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>.
 #
 #
 # 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'
 # 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"
 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
   # 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]...
 
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 


@@ -860,7 +860,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
 
 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
 
    esac
   cat <<\_ACEOF
 


@@ -1195,7 +1195,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 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.
 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.
 
 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 $@
 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_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
 
 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_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
 

-WX_CURRENT=4
+WX_CURRENT=5

 WX_REVISION=0
 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
        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
         ;;
   *)
       fi
         ;;
   *)


@@ -43875,7 +43875,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
 } >&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
 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="\\
 
 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'`\\"
 
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index d78709f5fcb7f1d33f64b8b1a4f710e55aa006ab..aad49573a189a5bf5b1557b36e9f03350c24566c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1622,7 +1622,7 @@ case "${host}" in
        enable_omf=yes
       fi
       if test "$wxUSE_OMF" = "yes"; then
        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)
   ;;
       fi
       dnl (end of OS/2-only piece)
   ;;