From 1f4b9cfa9763b40c4f57f8c05348ca7b6b00ca1e Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sat, 6 Jan 2007 21:37:42 +0000 Subject: [PATCH] * Only link with -ldl when available. * Removed PKG_* stuff from configure.ac. * Add more compilation warnings. --- configure.ac | 17 ++++------------- src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 3cb965e..f28f560 100644 --- a/configure.ac +++ b/configure.ac @@ -14,18 +14,6 @@ AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_LIBTOOL -dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right -dnl now otherwise it might be set in an obscure if statement. Same thing for -dnl PKG_PROG_PKG_CONFIG which needs to be called first. -AC_EGREP_CPP(yes, foo) -PKG_PROG_PKG_CONFIG() - -dnl Don't let pkg-config fuck our cross-compilation environment -m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) -if test "$build" != "$host" -a "${PKG_CONFIG_LIBDIR}" = ""; then - export PKG_CONFIG_LIBDIR=/dev/null -fi - AC_CHECK_HEADERS(inttypes.h stdint.h getopt.h) AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 getline getdelim __getdelim fgetln) AC_CHECK_TYPES(sighandler_t, [], [], @@ -41,10 +29,13 @@ AC_CHECK_FUNCS(getopt_long, GETOPT_LIBS="${GETOPT_LIBS} -lgnugetopt"])]) AC_SUBST(GETOPT_LIBS) +AC_CHECK_LIB(dl, dlopen, [DL_LIBS="-ldl"]) +AC_SUBST(DL_LIBS) + # Optimizations CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer" # Code qui fait des warnings == code de porc == deux baffes dans ta gueule -CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare" +CFLAGS="${CFLAGS} -Wall -W -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare" AC_OUTPUT([ Makefile diff --git a/src/Makefile.am b/src/Makefile.am index fc1db79..ff75b31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,5 +8,5 @@ libzzuf_la_SOURCES = libzzuf.c libzzuf.h fuzz.c fuzz.h debug.c debug.h \ load-fd.c load-signal.c load-stream.c load.h \ random.c random.h libzzuf_la_LDFLAGS = -avoid-version -no-undefined -libzzuf_la_LIBADD = -ldl +libzzuf_la_LIBADD = @GETOPT_LIBS@ @DL_LIBS@