updated

simsong · Dec 11, 2013 · fdfe8cd · fdfe8cd
1 parent bb0f361
commit fdfe8cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ src/config.h.in
 src/iblkfind.cpp
 stamp-h
 stamp-h1
+src/compile
+src/iblkfind
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = dfxml_demo iblkfind
-dfxml_demo_SOURCES = dfxml_demo.cpp dfxml_reader.cpp dfxml.h
-iblkfind_SOURCES = iblkfind.cpp 
+dfxml_demo_SOURCES = dfxml_demo.cpp dfxml_reader.cpp dfxml_reader.h 
+iblkfind_SOURCES = iblkfind.cpp dfxml_reader.cpp dfxml_reader.h 
 EXTRA_DIST = \
 	beregex.cpp \
 	beregex.h \

diff --git a/src/configure.ac b/src/configure.ac
@@ -6,7 +6,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT(DFXML, 0.0.1, bugs@afflib.org)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
@@ -16,15 +16,14 @@ AM_MAINTAINER_MODE
 # Programs we will be using
 AC_PROG_CC
 AC_PROG_CXX
+AM_PROG_CC_C_O                    dnl allow per-produce flags
 AC_PROG_INSTALL
 
 # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so.  Don't
 # use the GNU C++11 extensions for portability's sake (noext).
-# AC_LANG_PUSH(C++)
-#AX_CXX_COMPILE_STDCXX_11(noext, optional)
-AX_CXX_COMPILE_STDCXX_11()
-# AC_LANG_POP()
-
+AC_LANG_PUSH(C++)
+AX_CXX_COMPILE_STDCXX_11(noext, optional)
+AC_LANG_POP()
 
 m4_include([dfxml_configure.m4])