diff -Naur tokyotyrant-1.1.33/configure.in tokyotyrant-1.1.33.oden/configure.in --- tokyotyrant-1.1.33/configure.in 2009-07-17 18:13:14.000000000 +0200 +++ tokyotyrant-1.1.33.oden/configure.in 2009-08-19 18:07:38.000000000 +0200 @@ -28,33 +28,14 @@ MYPCFILES="tokyotyrant.pc" # 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" +MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char $CFLAGS" +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 -if type pkg-config > /dev/null 2>&1 -then - PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`" - CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`" - LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" -fi - - - #================================================================ # Options #================================================================ @@ -191,16 +172,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") diff -Naur tokyotyrant-1.1.33/Makefile.in tokyotyrant-1.1.33.oden/Makefile.in --- tokyotyrant-1.1.33/Makefile.in 2009-07-15 04:45:06.000000000 +0200 +++ tokyotyrant-1.1.33.oden/Makefile.in 2009-08-19 18:09:42.000000000 +0200 @@ -58,8 +58,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@ diff -Naur tokyotyrant-1.1.33/tokyotyrant.pc.in tokyotyrant-1.1.33.oden/tokyotyrant.pc.in --- tokyotyrant-1.1.33/tokyotyrant.pc.in 2008-02-18 08:29:28.000000000 +0100 +++ tokyotyrant-1.1.33.oden/tokyotyrant.pc.in 2009-08-19 18:10:02.000000000 +0200 @@ -10,5 +10,5 @@ Name: Tokyo Tyrant Description: network interface of Tokyo Cabinet Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -ltokyotyrant @LIBS@ +Libs: -L${libdir} -ltokyotyrant Cflags: -I${includedir}