63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
|
--- configure.in 2007-11-26 22:05:32.000000000 -0500
|
||
|
|
+++ configure.in.new 2007-11-28 09:55:52.000000000 -0500
|
||
|
|
@@ -25,25 +25,13 @@
|
||
|
|
MYPCFILES="tokyocabinet.pc"
|
||
|
|
|
||
|
|
# Building flags
|
||
|
|
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
|
||
|
|
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -L$HOME/include -L/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
|
||
|
|
-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"
|
||
|
|
+MYLDFLAGS="-L. -L\$(LIBDIR)"
|
||
|
|
MYRUNPATH="\$(LIBDIR)"
|
||
|
|
MYLDLIBPATHENV="LD_LIBRARY_PATH"
|
||
|
|
MYPOSTCMD="true"
|
||
|
|
|
||
|
|
-# Building paths
|
||
|
|
-pathtmp="$PATH"
|
||
|
|
-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||
|
|
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
||
|
|
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
||
|
|
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
||
|
|
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
||
|
|
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||
|
|
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-
|
||
|
|
#================================================================
|
||
|
|
# Options
|
||
|
|
#================================================================
|
||
|
|
@@ -96,7 +84,7 @@
|
||
|
|
AC_HELP_STRING([--enable-fastest], [build for fastest run]))
|
||
|
|
if test "$enable_fastest" = "yes"
|
||
|
|
then
|
||
|
|
- MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -O3"
|
||
|
|
+ MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char $CFLAGS -O3"
|
||
|
|
MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops"
|
||
|
|
MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST"
|
||
|
|
enables="$enables (fastest)"
|
||
|
|
--- Makefile.in 2007-11-26 06:36:37.000000000 -0500
|
||
|
|
+++ Makefile.in.new 2007-11-28 09:52:22.000000000 -0500
|
||
|
|
@@ -51,8 +51,8 @@
|
||
|
|
CFLAGS = @MYCFLAGS@
|
||
|
|
LDFLAGS = @MYLDFLAGS@
|
||
|
|
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@
|
||
|
|
|
||
|
|
|
||
|
|
--- tokyocabinet.pc.in 2007-11-04 20:05:50.000000000 -0500
|
||
|
|
+++ tokyocabinet.pc.in.new 2007-11-28 09:49:01.000000000 -0500
|
||
|
|
@@ -9,5 +9,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}
|