33 lines
1.1 KiB
Plaintext
33 lines
1.1 KiB
Plaintext
Put our CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS at the end so that we can
|
|
override optimisations...
|
|
|
|
Index: configure
|
|
--- configure.orig
|
|
+++ configure
|
|
@@ -3381,10 +3381,10 @@ $as_echo "$as_me: WARNING: another compiler except for
|
|
MYCFLAGS=""
|
|
MYCXXFLAGS=""
|
|
fi
|
|
-test -n "$CFLAGS" && MYCFLAGS="$CFLAGS $MYCFLAGS"
|
|
-test -n "$CXXFLAGS" && MYCXXFLAGS="$CXXFLAGS $MYCXXFLAGS"
|
|
-test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
|
|
-test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
|
|
+test -n "$CFLAGS" && MYCFLAGS="$MYCFLAGS $CFLAGS"
|
|
+test -n "$CXXFLAGS" && MYCXXFLAGS="$MYCXXFLAGS $CXXFLAGS"
|
|
+test -n "$CPPFLAGS" && MYCPPFLAGS="$MYCPPFLAGS $CPPFLAGS"
|
|
+test -n "$LDFLAGS" && MYLDFLAGS="$MYLDFLAGS $LDFLAGS"
|
|
|
|
# Byte order
|
|
|
|
@@ -4583,9 +4583,7 @@ then
|
|
MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.dylib"
|
|
MYLDLIBPATHENV="DYLD_LIBRARY_PATH"
|
|
else
|
|
- MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so.$MYLIBVER.$MYLIBREV.0"
|
|
- MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so.$MYLIBVER"
|
|
- MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so"
|
|
+ MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.so.${LIBkyotocabinet_VERSION}"
|
|
fi
|
|
fi
|
|
|