Changeset 668 for trunk/configure.ac

Timestamp:

Jul 4, 2008, 1:28:06 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Fixes #340. Run 'bootstrap' after update.

File:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -72 +72 @@
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+AC_PROG_RANLIB
 AC_PROG_SED
 AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
@@ -92 +92 @@
   [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"], 
   [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
-
-# optionally prepare for building static libraries.
-AC_ARG_ENABLE(staticbin,
-  [AS_HELP_STRING([--enable-staticbin], [create a static binary,
-  at least as static as the available underlying libraries
-  allows])])
-if test "$enable_staticbin" = "yes"; then
-  case $host in
-  *-apple-darwin*)
-    # At the time of creating this libsvn_subr uses
-    # Keychain on Mac OSX. In consequence the below
-    # frameworks are needed for succesful static builds.
-    SD_LIBS="$SD_LIBS -framework Security"
-    SD_LIBS="$SD_LIBS -framework CoreFoundation"
-    SD_LIBS="$SD_LIBS -framework CoreServices"
-    ;;
-  esac
-  STATICFLAG=-static
-  AC_SUBST(STATICFLAG)
-fi
 
 # Apache Portable Runtime (APR) API checks
@@ -147 +127 @@
 AC_CHECK_HEADER([apr_allocator.h],,apr_found="no")
 AC_CHECK_HEADER([subversion-1/svn_types.h],,svn_found="no")
-# The library checks below may match shared libs even when
-# --enable-staticbin is given to configure. This should probably not
-# pose any problems since in a properly installed system the shared
-# and static libraries should be the same.
 AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
                [SD_LIBS="-lsvn_subr-1 $SD_LIBS"],svn_found="no")
@@ -300 +276 @@
 fi
 
-if test "$enable_staticbin" = "yes"; then
-    AC_MSG_NOTICE([A statically linked 'svndigest' binary will be created.])
-else
-    AC_MSG_NOTICE([A dynamically linked 'svndigest' binary will be created.])
-fi
-    AC_MSG_NOTICE([])
-
 AC_MSG_NOTICE([Now type 'make ; make check'.])
-