Ticket #8789: scummvm_beos.3.patch

(a) configure vs. (b) configure_beos

@@ -961 +961 @@
 echo_n "Checking hosttype... "
 echo $_host_os
 case $_host_os in
-        linux* | uclinux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* | beos*)
+        linux* | uclinux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux*)
                 DEFINES="$DEFINES -DUNIX"
                 ;;
+        beos*)
+                DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+                LIBS="$LIBS -lbind -lsocket"
+                type_1_byte='char'
+                type_2_byte='short'
+                type_4_byte='long'
+                ;;      
         solaris*)
                 DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
                 ;;
@@ -1272 +1279 @@
 fi
 
 #
+# Check for math lib
+cc_check $LDFLAGS $CXXFLAGS -lm && LDFLAGS="$LDFLAGS -lm"
+#
+
+#
 # Check for Ogg Vorbis
 #
 echocheck "Ogg Vorbis"
@@ -1282 +1294 @@
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
         cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
-                -lvorbisfile -lvorbis -logg -lm && _vorbis=yes
+                -lvorbisfile -lvorbis -logg && _vorbis=yes
 fi
 if test "$_vorbis" = yes ; then
         _def_vorbis='#define USE_VORBIS'
@@ -1334 +1346 @@
 int main(void) { return FLAC__STREAM_SYNC_LEN >> 30; /* guaranteed to be 0 */ }
 EOF
         cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \
-                -lFLAC -logg -lm && _flac=yes
+                -lFLAC -logg && _flac=yes
 fi
 if test "$_flac" = yes ; then
         _def_flac='#define USE_FLAC'