Changeset 1486 for trunk


Ignore:
Timestamp:
Aug 7, 2012, 11:28:35 AM (8 years ago)
Author:
Peter Johansson
Message:

remove trailing whitespace

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r1483 r1486  
    4343
    4444dnl FIXME remove when we assume autoconf 2.64
    45 m4_ifndef([AC_PACKAGE_URL], 
     45m4_ifndef([AC_PACKAGE_URL],
    4646          [AC_DEFINE([PACKAGE_URL], ["http://dev.thep.lu.se/svndigest"],
    4747                     [Define to home page for this package])
     
    6363  fi
    6464done
    65 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) 
     65AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
    6666
    6767# Let user overide default CXXFLAGS
     
    100100# using extension beyond the C++ standard (usage of non C++ standard
    101101# 'long long' types).
    102 AS_IF([test x$enable_debug = xyes], 
     102AS_IF([test x$enable_debug = xyes],
    103103  [YAT_CXX_ADD_FLAG([CXXFLAGS],[-pedantic -Wall -Wno-long-long -g -O])],
    104104  [YAT_CPP_ADD_FLAG([CPPFLAGS],[-DNDEBUG])
     
    107107AC_MSG_CHECKING([g++ deprecation attribute])
    108108AC_COMPILE_IFELSE(
    109   [AC_LANG_PROGRAM([[void f() __attribute__ ((deprecated));]],)], 
    110   [AC_DEFINE([YAT_HAVE_GCC_DEPRECATED], [1], 
     109  [AC_LANG_PROGRAM([[void f() __attribute__ ((deprecated));]],)],
     110  [AC_DEFINE([YAT_HAVE_GCC_DEPRECATED], [1],
    111111             [Define if compiler supports deprecated attribute, as in g++ 4.0])
    112112   AC_MSG_RESULT([yes])],
     
    138138  [ AS_CASE([$withval], [yes|no],
    139139            [AC_MSG_ERROR([--with-svn requires a directory to be provided])])
    140     AS_IF([test -d $with_svn], [], 
     140    AS_IF([test -d $with_svn], [],
    141141          [AC_MSG_ERROR([$with_svn: no such directory])])
    142142    # transform argument to absolute path
     
    155155# --enable-debug (see ticket #506)
    156156AS_IF([test x$enable_debug = xyes],
    157   [AC_MSG_CHECKING([subversion-1/svn_wc.h usability with -pedantic]) 
     157  [AC_MSG_CHECKING([subversion-1/svn_wc.h usability with -pedantic])
    158158   AC_COMPILE_IFELSE(
    159159    [AC_LANG_PROGRAM([@%:@include <subversion-1/svn_wc.h>])],
     
    173173AC_SEARCH_LIBS([svn_ra_initialize],[svn_ra-1], [], [svn_found="no"],[$tmp_LIBS])
    174174AC_SEARCH_LIBS([svn_wc_adm_open3],[svn_wc-1], [], [svn_found="no"], [$tmp_LIBS])
    175 AC_SEARCH_LIBS([svn_diff_file_options_create],[svn_diff-1],[], 
     175AC_SEARCH_LIBS([svn_diff_file_options_create],[svn_diff-1],[],
    176176               [svn_found="no"], [$tmp_LIBS])
    177177AC_SEARCH_LIBS([svn_client_log3],[svn_client-1],,[svn_found="no"], [$tmp_LIBS])
     
    194194     AS_IF([test -d $with_plplot], [],
    195195           [AC_MSG_ERROR([$with_plplot: no such directory])])
    196      with_plplot=`cd $with_plplot && pwd` 
     196     with_plplot=`cd $with_plplot && pwd`
    197197     # help pkg-config find .pc file
    198198     PKG_CONFIG_PATH=$with_plplot/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH
    199      export PKG_CONFIG_PATH 
     199     export PKG_CONFIG_PATH
    200200   ])
    201201  ])
     
    209209  ],[
    210210    AC_MSG_RESULT([no])
    211     AC_MSG_WARN([cannot find plplotd-c++; 
    212       please use --with-plplot with appropriate argument to get more accurate 
     211    AC_MSG_WARN([cannot find plplotd-c++;
     212      please use --with-plplot with appropriate argument to get more accurate
    213213      configuration.])
    214214  ])
     
    223223    # trailing '/plplot'. Space is included in sed expression to avoid
    224224    # substituting potential '/plplot' in PREFIX.
    225     YAT_CPP_ADD_FLAG([CPPFLAGS], 
     225    YAT_CPP_ADD_FLAG([CPPFLAGS],
    226226             [`$PKG_CONFIG plplotd-c++ --cflags-only-I | sed 's|/plplot | |g'`])
    227227    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
     
    236236  ])
    237237])
    238                  
     238
    239239AS_IF([test "x$plplot_found" = "xyes"], [
    240240  AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"])
     
    259259                                  [plstream pls(1,1,"svg", "conftest.svg");
    260260                                   pls.scolbga(255, 255, 255, 0);
    261                                   ])], 
     261                                  ])],
    262262                 [AC_MSG_RESULT([yes]);
    263                   AC_DEFINE([HAVE_PLPLOT], [1], 
    264                             [Define to 1 if you have plplot])], 
     263                  AC_DEFINE([HAVE_PLPLOT], [1],
     264                            [Define to 1 if you have plplot])],
    265265                 [AC_MSG_RESULT([no])
    266266                  plplot_found=nolib;])
     
    273273# checking if we have test repo
    274274test_repo_filename=$srcdir/test/repo;
    275 AS_IF([test -r $test_repo_filename], 
     275AS_IF([test -r $test_repo_filename],
    276276              [AC_DEFINE([HAVE_TEST_REPO],[1],[define if test repo is available])
    277277               test_repo_found="yes"],
     
    317317   AC_MSG_CHECKING([help2man])
    318318   # redirecting potential error msg to log file
    319    AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD], 
    320          [AC_MSG_RESULT([yes])], 
     319   AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
     320         [AC_MSG_RESULT([yes])],
    321321         [AC_MSG_RESULT([no])
    322322     AC_MSG_WARN(m4_text_wrap(m4_normalize([
     
    327327       ]),[                   ],
    328328          [                             ], 79))
    329    ]) 
     329   ])
    330330   if (test "$test_repo_found" = "no"); then
    331331      all_reqs_ok="false";
     
    361361
    362362# Non-existing PLplot API is fatal -- sub-sequent compilation will fail.
    363 AS_CASE([$plplot_found], 
     363AS_CASE([$plplot_found],
    364364  [noheader],
    365365    [AC_MSG_WARN([
     
    407407    LDFLAGS:            $LDFLAGS
    408408    SVNDIGEST_LDFLAGS:  $SVNDIGEST_LDFLAGS
    409   Libraries:         
     409  Libraries:
    410410    LIBS                $LIBS
    411411    APR_LIBS            $APR_LIBS
Note: See TracChangeset for help on using the changeset viewer.