|
 |
fe296c3 |
--- configure.in 2008-12-27 05:21:45.000000000 -0500
|
|
|
fe296c3 |
+++ configure.in.new 2009-01-13 18:16:44.000000000 -0500
|
|
|
fe296c3 |
@@ -31,26 +31,14 @@
|
|
|
b092110 |
MYPCFILES="tokyocabinet.pc"
|
|
|
b092110 |
|
|
|
b092110 |
# Building flags
|
|
|
b092110 |
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
|
|
|
fe296c3 |
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
|
|
|
b092110 |
-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
|
|
|
b092110 |
+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char $CFLAGS"
|
|
|
b092110 |
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1"
|
|
|
b092110 |
+MYLDFLAGS="-L. -L\$(LIBDIR)"
|
|
|
fe296c3 |
MYCMDLDFLAGS=""
|
|
|
b092110 |
MYRUNPATH="\$(LIBDIR)"
|
|
|
b092110 |
MYLDLIBPATHENV="LD_LIBRARY_PATH"
|
|
|
b092110 |
MYPOSTCMD="true"
|
|
|
b092110 |
|
|
|
b092110 |
-# Building paths
|
|
|
b092110 |
-pathtmp="$PATH"
|
|
|
b092110 |
-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
|
|
b092110 |
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
|
|
fe296c3 |
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
|
|
b092110 |
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
|
|
b092110 |
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
|
|
b092110 |
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
|
|
|
fe296c3 |
-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
|
|
|
b092110 |
-
|
|
|
b092110 |
-
|
|
|
b092110 |
-
|
|
|
b092110 |
#================================================================
|
|
|
b092110 |
# Options
|
|
|
b092110 |
#================================================================
|
|
|
fe296c3 |
@@ -103,7 +91,7 @@
|
|
|
b092110 |
AC_HELP_STRING([--enable-fastest], [build for fastest run]))
|
|
|
b092110 |
if test "$enable_fastest" = "yes"
|
|
|
b092110 |
then
|
|
|
b092110 |
- MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -O3"
|
|
|
b092110 |
+ MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char $CFLAGS -O3"
|
|
|
b092110 |
MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops"
|
|
|
b092110 |
MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST"
|
|
|
b092110 |
enables="$enables (fastest)"
|
|
|
fe296c3 |
--- Makefile.in 2008-12-22 12:02:44.000000000 -0500
|
|
|
fe296c3 |
+++ Makefile.in.new 2009-01-13 18:17:54.000000000 -0500
|
|
|
fe296c3 |
@@ -54,8 +54,8 @@
|
|
|
b092110 |
LDFLAGS = @MYLDFLAGS@
|
|
|
fe296c3 |
CMDLDFLAGS = @MYCMDLDFLAGS@
|
|
|
b092110 |
LIBS = @LIBS@
|
|
|
b092110 |
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
|
|
|
b092110 |
-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
|
|
|
b092110 |
+LDENV =
|
|
|
b092110 |
+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
|
|
|
b092110 |
POSTCMD = @MYPOSTCMD@
|
|
|
b092110 |
|
|
|
b092110 |
|
|
|
fe296c3 |
--- tokyocabinet.pc.in 2008-02-18 02:25:18.000000000 -0500
|
|
|
fe296c3 |
+++ tokyocabinet.pc.in.new 2009-01-13 18:18:52.000000000 -0500
|
|
|
fe296c3 |
@@ -10,5 +10,5 @@
|
|
|
b092110 |
Name: Tokyo Cabinet
|
|
|
b092110 |
Description: a modern implementation of DBM
|
|
|
b092110 |
Version: @PACKAGE_VERSION@
|
|
|
b092110 |
-Libs: -L${libdir} -ltokyocabinet @LIBS@
|
|
|
b092110 |
+Libs: -L${libdir} -ltokyocabinet
|
|
|
b092110 |
Cflags: -I${includedir}
|