patch-configure.ac 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. --- configure.ac.orig 2008-08-23 10:29:42 UTC
  2. +++ configure.ac
  3. @@ -9,36 +9,21 @@ AC_CONFIG_SRCDIR(Search.cpp)
  4. AC_PREFIX_DEFAULT(/usr/local/dtse)
  5. AC_PROG_INSTALL
  6. -CHECK_GNU_MAKE
  7. -if test x$_cv_gnu_make_command = x; then
  8. - AC_MSG_ERROR(You need GNU Make.)
  9. -fi
  10. +AX_CHECK_GNU_MAKE
  11. +AC_SUBST([GNUMAKE], [$_cv_gnu_make_command])
  12. +AS_IF([test "x$GNUMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
  13. +AX_PROG_PERL_MODULES([File::Temp], [], [AC_MSG_ERROR([You need File::Temp.])])
  14. +AC_LANG([C++])
  15. AC_PROG_CXX
  16. -if ! test x$GXX = x; then
  17. - AC_MSG_CHECKING(if g++ is version 3.1 or higher)
  18. - dt_gxx_3_x=`$CXX --version 2>&1 | grep ^$CXX`
  19. - if test "x$dt_gxx_3_x" = "x"; then
  20. - AC_MSG_RESULT(no)
  21. - AC_MSG_ERROR(You need g++ 3.1 or higher.)
  22. - else
  23. - AC_MSG_RESULT(yes)
  24. - fi
  25. -fi
  26. -AC_PROG_PERL_VERSION(5.00503, , AC_MSG_ERROR(You need a Perl 5.6 or higher.))
  27. -AC_MSG_CHECKING(perl path)
  28. -AC_SUBST(which_perl, `which $PERL`)
  29. -AC_MSG_RESULT($which_perl)
  30. -
  31. -AC_PROG_PERL_MODULES(File::Temp, , AC_MSG_ERROR(You need File::Temp.))
  32. mingw=`$CXX --version 2>&1 | grep mingw\ special`
  33. if test "x$mingw" = "x"; then
  34. - ETR_SOCKET_NSL
  35. + AX_LIB_SOCKET_NSL
  36. LIBS="$LIBS $ETR_SOCKET_LIBS"
  37. else
  38. LIBS="$LIBS -lws2_32"
  39. fi
  40. -AC_MSG_CHECKING(if OpenSSL is wanted)
  41. -AC_ARG_WITH(openssl, [[ --with-openssl[=DIR] enable OpenSSL [DIR=path]]
  42. +AC_MSG_CHECKING([if OpenSSL is wanted])
  43. +AC_ARG_WITH([openssl], [[ --with-openssl[=DIR] enable OpenSSL [DIR=path]]
  44. ], [
  45. AC_MSG_RESULT(yes)
  46. AC_MSG_CHECKING(for OpenSSL)
  47. @@ -62,7 +47,7 @@ AC_ARG_WITH(openssl, [[ --with-openssl[
  48. AC_SUBST(OpenSSL, -D_OpenSSL_)
  49. else
  50. AC_MSG_RESULT(not found);
  51. - AC_MSG_ERROR(couldn't find OpenSSL)
  52. + AC_MSG_ERROR(could not find OpenSSL)
  53. fi
  54. ], [ AC_MSG_RESULT(no) ])
  55. if ! test x$openssl = x; then