Changeset e08f45 for molecuilder/m4/acx_compilerflags.m4

Timestamp:

Feb 9, 2009, 5:24:10 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

451d7a

Parents:

4aef8a

git-author:

Frederik Heber <heber@…> (02/09/09 15:55:37)

git-committer:

Frederik Heber <heber@…> (02/09/09 17:24:10)

Message:

Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull

Conflicts:

molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp
util/src/NanoCreator.c

Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.
Additionally, vector had ofstream << operator instead ostream << ...

File:

• molecuilder/m4/acx_compilerflags.m4 (modified) (1 diff, 1 prop)

molecuilder/m4/acx_compilerflags.m4

@@ -1 @@
-../../m4/acx_compilerflags.m4
+# AC_SET_COMPILER_FLAGS(optimization, debugging, warnings)
+#----------------------------------------------------------------
+AC_DEFUN([AC_SET_COMPILER_FLAGS],[
+AC_MSG_NOTICE([Using AC@&t@_SET_COMPILER_FLAGS macro])
+
+dnl optimization
+if test ! x"$1" = xno; then
+        if test x"$2" = xno; then
+                if test x"$1" = xyes; then
+                        optimization="-O2"
+                else
+                        optimization="-O$1"
+                fi
+        fi
+fi
+dnl debugging info
+if ! test x"$2" = xno; then
+        if test x"$2" = xyes; then
+                debugging="-g3"
+        else
+                debugging="-g$2"
+        fi
+  AC_DEFINE(HAVE_DEBUG,1, ["Output debugging info"])
+  AC_SUBST(HAVE_DEBUG)
+fi
+
+dnl enable all warnings
+if test x"$3" = xsome; then
+        dnl even without debugging we want some minimal info of something's utterly wrong
+        Cwarnings="-Wall"
+        CXXwarnings="-Wall"
+fi
+if test x"$3" = xfull; then
+        Cwarnings="-Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wredundant-decls -Wnested-externs -Wmissing-noreturn -Wformat-security -Wmissing-format-attribute -Winit-self"
+        CXXwarnings="-Wall -W -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wredundant-decls -Wmissing-noreturn -Wformat-security -Wmissing-format-attribute -Winit-self"
+fi
+if test x"$3" = xnone; then
+        unset Cwarnings
+        unset CXXwarnings
+else
+        AC_DEFINE(HAVE_WARNINGS,$enable_warnings, ["Output compiler warnings"])
+fi
+
+# finally, apply whatever was set
+CFLAGS="$CFLAGS $debugging $optimization $Cwarnings"
+CXXFLAGS="$CXXFLAGS $debugging $optimization $CXXwarnings"
+
+])