| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | --- a/Makefile.in |
| 2 | +++ b/Makefile.in |
| 3 | @@ -7,12 +7,6 @@ SCRIPTS=bon_csv2txt |
| 4 | |
| 5 | prefix=@prefix@ |
| 6 | eprefix=@exec_prefix@ |
| 7 | -#MORE_WARNINGS=-Weffc++ |
| 8 | -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) |
| 9 | -CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) |
| 10 | -CXX=@CXX@ $(CFLAGS) |
| 11 | -LINK=@CXX@ |
| 12 | -THREAD_LFLAGS=@thread_ldflags@ |
| 13 | |
| 14 | INSTALL=@INSTALL@ |
| 15 | INSTALL_PROGRAM=@INSTALL_PROGRAM@ |
| 16 | @@ -34,22 +28,22 @@ GETCHSRC=getc_putc_helper.cpp duration.c |
| 17 | GETCHOBJS=$(GETCHSRC:.cpp=.o) |
| 18 | |
| 19 | bonnie++: $(BONOBJS) |
| 20 | - $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS) |
| 21 | + $(CXX) $(CXXFLAGS) -o bonnie++ $(BONOBJS) @thread_ldflags@ |
| 22 | |
| 23 | zcav: $(ZCAVOBJS) |
| 24 | - $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS) |
| 25 | + $(CXX) $(CXXFLAGS) -o zcav $(ZCAVOBJS) @thread_ldflags@ |
| 26 | |
| 27 | getc_putc: $(GETCOBJS) getc_putc_helper |
| 28 | - $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS) |
| 29 | + $(CXX) $(CXXFLAGS) -o getc_putc $(GETCOBJS) |
| 30 | |
| 31 | getc_putc_helper: $(GETCHOBJS) |
| 32 | - $(CXX) -o getc_putc_helper $(GETCHOBJS) |
| 33 | + $(CXX) $(CXXFLAGS) -o getc_putc_helper $(GETCHOBJS) |
| 34 | |
| 35 | bon_csv2html: bon_csv2html.o |
| 36 | - $(LINK) bon_csv2html.o -o bon_csv2html |
| 37 | + $(CXX) $(CXXFLAGS) bon_csv2html.o -o bon_csv2html |
| 38 | |
| 39 | generate_randfile: generate_randfile.o |
| 40 | - $(LINK) generate_randfile.o -o generate_randfile |
| 41 | + $(CXX) $(CXXFLAGS) generate_randfile.o -o generate_randfile |
| 42 | |
| 43 | install-bin: $(EXE) $(EXES) |
| 44 | mkdir -p $(eprefix)/bin $(eprefix)/sbin |
| 45 | @@ -63,7 +57,7 @@ install: install-bin |
| 46 | @INSTALL_DATA@ $(MAN8) @mandir@/man8 |
| 47 | |
| 48 | %.o: %.cpp |
| 49 | - $(CXX) -c $< |
| 50 | + $(CXX) $(CXXFLAGS) -c $< |
| 51 | |
| 52 | clean: |
| 53 | rm -f $(EXE) $(EXES) *.o build-stamp install-stamp |
| 54 | --- a/configure.in |
| 55 | +++ b/configure.in |
| 56 | @@ -31,7 +31,6 @@ fi |
| 57 | |
| 58 | dnl Checks for programs. |
| 59 | AC_LANG_CPLUSPLUS |
| 60 | -AC_PROG_CC |
| 61 | AC_PROG_CXX |
| 62 | AC_PROG_CXXCPP |
| 63 | AC_PROG_INSTALL |
| 64 | @@ -66,7 +65,7 @@ AC_SUBST(linux_pthread) |
| 65 | AC_TRY_COMPILE([#define _GNU_SOURCE |
| 66 | #include <pthread.h> |
| 67 | ] , [pthread_mutexattr_t attr; |
| 68 | - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);] |
| 69 | + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);] |
| 70 | , linux_pthread="yes") |
| 71 | if [[ -n "$linux_pthread" ]]; then |
| 72 | linux_pthread="#define LINUX_PTHREAD" |
| 73 | @@ -83,7 +82,7 @@ void * thread_func(void * param) { retur |
| 74 | , thread_ldflags="-pthread") |
| 75 | |
| 76 | AC_SUBST(large_file) |
| 77 | -AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE |
| 78 | +AC_TRY_COMPILE([#ifndef _LARGEFILE64_SOURCE |
| 79 | #define _LARGEFILE64_SOURCE |
| 80 | #endif |
| 81 | #include <stdio.h> |