Merge pull request ash211#29 from pgaurav/master

please merge
Janderson3 · Jun 24, 2011 · 65e4d90 · 65e4d90
2 parents 3cc1c50 + d768553
commit 65e4d90
Show file tree

Hide file tree

Showing 33 changed files with 2,887 additions and 7,216 deletions.
diff --git a/gtfold-mfe/Makefile b/gtfold-mfe/Makefile
diff --git a/gtfold-mfe/configure b/gtfold-mfe/configure
diff --git a/gtfold-mfe/configure.in b/gtfold-mfe/configure.in
@@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl AC_PREREQ([2.67])
 dnl AC 2.62 needed for OpenMP
-AC_PREREQ([2.67])
+AC_PREREQ([2.63])
 
 dnl AC_INIT (package, version, [bug-report-email], [tarname])
-AC_INIT([gtfold],[1.18])
+AC_INIT([gtfold],[2.0])
 
 dnl check for this file's existence to make sure that the directory
 dnl specified by --srcdir is the right one
@@ -178,7 +178,7 @@ AM_CONDITIONAL(GTFOLD_DEBUG, test x$debug = xtrue)
 
 dnl Create makefiles and other configuration files
 AC_CONFIG_FILES([Makefile src/Makefile data/Makefile include/Makefile])
-AC_CONFIG_FILES([data/Turner99/Makefile data/Turner04/Makefile data/Andronescu/Makefile])
+AC_CONFIG_FILES([data/Turner99/Makefile data/Turner04/Makefile data/Andronescu/Makefile data/UNAParams/Makefile])
 
 dnl Generate `config.status' and launch it
 AC_OUTPUT