fix_configure-1.2.62.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. diff --git a/configure.in b/configure.in
  2. index 94e9d29..6999615 100644
  3. --- a/configure.in
  4. +++ b/configure.in
  5. @@ -35,27 +35,18 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION ChangeLog doc kyotocabinet.idl"
  6. MYPCFILES="kyotocabinet.pc"
  7. # Building flags
  8. -MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2"
  9. -MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2"
  10. -MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I/usr/local/include"
  11. +MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char"
  12. +MYCXXFLAGS="-Wall -fPIC -fsigned-char"
  13. +MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
  14. MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
  15. MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
  16. -MYLDFLAGS="-L. -L\$(LIBDIR) -L/usr/local/lib"
  17. +MYLDFLAGS="-L. -L\$(LIBDIR)"
  18. MYCMDLDFLAGS=""
  19. MYCMDLIBS=""
  20. MYLDLIBPATH=""
  21. MYLDLIBPATHENV="LD_LIBRARY_PATH"
  22. MYPOSTCMD="true"
  23. -# Building paths
  24. -PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH"
  25. -CPATH=".:/usr/local/include:$CPATH"
  26. -LIBRARY_PATH=".:/usr/local/lib:$LIBRARY_PATH"
  27. -LD_LIBRARY_PATH=".:/usr/local/lib:$LD_LIBRARY_PATH"
  28. -PKG_CONFIG_PATH=".:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
  29. -export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
  30. -
  31. -
  32. #================================================================
  33. # Options
  34. @@ -285,14 +276,6 @@ then
  35. MYCMDLIBS="$MYCMDLIBS $LIBS"
  36. fi
  37. -# As-needed linking
  38. -if uname | grep Linux >config.tmp
  39. -then
  40. - MYLDFLAGS="$MYLDFLAGS -Wl,-rpath-link,.:/usr/local/lib:$MYLDLIBPATH"
  41. - MYLDFLAGS="$MYLDFLAGS -Wl,--as-needed"
  42. -else
  43. - MYCMDLIBS="$MYCMDLIBS $LIBS"
  44. -fi
  45. # Shared libraries
  46. if test "$enable_shared" != "no" && test "$enable_profile" != "yes"