[fluid-dev] [PATCH] some build system fixes for OS/2

[KO Myung-Hun]

Hi/2.

These patches consist of the following two parts.

1. configure.diff
os2me.h has a type, VERSION. This causes a name clash with VERSION macro
in confdefs.h, so check fails.
To avoid this problem, check just the existence of os2me.h.

2. cmake.diff
CMAKE_SYSTEM for OS/2 contains OS2 not os2.
-no-undefined is not an valid argument for linker on OS/2.

-- 
KO Myung-Hun

Using Mozilla SeaMonkey 2.0.9
Under OS/2 Warp 4 for Korean with FixPak #15
On AMD ThunderBird 1GHz with 512 MB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr


Index: configure.ac
===================================================================
--- configure.ac	(revision 393)
+++ configure.ac	(working copy)
@@ -355,7 +355,7 @@
 dnl
 dnl - Check support for DART
 dnl
-AC_CHECK_HEADER(os2me.h, DART_FOUND="yes", DART_FOUND="no")
+AC_CHECK_HEADER(os2me.h, DART_FOUND="yes", DART_FOUND="no", -)
 AC_ARG_ENABLE(dart, AS_HELP_STRING([--disable-dart],
     [disable DART support (default=auto)]),
   enable_dart=$enableval, enable_dart="yes")


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 393)
+++ CMakeLists.txt	(working copy)
@@ -80,9 +80,9 @@
     option ( enable-framework "create a Mac OSX style FluidSynth.framework" on )
 endif ( ${CMAKE_SYSTEM} MATCHES "Darwin" )

-if ( ${CMAKE_SYSTEM} MATCHES "os2" )
+if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
     option ( enable-dart "compile DART support (if it is available)" on )
-endif ( ${CMAKE_SYSTEM} MATCHES "os2" )
+endif ( ${CMAKE_SYSTEM} MATCHES "OS2" )

 # Initialize the library directory name suffix.
 if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
@@ -133,12 +133,12 @@

 # Options for the GNU C compiler only
 if ( CMAKE_COMPILER_IS_GNUCC )
-  if ( NOT APPLE )
+  if ( NOT APPLE AND NOT OS2 )
     set ( CMAKE_EXE_LINKER_FLAGS
           "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
     set ( CMAKE_SHARED_LINKER_FLAGS
           "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
-  endif ( NOT APPLE )
+  endif ( NOT APPLE AND NOT OS2 )
   set ( GNUCC_WARNING_FLAGS "-Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter -Wno-cast-qual")
   set ( CMAKE_C_FLAGS_DEBUG "-g -DDEBUG ${GNUCC_WARNING_FLAGS}" )
   set ( CMAKE_C_FLAGS_RELEASE "-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
@@ -176,15 +176,15 @@
 unset ( DART_SUPPORT CACHE )
 unset ( DART_LIBS CACHE )
 unset ( DART_INCLUDE_DIRS CACHE )
-if ( ${CMAKE_SYSTEM} MATCHES "os2" )
+if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
   set ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zbin-files" )
-  set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Zbin-files -no-undefined" )
+  set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Zbin-files" )
   if ( enable-dart )
     check_include_file ( os2me.h HAVE_DART_H )
     set ( DART_SUPPORT ${HAVE_DART_H} )
     unset ( DART_INCLUDE_DIRS CACHE )
   endif ( enable-dart )
-endif ( ${CMAKE_SYSTEM} MATCHES "os2" )
+endif ( ${CMAKE_SYSTEM} MATCHES "OS2" )

 # Solaris / SunOS
 if ( ${CMAKE_SYSTEM} MATCHES "SunOS" )

_______________________________________________
fluid-dev mailing list
fluid-dev@nongnu.org
http://lists.nongnu.org/mailman/listinfo/fluid-dev