diff --git a/aclocal.m4 b/aclocal.m4 index 1cfab9f..a7b7cf9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1354,8 +1354,8 @@ AC_DEFUN([WX_CONFIG_CHECK], AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)]) fi - dnl don't add the libraries (4th argument) to this variable as this would - dnl result in an error when it's used with --version below + dnl don't add the libraries ($4) to this variable as this would result in + dnl an error when it's used with --version below WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5" WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` @@ -1663,7 +1663,7 @@ AC_DEFUN([WX_ARG_ENABLE_YESNOAUTO], $2=0 elif test "$enableval" = "auto" ; then AC_MSG_RESULT([will be automatically detected]) - $2="" + $2="auto" else AC_MSG_ERROR([ Unrecognized option value (allowed values: yes, no, auto) @@ -1689,7 +1689,7 @@ AC_DEFUN([WX_ARG_WITH_YESNOAUTO], $2=0 elif test "$withval" = "auto" ; then AC_MSG_RESULT([will be automatically detected]) - $2="" + $2="auto" else AC_MSG_ERROR([ Unrecognized option value (allowed values: yes, auto) @@ -1741,17 +1741,17 @@ AC_DEFUN([WX_STANDARD_OPTIONS], AC_MSG_CHECKING([for the --with-toolkit option]) if test "$withval" = "auto" ; then AC_MSG_RESULT([will be automatically detected]) - TOOLKIT="" + TOOLKIT="auto" else TOOLKIT="$withval" dnl PORT must be one of the allowed values - if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \ + if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \ "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \ "$TOOLKIT" != "osx_carbon" -a "$TOOLKIT" != "osx_cocoa" -a \ - "$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11" -a "$TOOLKIT" != "base"; then + "$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11"; then AC_MSG_ERROR([ - Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, motif, osx_carbon, osx_cocoa, dfb, x11, base) + Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, osx_carbon, osx_cocoa, dfb, x11) ]) fi @@ -1815,7 +1815,7 @@ AC_DEFUN([WX_STANDARD_OPTIONS], AC_MSG_CHECKING([for the --with-wxversion option]) if test "$withval" = "auto" ; then AC_MSG_RESULT([will be automatically detected]) - WX_RELEASE="" + WX_RELEASE="auto" else wx_requested_major_version=`echo $withval | \ @@ -1850,7 +1850,7 @@ dnl --------------------------------------------------------------------------- dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS dnl dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values -dnl which were specified. +dnl which are different from "auto". dnl Thus this macro needs to be called only once all options have been set. dnl --------------------------------------------------------------------------- AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS], @@ -1874,11 +1874,11 @@ AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS], WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no " fi - if test -n "$TOOLKIT" ; then + if test "$TOOLKIT" != "auto" ; then WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT " fi - if test -n "$WX_RELEASE" ; then + if test "$WX_RELEASE" != "auto" ; then WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE " fi @@ -1892,16 +1892,16 @@ AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS], dnl --------------------------------------------------------------------------- -dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG]) +dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG] +dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl -dnl Sets WX_$RESULTVAR to the value of $RESULTVAR if it's defined. Otherwise, -dnl auto-detect the value by checking for the presence of STRING in -dnl $WX_SELECTEDCONFIG (which is supposed to be set by caller) and set -dnl WX_$RESULTVAR to either 0 or 1, also outputting "yes" or "no" after MSG. +dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets +dnl additional CPP flags and put the result of the search in WX_$RESULTVAR +dnl also adding the "yes" or "no" message result to MSG. dnl --------------------------------------------------------------------------- AC_DEFUN([_WX_SELECTEDCONFIG_CHECKFOR], [ - if test -z "$$1" ; then + if test "$$1" = "auto" ; then dnl The user does not have particular preferences for this option; dnl so we will detect the wxWidgets relative build setting and use it @@ -1916,9 +1916,11 @@ AC_DEFUN([_WX_SELECTEDCONFIG_CHECKFOR], if test "$WX_$1" != "0"; then WX_$1=1 AC_MSG_RESULT([yes]) + ifelse([$4], , :, [$4]) else WX_$1=0 AC_MSG_RESULT([no]) + ifelse([$5], , :, [$5]) fi else @@ -1965,16 +1967,19 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], echo "[[dbg]] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG" fi + dnl we could test directly for WX_SHARED with a line like: dnl _WX_SELECTEDCONFIG_CHECKFOR([SHARED], [shared], dnl [if wxWidgets was built in SHARED mode]) dnl but wx-config --selected-config DOES NOT outputs the 'shared' dnl word when wx was built in shared mode; it rather outputs the dnl 'static' word when built in static mode. - if test "$WX_SHARED" = "1"; then + if test $WX_SHARED = "1"; then STATIC=0 - elif test "$WX_SHARED" = "0"; then + elif test $WX_SHARED = "0"; then STATIC=1 + elif test $WX_SHARED = "auto"; then + STATIC="auto" fi dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables @@ -1997,7 +2002,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], AC_SUBST(WX_SHARED) dnl detect the WX_PORT to use - if test -z "$TOOLKIT" ; then + if test "$TOOLKIT" = "auto" ; then dnl The user does not have particular preferences for this option; dnl so we will detect the wxWidgets relative build setting and use it @@ -2005,26 +2010,22 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*") WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") - WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*") WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*") WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*") WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*") - WX_BASEPORT=$(expr "$WX_SELECTEDCONFIG" : ".*base.*") WX_PORT="unknown" if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi - if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi - if test "$WX_BASEPORT" != "0"; then WX_PORT="base"; fi dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac dnl ports are called 'osx_cocoa' and 'osx_carbon' (see above) @@ -2042,8 +2043,14 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], AC_MSG_RESULT([$WX_PORT]) else + dnl Use the setting given by the user - WX_PORT=$TOOLKIT + if test -z "$TOOLKIT" ; then + WX_PORT=$TOOLKIT + else + dnl try with PORT + WX_PORT=$PORT + fi fi AC_SUBST(WX_PORT) @@ -2074,29 +2081,35 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], ]) fi - dnl now we can finally update the options to their final values if they - dnl were not already set - if test -z "$UNICODE" ; then + dnl now we can finally update the DEBUG,UNICODE,SHARED options + dnl to their final values if they were set to 'auto' + if test "$DEBUG" = "auto"; then + DEBUG=$WX_DEBUG + fi + if test "$UNICODE" = "auto"; then UNICODE=$WX_UNICODE fi - if test -z "$SHARED" ; then + if test "$SHARED" = "auto"; then SHARED=$WX_SHARED fi - if test -z "$TOOLKIT" ; then + if test "$TOOLKIT" = "auto"; then TOOLKIT=$WX_PORT fi - dnl respect the DEBUG variable adding the optimize/debug flags and also - dnl define a BUILD variable in case the user wants to use it - dnl + dnl in case the user needs a BUILD=debug/release var... + if test "$DEBUG" = "1"; then + BUILD="debug" + elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then + BUILD="release" + fi + + dnl respect the DEBUG variable adding the optimize/debug flags dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we dnl don't need to set them, too if test "$DEBUG" = "1"; then - BUILD="debug" CXXFLAGS="$CXXFLAGS -g -O0" CFLAGS="$CFLAGS -g -O0" - elif test "$DEBUG" = "0"; then - BUILD="release" + else CXXFLAGS="$CXXFLAGS -O2" CFLAGS="$CFLAGS -O2" fi diff --git a/configure b/configure index 39515bd..a0fe55e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for fermisurfer 2.0.0. +# Generated by GNU Autoconf 2.69 for fermisurfer 2.1.0. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='fermisurfer' PACKAGE_TARNAME='fermisurfer' -PACKAGE_VERSION='2.0.0' -PACKAGE_STRING='fermisurfer 2.0.0' +PACKAGE_VERSION='2.1.0' +PACKAGE_STRING='fermisurfer 2.1.0' PACKAGE_BUGREPORT='mkawamura@issp.u-tokyo.ac.jp' PACKAGE_URL='' @@ -1315,7 +1315,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fermisurfer 2.0.0 to adapt to many kinds of systems. +\`configure' configures fermisurfer 2.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1385,7 +1385,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fermisurfer 2.0.0:";; + short | recursive ) echo "Configuration of fermisurfer 2.1.0:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fermisurfer configure 2.0.0 +fermisurfer configure 2.1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1842,7 +1842,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fermisurfer $as_me 2.0.0, which was +It was created by fermisurfer $as_me 2.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2705,7 +2705,7 @@ fi # Define the identity of the package. PACKAGE='fermisurfer' - VERSION='2.0.0' + VERSION='2.1.0' cat >>confdefs.h <<_ACEOF @@ -7563,7 +7563,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fermisurfer $as_me 2.0.0, which was +This file was extended by fermisurfer $as_me 2.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7629,7 +7629,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -fermisurfer config.status 2.0.0 +fermisurfer config.status 2.1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0ce01ae..b980321 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([fermisurfer], [2.0.0], [mkawamura@issp.u-tokyo.ac.jp]) +AC_INIT([fermisurfer], [2.1.0], [mkawamura@issp.u-tokyo.ac.jp]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) diff --git a/doc/en/conf.py b/doc/en/conf.py index cdf82a6..e58de1f 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '2.0' +version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.0.0' +release = '2.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/ja/conf.py b/doc/ja/conf.py index d8245a8..b5a23b8 100644 --- a/doc/ja/conf.py +++ b/doc/ja/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '2.0' +version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.0.0' +release = '2.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/calc_nodeline.cpp b/src/calc_nodeline.cpp index ab63713..7d5046e 100644 --- a/src/calc_nodeline.cpp +++ b/src/calc_nodeline.cpp @@ -48,7 +48,7 @@ THE SOFTWARE. void calc_nodeline() { int ib, itri, i, j, ithread, nnl0; - std::vector>>> kvnl_v; + std::vector > > > kvnl_v; kvnl_v.resize(nthreads); diff --git a/src/equator.cpp b/src/equator.cpp index abed79d..e394a4c 100644 --- a/src/equator.cpp +++ b/src/equator.cpp @@ -46,7 +46,7 @@ THE SOFTWARE. */ void equator() { int ib, itri, i, j, ithread, nequator0; - std::vector>>> kveq_v; + std::vector > > > kveq_v; kveq_v.resize(nthreads); @@ -59,7 +59,7 @@ void equator() { { int sw[3]; GLfloat a[3][3], prod[3]; - std::vector> kveq_0; + std::vector > kveq_0; kveq_0.resize(2); for (i = 0; i < 2; i++) kveq_0.at(i).resize(3); diff --git a/src/section.cpp b/src/section.cpp index a77060a..e6bee2b 100644 --- a/src/section.cpp +++ b/src/section.cpp @@ -275,7 +275,7 @@ void calc_2dbz() { */ void calc_section() { int i, j, ib, itri, ithread, n2d0; - std::vector>>> kv2d_v, clr2d_v; + std::vector > > > kv2d_v, clr2d_v; kv2d_v.resize(nthreads); clr2d_v.resize(nthreads); @@ -291,7 +291,7 @@ private(itri,i,j,ithread) { int sw[3]; GLfloat norm[3], a[3][3]; - std::vector> kv2d_0, clr2d_0; + std::vector > kv2d_0, clr2d_0; kv2d_0.resize(2); clr2d_0.resize(2);