From 10ebe98376712ad635767a7845c2207f836e4ad3 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Wed, 13 Feb 2013 18:03:58 -0800
Subject: [PATCH] switch to c++11 and add option parsing library

---
 configure         | 2 +-
 configure.ac      | 2 +-
 fesvr/fesvr.mk.in | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 8efa124..45f8bbd 100755
--- a/configure
+++ b/configure
@@ -2964,7 +2964,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CXXFLAGS="-Wall -g -O3"
+CXXFLAGS="-std=c++0x -Wall -g -O3"
 
 
 # Check for tools to build libraries
diff --git a/configure.ac b/configure.ac
index 163666f..8dd8f05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_SUBST([CFLAGS],["-Wall -g -O3"])
 
 # Check for C++ compiler and set default C++ compiler flags
 AC_PROG_CXX
-AC_SUBST([CXXFLAGS],["-Wall -g -O3"])
+AC_SUBST([CXXFLAGS],["-std=c++0x -Wall -g -O3"])
 
 # Check for tools to build libraries
 AC_CHECK_TOOL([AR],[ar])
diff --git a/fesvr/fesvr.mk.in b/fesvr/fesvr.mk.in
index a2a80b7..a4ab12a 100644
--- a/fesvr/fesvr.mk.in
+++ b/fesvr/fesvr.mk.in
@@ -21,6 +21,7 @@ fesvr_hdrs = \
 	htif_hexwriter.h \
 	htif_eth.h \
 	htif_zedboard.h \
+	option_parser.h \
 
 fesvr_srcs = \
 	elfloader.cc \
@@ -34,6 +35,7 @@ fesvr_srcs = \
 	htif_eth.cc \
 	htif_zedboard.cc \
   dummy.c \
+	option_parser.cc \
 
 fesvr_install_prog_srcs = \
   elf2hex.cc \