Changeset 1590 for zzufTweet

Timestamp:

Jan 6, 2007, 10:37:42 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Only link with -ldl when available.
• Removed PKG_* stuff from configure.ac.
• Add more compilation warnings.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)

zzuf/trunk/configure.ac

@@ -15 +15 @@
 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)
@@ -42 +30 @@
 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([

zzuf/trunk/src/Makefile.am

@@ -9 +9 @@
                      random.c random.h
 libzzuf_la_LDFLAGS = -avoid-version -no-undefined
-libzzuf_la_LIBADD = -ldl
+libzzuf_la_LIBADD = @GETOPT_LIBS@ @DL_LIBS@