Changeset 668 for trunk/configure.ac


Ignore:
Timestamp:
Jul 4, 2008, 1:28:06 AM (13 years ago)
Author:
Jari Häkkinen
Message:

Fixes #340. Run 'bootstrap' after update.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r641 r668  
    7272AC_PROG_CXX
    7373AC_PROG_INSTALL
    74 AC_PROG_LIBTOOL
     74AC_PROG_RANLIB
    7575AC_PROG_SED
    7676AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
     
    9292  [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"],
    9393  [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
    94 
    95 # optionally prepare for building static libraries.
    96 AC_ARG_ENABLE(staticbin,
    97   [AS_HELP_STRING([--enable-staticbin], [create a static binary,
    98   at least as static as the available underlying libraries
    99   allows])])
    100 if test "$enable_staticbin" = "yes"; then
    101   case $host in
    102   *-apple-darwin*)
    103     # At the time of creating this libsvn_subr uses
    104     # Keychain on Mac OSX. In consequence the below
    105     # frameworks are needed for succesful static builds.
    106     SD_LIBS="$SD_LIBS -framework Security"
    107     SD_LIBS="$SD_LIBS -framework CoreFoundation"
    108     SD_LIBS="$SD_LIBS -framework CoreServices"
    109     ;;
    110   esac
    111   STATICFLAG=-static
    112   AC_SUBST(STATICFLAG)
    113 fi
    11494
    11595# Apache Portable Runtime (APR) API checks
     
    147127AC_CHECK_HEADER([apr_allocator.h],,apr_found="no")
    148128AC_CHECK_HEADER([subversion-1/svn_types.h],,svn_found="no")
    149 # The library checks below may match shared libs even when
    150 # --enable-staticbin is given to configure. This should probably not
    151 # pose any problems since in a properly installed system the shared
    152 # and static libraries should be the same.
    153129AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
    154130               [SD_LIBS="-lsvn_subr-1 $SD_LIBS"],svn_found="no")
     
    300276fi
    301277
    302 if test "$enable_staticbin" = "yes"; then
    303     AC_MSG_NOTICE([A statically linked 'svndigest' binary will be created.])
    304 else
    305     AC_MSG_NOTICE([A dynamically linked 'svndigest' binary will be created.])
    306 fi
    307     AC_MSG_NOTICE([])
    308 
    309278AC_MSG_NOTICE([Now type 'make ; make check'.])
    310 
Note: See TracChangeset for help on using the changeset viewer.