Index: configure
===================================================================
--- configure	(revision 27349)
+++ configure   (working copy)
@@ -1409,9 +1417,7 @@
   _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
@@ -2300,6 +2306,12 @@
 _def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
 echores $extern_prefix
 
+# On OS/2, '-Zomf' affects both to compilation and to linkage.
+# So, we need to append '-Zomf' to '_ld_extra' after
+# 'extern symbol prefix' check.
+if os2 ; then
+  _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild"
+fi
 
 echocheck "assembler support of -pipe option"
 cat > $TMPC << EOF
@@ -7626,10 +7704,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"