You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

81 lines
2.4 KiB

  1. --- a/Makefile.in
  2. +++ b/Makefile.in
  3. @@ -7,12 +7,6 @@ SCRIPTS=bon_csv2txt
  4. prefix=@prefix@
  5. eprefix=@exec_prefix@
  6. -#MORE_WARNINGS=-Weffc++
  7. -WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
  8. -CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
  9. -CXX=@CXX@ $(CFLAGS)
  10. -LINK=@CXX@
  11. -THREAD_LFLAGS=@thread_ldflags@
  12. INSTALL=@INSTALL@
  13. INSTALL_PROGRAM=@INSTALL_PROGRAM@
  14. @@ -34,22 +28,22 @@ GETCHSRC=getc_putc_helper.cpp duration.cpp
  15. GETCHOBJS=$(GETCHSRC:.cpp=.o)
  16. bonnie++: $(BONOBJS)
  17. - $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS)
  18. + $(CXX) $(CXXFLAGS) -o bonnie++ $(BONOBJS) @thread_ldflags@
  19. zcav: $(ZCAVOBJS)
  20. - $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS)
  21. + $(CXX) $(CXXFLAGS) -o zcav $(ZCAVOBJS) @thread_ldflags@
  22. getc_putc: $(GETCOBJS) getc_putc_helper
  23. - $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS)
  24. + $(CXX) $(CXXFLAGS) -o getc_putc $(GETCOBJS)
  25. getc_putc_helper: $(GETCHOBJS)
  26. - $(CXX) -o getc_putc_helper $(GETCHOBJS)
  27. + $(CXX) $(CXXFLAGS) -o getc_putc_helper $(GETCHOBJS)
  28. bon_csv2html: bon_csv2html.o
  29. - $(LINK) bon_csv2html.o -o bon_csv2html
  30. + $(CXX) $(CXXFLAGS) bon_csv2html.o -o bon_csv2html
  31. generate_randfile: generate_randfile.o
  32. - $(LINK) generate_randfile.o -o generate_randfile
  33. + $(CXX) $(CXXFLAGS) generate_randfile.o -o generate_randfile
  34. install-bin: $(EXE) $(EXES)
  35. mkdir -p $(eprefix)/bin $(eprefix)/sbin
  36. @@ -63,7 +57,7 @@ install: install-bin
  37. @INSTALL_DATA@ $(MAN8) @mandir@/man8
  38. %.o: %.cpp
  39. - $(CXX) -c $<
  40. + $(CXX) $(CXXFLAGS) -c $<
  41. clean:
  42. rm -f $(EXE) $(EXES) *.o build-stamp install-stamp
  43. --- a/configure.in
  44. +++ b/configure.in
  45. @@ -31,7 +31,6 @@ fi
  46. dnl Checks for programs.
  47. AC_LANG_CPLUSPLUS
  48. -AC_PROG_CC
  49. AC_PROG_CXX
  50. AC_PROG_CXXCPP
  51. AC_PROG_INSTALL
  52. @@ -66,7 +65,7 @@ AC_SUBST(linux_pthread)
  53. AC_TRY_COMPILE([#define _GNU_SOURCE
  54. #include <pthread.h>
  55. ] , [pthread_mutexattr_t attr;
  56. - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);]
  57. + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);]
  58. , linux_pthread="yes")
  59. if [[ -n "$linux_pthread" ]]; then
  60. linux_pthread="#define LINUX_PTHREAD"
  61. @@ -83,7 +82,7 @@ void * thread_func(void * param) { return NULL; }
  62. , thread_ldflags="-pthread")
  63. AC_SUBST(large_file)
  64. -AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
  65. +AC_TRY_COMPILE([#ifndef _LARGEFILE64_SOURCE
  66. #define _LARGEFILE64_SOURCE
  67. #endif
  68. #include <stdio.h>