From 9800b84d45e168d638a3e5aa1c02077cbcc45d6b Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Sun, 19 Mar 2006 10:48:50 +0000 Subject: [PATCH] Some configure changes for OS2 Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2550 --- configure.in | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index e8daf184..98f4be75 100644 --- a/configure.in +++ b/configure.in @@ -19,6 +19,14 @@ AC_PROG_CXX AC_PROG_INSTALL AC_PROG_RANLIB +dnl Some needed libaries for OS2 +dnl perharps join this with the other host depended checks. move them upwards +if test x$target = xi386-pc-os2-emx ; then + CXXFLAGS="$CXXFLAGS -Zmt" + LDFLAGS="$LDFLAGS -Zomf -Zmt" + LIBS="$LIBS -los2me" +fi + dnl Check for SDL SDL_VERSION=1.2.0 AM_PATH_SDL($SDL_VERSION, @@ -204,7 +212,21 @@ fi AH_TEMPLATE(C_MODEM,[Define to 1 to enable internal modem support, requires SDL_net]) AH_TEMPLATE(C_IPX,[Define to 1 to enable IPX over Internet networking, requires SDL_net]) AC_CHECK_HEADER(SDL_net.h,have_sdl_net_h=yes,) + +if test x$target = xi386-pc-os2-emx ; then + AC_MSG_CHECKING(for SDLNet_Init in SDL_net); + LIBS_BACKUP=$LIBS; + LIBS="$LIBS -lSDL_Net"; + AC_LINK_IFELSE([ + #include + int main(int argc,char * argv[]) { + return SDLNet_Init (); + }; + ], [AC_MSG_RESULT(yes); have_sdl_net_lib=yes], AC_MSG_RESULT(no)) + LIBS=$LIBS_BACKUP +else AC_CHECK_LIB(SDL_net, SDLNet_Init, have_sdl_net_lib=yes, , ) +fi if test x$have_sdl_net_lib = xyes -a x$have_sdl_net_h = xyes ; then LIBS="$LIBS -lSDL_net" AC_DEFINE(C_MODEM,1) @@ -268,7 +290,7 @@ case "$target" in *-*-cygwin* | *-*-mingw32*) LIBS="$LIBS -lwinmm" AC_CHECK_HEADERS(ddraw.h) - AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32 only).]) + AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32 and OS/2 only).]) ;; *-*-darwin*) dnl We have a problem here: both MacOS X and Darwin report @@ -281,6 +303,10 @@ case "$target" in *-*-linux-gnu*) AC_DEFINE(LINUX, 1, [Compiling on GNU/Linux]) ;; + *-*-os2-emx*) + AC_DEFINE(OS2, 1, [Compiling on OS/2 EMX]) + AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32 and OS/2 only).]) + ;; esac dnl Some stuff for the icon.