Moved OS/2 specific library check to a different location:
- after "Checks for programs", so newer autoconf version will be happy. - still before "Check for headers" as this is necessary! git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
42
configure.in
42
configure.in
@@ -1130,27 +1130,6 @@ else
|
|||||||
AC_MSG_RESULT(base ($host_alias hosted) only)
|
AC_MSG_RESULT(base ($host_alias hosted) only)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
|
||||||
dnl When we are using gcc on OS/2, we want to be either using resources (PM)
|
|
||||||
dnl or a more complete POSIX emulation for Motif/GTK+/X11
|
|
||||||
dnl ---------------------------------------------------------------------------
|
|
||||||
dnl (OS/2-only piece)
|
|
||||||
case "${host}" in
|
|
||||||
*-pc-os2_emx | *-pc-os2-emx )
|
|
||||||
dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
|
|
||||||
LIBS="$LIBS -lstdcpp"
|
|
||||||
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
|
|
||||||
dnl More complete Unix emulation for unix-like ports
|
|
||||||
dnl by linking in POSIX/2's cExt (if available).
|
|
||||||
AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
|
|
||||||
else
|
|
||||||
dnl Include resources for the "native" port (wxPM).
|
|
||||||
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
dnl (end of OS/2-only piece)
|
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl When we are using Cygwin with Motif/GTK+, we want it to appear like
|
dnl When we are using Cygwin with Motif/GTK+, we want it to appear like
|
||||||
dnl 'just' a POSIX platform, so the Win32 API must not be available
|
dnl 'just' a POSIX platform, so the Win32 API must not be available
|
||||||
@@ -1360,6 +1339,27 @@ AC_PROG_LEX
|
|||||||
dnl needed for making link to setup.h
|
dnl needed for making link to setup.h
|
||||||
AC_PROG_LN_S
|
AC_PROG_LN_S
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl When we are using gcc on OS/2, we want to be either using resources (PM)
|
||||||
|
dnl or a more complete POSIX emulation for Motif/GTK+/X11
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl (OS/2-only piece)
|
||||||
|
case "${host}" in
|
||||||
|
*-pc-os2_emx | *-pc-os2-emx )
|
||||||
|
dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
|
||||||
|
LIBS="$LIBS -lstdcpp"
|
||||||
|
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
|
||||||
|
dnl More complete Unix emulation for unix-like ports
|
||||||
|
dnl by linking in POSIX/2's cExt (if available).
|
||||||
|
AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
|
||||||
|
else
|
||||||
|
dnl Include resources for the "native" port (wxPM).
|
||||||
|
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
dnl (end of OS/2-only piece)
|
||||||
|
|
||||||
dnl ------------------------------------------------------------------------
|
dnl ------------------------------------------------------------------------
|
||||||
dnl Check for headers
|
dnl Check for headers
|
||||||
dnl ------------------------------------------------------------------------
|
dnl ------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user