patch-configure_in 3.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182
  1. $OpenBSD: patch-configure_in,v 1.1.1.1 2010/10/24 10:32:48 jakemsr Exp $
  2. --- configure.in.orig Tue Aug 8 08:47:16 2006
  3. +++ configure.in Sun Jan 18 02:01:04 2009
  4. @@ -22,7 +22,7 @@ AC_DEFUN([AC_C99_FUNC_LRINTF],
  5. ac_cv_c99_lrintf,
  6. [
  7. lrintf_save_CFLAGS=$CFLAGS
  8. -CFLAGS="-O3 -lm"
  9. +CFLAGS="-lm"
  10. AC_TRY_LINK([
  11. #define _ISOC9X_SOURCE 1
  12. #define _ISOC99_SOURCE 1
  13. @@ -64,7 +64,7 @@ PKG_CHECK_MODULES(FFTW, fftw3f >= 3.0,
  14. [
  15. FFTW_LIBS="-lsrfftw -lsfftw"
  16. STATIC_FFTW_LIBS="$LIBS /usr/lib/libsfftw.a /usr/lib/libsrfftw.a /sw/lib/libsfftw.a"
  17. - AC_DEFINE_UNQUOTED(EXPLICIT_S, "")
  18. + AC_DEFINE_UNQUOTED(EXPLICIT_S, "", [Define if libfftw is actually libsrfftw])
  19. ],
  20. [ AC_CHECK_LIB(fftw,fftw_one,
  21. [
  22. @@ -87,52 +87,31 @@ AC_CHECK_LIB(m, log10f,, [
  23. AC_CHECK_FUNC(shm_open,,[AC_CHECK_LIB(rt,shm_open)])
  24. AC_C99_FUNC_LRINTF()
  25. -AC_ARG_ENABLE(3dnow, [ --enable-3dnow Enables 3DNow! acceleration], AC_DEFINE_UNQUOTED(ACCEL_3DNOW, ""))
  26. +AC_ARG_ENABLE(3dnow, [ --enable-3dnow Enables 3DNow! acceleration], AC_DEFINE_UNQUOTED(ACCEL_3DNOW, "", [Define to use 3Dnow!]))
  27. AC_ARG_ENABLE(sse, [ --enable-sse Uses SSE instructions where possible, requires gcc3 and a processor with SSE support], USE_SSE="-msse -mfpmath=sse -malign-double")
  28. AC_ARG_ENABLE(darwin, [ --enable-darwin Builds plugins that will be shared object in the Darwin OS], DARWIN_CFLAGS="-fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o")
  29. -CFLAGS=$lrintf_save_CFLAGS -I@top_srcdir@/intl -I@top_srcdir@
  30. +CFLAGS=$lrintf_save_CFLAGS
  31. -if [ echo ${CFLAGS} | grep "\-march=" ]; then
  32. - AC_MSG_WARN([CFLAGS appears to allready contain architecture specifaction, using exiting one])
  33. -else
  34. - AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
  35. - AC_MSG_WARN([May result in non-portable code])
  36. - dnl For gcc use:
  37. - MACHINE="-march=${build_cpu}"
  38. - if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
  39. - if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
  40. - if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
  41. -
  42. - CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
  43. -
  44. - dnl For Intel's C compiler use:
  45. - dnl CC="icc"
  46. - dnl CFLAGS="$CFLAGS -O2 -rcd -tpp6 -xiMK -KPIC -DPIC"
  47. -
  48. - dnl For debugging use:
  49. - dnl CFLAGS="$CFLAGS -Wall -g -ffast-math -fPIC -DPIC"
  50. -fi
  51. -
  52. AC_PROG_LD
  53. AM_PROG_LIBTOOL
  54. dnl Set PACKAGE_LOCALE_DIR in config.h.
  55. if test "x${prefix}" = xNONE; then
  56. - AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
  57. + AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Define to package locale dir])
  58. else
  59. - AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
  60. + AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Define to package locale dir])
  61. fi
  62. dnl Set PACKAGE_DATA_DIR in config.h.
  63. if test "x${datadir}" = 'x${prefix}/share'; then
  64. if test "x${prefix}" = xNONE; then
  65. - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
  66. + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Define to package data dir])
  67. else
  68. - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
  69. + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Define to package data dir])
  70. fi
  71. else
  72. - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
  73. + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Define to package data dir])
  74. fi
  75. subdirs="util gsm gverb metadata"