Index: Makefile.in =================================================================== --- Makefile.in +++ Makefile.in 2012-01-22 01:17:44.024035443 +0100 @@ -54,8 +54,8 @@ LDFLAGS = @MYLDFLAGS@ CMDLDFLAGS = @MYCMDLDFLAGS@ LIBS = @LIBS@ -LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. -RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ +LDENV = +RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) POSTCMD = @MYPOSTCMD@ Index: configure.in =================================================================== --- configure.in +++ configure.in 2012-01-22 01:16:12.655177711 +0100 @@ -32,25 +32,13 @@ # Building flags MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" -MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" -MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" +MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" +MYLDFLAGS="-L. -L\$(LIBDIR)" MYCMDLDFLAGS="" MYRUNPATH="\$(LIBDIR)" MYLDLIBPATHENV="LD_LIBRARY_PATH" MYPOSTCMD="true" -# Building paths -PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" -PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" -CPATH="$HOME/include:/usr/local/include:$CPATH" -LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" -PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" -export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH - - - #================================================================ # Options #================================================================ @@ -64,7 +52,7 @@ AC_HELP_STRING([--enable-debug], [build for debugging])) if test "$enable_debug" = "yes" then - MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -g -O0" + MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -g -O0 $CFLAGS" MYCPPFLAGS="$MYCPPFLAGS -UNDEBUG" MYCMDLDFLAGS="$MYCMDLDFLAGS -static" enables="$enables (debug)" @@ -239,16 +227,6 @@ # C compiler AC_PROG_CC -# Reset variables -if test "$GCC" != "yes" -then - AC_MSG_WARN([another compiler except for GCC was detected]) - MYCFLAGS="" -fi -test -n "$CFLAGS" && MYCFLAGS="$CFLAGS $MYCFLAGS" -test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS" -test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS" - # Byte order AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND") Index: tokyocabinet.pc.in =================================================================== --- tokyocabinet.pc.in +++ tokyocabinet.pc.in 2012-01-22 01:22:08.956723330 +0100 @@ -10,5 +10,5 @@ Name: Tokyo Cabinet Description: a modern implementation of DBM Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -ltokyocabinet @LIBS@ +Libs: -L${libdir} -ltokyocabinet Cflags: -I${includedir}