Switch from using 'nacl_main' to 'main' entry point

ports/fvwm/build.sh

 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 EXTRA_CONFIGURE_ARGS+=" --with-x"
 EXTRA_CONFIGURE_ARGS+=" --x-includes=${NACLPORTS_INCLUDE}"
 EXTRA_CONFIGURE_ARGS+=" --x-libraries=${NACLPORTS_LIBDIR}"
 EXTRA_CONFIGURE_ARGS+=" --with-bidi=no"
 EXTRA_CONFIGURE_ARGS+=" --with-gnome=no"
 EXTRA_CONFIGURE_ARGS+=" --disable-shm"
 
-NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"
-
 export ac_cv_func_setpgrp_void=no
 
 EXECUTABLES="\
   modules/FvwmIconMan/FvwmIconMan${NACL_EXEEXT} \
   modules/FvwmDragWell/FvwmDragWell${NACL_EXEEXT} \
   modules/FvwmScroll/FvwmScroll${NACL_EXEEXT} \
   modules/FvwmBacker/FvwmBacker${NACL_EXEEXT} \
   modules/FvwmSaveDesk/FvwmSaveDesk${NACL_EXEEXT} \
   modules/FvwmBanner/FvwmBanner${NACL_EXEEXT} \
   modules/FvwmAuto/FvwmAuto${NACL_EXEEXT} \
@@ skipping 15 matching lines @@
   modules/FvwmScript/FvwmScript${NACL_EXEEXT} \
   modules/FvwmWharf/FvwmWharf${NACL_EXEEXT} \
   modules/FvwmAnimate/FvwmAnimate${NACL_EXEEXT} \
   modules/FvwmEvent/FvwmEvent${NACL_EXEEXT} \
   modules/FvwmTheme/FvwmTheme${NACL_EXEEXT} \
   modules/FvwmM4/FvwmM4${NACL_EXEEXT} \
   fvwm/fvwm${NACL_EXEEXT} \
   bin/fvwm-root${NACL_EXEEXT}"
 
 NACLPORTS_LIBS+="\
-  -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau -lm ${NACL_CLI_MAIN_LIB}"
+  -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau -lm"
 
+EnableCliMain
 EnableGlibcCompat
 
 if [ "${TOOLCHAIN}" = "pnacl" ]; then
   NACLPORTS_CPPFLAGS+=" -Wno-return-type"
 fi
 
 InstallStep() {
   DefaultInstallStep
   # Remove dangling symlinks
   Remove ${DESTDIR}${PREFIX}/bin/fvwm2 ${DESTDIR}${PREFIX}/bin/xpmroot
 }