Index: configure
===================================================================
--- configure	(revision 27349)
+++ configure	(working copy)
@@ -1409,9 +1417,6 @@
   _exesuf=".exe"
   _getch=getch2-os2.c
   _need_shmem=no
-  _ar="emxomfar -p256"
-  _ranlib="echo ignoring ranlib"
-  _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild -lmmpm2"
 fi
 
 for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
@@ -7626,10 +7696,6 @@
 if cygwin ; then
   CFLAGS="$CFLAGS -D__CYGWIN__"
 fi
-if os2 ; then
-  CFLAGS="$CFLAGS -Zomf"
-  ASFLAGS="$ASFLAGS -Zomf"
-fi
 # 64 bit file offsets?
 if test "$_largefiles" = yes || freebsd ; then
   CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -7697,6 +7763,11 @@
 fi
 echores "$_dvdnav"
 
+# Finalize OS/2 setup
+if os2 ; then
+  _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild"
+fi
+
 #############################################################################
 echo "Creating config.mak"
 cat > config.mak << EOF
@@ -7739,7 +7819,6 @@
 LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
 CFLAG_DHAHELPER = $cflag_dhahelper
 CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper
-ASFLAGS = $ASFLAGS
 
 EXTRALIBS = $_extra_libs
 EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm