Changeset 1182 for trunk/configure.ac


Ignore:
Timestamp:
Aug 25, 2010, 3:02:41 AM (11 years ago)
Author:
Peter Johansson
Message:

Merge release 0.8 into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/configure.ac

    r1172 r1182  
    1212# Copyright (C) 2005 Jari Häkkinen, Peter Johansson
    1313# Copyright (C) 2006 Jari Häkkinen
    14 # Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
    15 # Copyright (C) 2010 Peter Johansson
     14# Copyright (C) 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
    1615#
    1716# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    3332
    3433m4_include([m4/version.m4])
    35 AC_INIT([svndigest], m4_defn([SVNDIGEST_VERSION]),[jari@thep.lu.se],,
     34AC_INIT([svndigest], m4_defn([SVNDIGEST_VERSION]),
     35        [svndigest-users@lists.sourceforge.net],,
    3636        [http://dev.thep.lu.se/svndigest])
    3737AC_CONFIG_SRCDIR([lib/File.h])
     
    107107AC_PROG_RANLIB
    108108AC_PROG_SED
    109 AC_PATH_PROG([HELP2MAN], [help2man], [no])
     109AM_MISSING_PROG([HELP2MAN], [help2man])
    110110# look for pkg-config
    111111PKG_PROG_PKG_CONFIG([0.23])
     
    142142    for i in $apr_link_ld; do
    143143      AS_IF([test ${i:0:2} = "-l"],[APR_LIBS="$i $APR_LIBS"],
    144             [YAT_LD_ADD_FLAG([APR_LDFLAGS], [$i])])
     144            [YAT_LD_ADD_FLAG([LDFLAGS], [$i])])
    145145    done
    146     YAT_CPP_ADD_FLAG([APR_CPPFLAGS],[`$apr_config --includes --cppflags`])
    147     save_CPPFLAGS=$CPPFLAGS
    148     CPPFLAGS="$APR_CPPFLAGS $CPPFLAGS"
     146    YAT_CPP_ADD_FLAG([CPPFLAGS],[`$apr_config --includes --cppflags`])
    149147    AC_CHECK_HEADER([apr_allocator.h],,[apr_found="no"])
    150     CPPFLAGS=$save_CPPFLAGS
    151 fi
    152 AC_SUBST([APR_CPPFLAGS])
    153 AC_SUBST([APR_LDFLAGS])
     148fi
    154149AC_SUBST([APR_LIBS])
    155150
     
    165160    with_svn=`cd $with_svn && pwd`
    166161    DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$with_svn"
    167     YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$with_svn/lib])
    168     YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$with_svn/include])
     162    YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_svn/lib])
     163    YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_svn/include])
    169164  ])
    170165# svn needs needs apr headers
    171 save_CPPFLAGS=$CPPFLAGS
    172 CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS $CPPFLAGS"
    173166AC_CHECK_HEADER([subversion-1/svn_types.h],,[svn_found="no"])
    174 CPPFLAGS=$save_CPPFLAGS
    175 
    176 save_LDFLAGS=$LDFLAGS
     167
    177168save_LIBS=$LIBS
    178169tmp_LIBS="$APR_LIBS $save_LIBS"
    179170LIBS=""
    180 LDFLAGS="$SVN_LDFLAGS $APR_LDFLAGS"
    181171AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
    182172               [], [svn_found="no"], [$tmp_LIBS])
     
    188178SVN_LIBS=$LIBS
    189179LIBS=$save_LIBS
    190 LDFLAGS=$save_LDFLAGS
    191 AC_SUBST([SVN_CPPFLAGS])
    192 AC_SUBST([SVN_LDFLAGS])
    193180AC_SUBST([SVN_LIBS])
    194181
     
    201188# error is detected.
    202189plplot_found="yes"
    203 plplot_version=5.9
     190plplot_version=5.9.6
    204191save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
    205192AC_ARG_WITH([plplot],
     
    235222  # copy flags if we have found pc file
    236223  AS_IF([test "$use_plplot_pc" = "yes"], [
    237     YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
     224    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
    238225    PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
    239226  ],[
     
    241228    PLPLOT_LIBS="-lplplotcxxd -lplplotd";
    242229    AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
    243       YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [-L$with_plplot/lib])
     230      YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/lib])
    244231    ])
    245232  ])
     
    247234  # `PREFIX/include/plplot' rather than `PREFIX/include'
    248235  AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
    249     YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [-I$with_plplot/include])
     236    YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_plplot/include])
    250237  ])
    251238])
    252239                 
    253240AS_IF([test "x$plplot_found" = "xyes"], [
    254   save_CPPFLAGS=$CPPFLAGS
    255   CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
    256241  AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"])
    257   CPPFLAGS=$save_CPPFLAGS
    258242])
    259243
     
    264248    AC_MSG_RESULT([yes])
    265249  ],[
    266     AC_MSG_RESULT([`$PKG_CONFIG --modversion= plplotd-c++`])
     250    have_plplot_version=`$PKG_CONFIG --modversion plplotd-c++`
     251    AC_MSG_RESULT([$have_plplot_version])
    267252    plplot_found="old"
    268253  ])
     
    270255
    271256AS_IF([test "x$plplot_found" = "xyes"], [
    272   save_CPPFLAGS=$CPPFLAGS
    273   CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
    274   save_LDFLAGS=$LDFLAGS
    275   LDFLAGS="$PLPLOT_LDFLAGS $LDFLAGS"
    276257  save_LIBS=$LIBS
    277258  LIBS="$PLPLOT_LIBS $LIBS"
     
    286267                 [AC_MSG_RESULT([no])
    287268                  plplot_found=nolib;])
    288   CPPFLAGS=$save_CPPFLAGS
    289   LDFLAGS=$save_LDFLAGS
    290269  LIBS=$save_LIBS
    291270])
    292271# restore variable
    293272export PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
    294 AC_SUBST(PLPLOT_CPPFLAGS)
    295 AC_SUBST(PLPLOT_LDFLAGS)
    296273AC_SUBST(PLPLOT_LIBS)
    297274
     
    319296
    320297# Restore FLAGS
    321 APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [DEFAULT_])
    322 APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [DEFAULT_])
     298APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [SVNDIGEST_])
     299APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [SVNDIGEST_])
     300APR_RESTORE_THE_ENVIRONMENT([LDFLAGS], [SVNDIGEST_])
    323301
    324302AC_CONFIG_FILES([Makefile
     
    340318
    341319if (test "$wc_found" = "yes"); then
    342    if test x$HELP2MAN = xno; then
     320   AC_MSG_CHECKING([help2man])
     321   # redirecting potential error msg to log file
     322   AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
     323         [AC_MSG_RESULT([yes])],
     324         [AC_MSG_RESULT([no])
    343325     AC_MSG_WARN(m4_text_wrap(m4_normalize([
    344326       `help2man' is missing on your system.  You will not be
     
    348330       ]),[                   ],
    349331          [                             ], 79))
    350    fi
     332   ])
    351333   # svnversion is required when building from svn wc
    352    if (test "$svnversion" = "no"); then
     334   if (test "x$SVNVERSION" = "xno"); then
    353335      all_reqs_ok="false";
    354336      AC_MSG_WARN([dnl
     
    427409+++++++++++++++++++++++++++++++++++++++++++++++
    428410  Compiler:           $CXX
    429   Preprocessor flags: $SD_CPPFLAGS $CPPFLAGS
    430     CPPFLAGS:         $CPPFLAGS
    431     DEFAULT_CPPFLAGS: $DEFAULT_CPPFLAGS
    432     APR_CPPFLAGS:     $APR_CPPFLAGS
    433     SVN_CPPFLAGS:     $SVN_CPPFLAGS
    434     PLPLOT_CPPFLAGS:  $PLPLOT_CPPFLAGS
     411  Preprocessor flags:
     412    CPPFLAGS:           $CPPFLAGS
     413    SVNDIGEST_CPPFLAGS: $SVNDIGEST_CPPFLAGS
    435414  C++ flags:
    436     CXXFLAGS:         $CXXFLAGS
    437     DEFAULT_CXXFLAGS: $DEFAULT_CXXFLAGS
     415    CXXFLAGS:           $CXXFLAGS
     416    SVNDIGEST_CXXFLAGS: $SVNDIGEST_CXXFLAGS
    438417  Linker flags:
    439     LDFLAGS:          $LDFLAGS
    440     APR_LDFLAGS:      $APR_LDFLAGS
    441     SVN_LDFLAGS:      $SVN_LDFLAGS
    442     PLPLOT_LDFLAGS:   $PLPLOT_LDFLAGS
     418    LDFLAGS:            $LDFLAGS
     419    SVNDIGEST_LDFLAGS:  $SVNDIGEST_LDFLAGS
    443420  Libraries:         
    444     LIBS              $LIBS
    445     APR_LIBS          $APR_LIBS
    446     SVN_LIBS          $SVN_LIBS
    447     PLPLOT_LIBS       $PLPLOT_LIBS
     421    LIBS                $LIBS
     422    APR_LIBS            $APR_LIBS
     423    SVN_LIBS            $SVN_LIBS
     424    PLPLOT_LIBS         $PLPLOT_LIBS
    448425+++++++++++++++++++++++++++++++++++++++++++++++]dnl
    449426)
Note: See TracChangeset for help on using the changeset viewer.