remove-internal-libzen-support.patch 5.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137
  1. diff --git a/Project/GNU/CLI/configure.ac b/Project/GNU/CLI/configure.ac
  2. index 275c349..1ddeec0 100644
  3. --- a/Project/GNU/CLI/configure.ac
  4. +++ b/Project/GNU/CLI/configure.ac
  5. @@ -65,16 +65,10 @@ dnl #########################################################################
  6. dnl -------------------------------------------------------------------------
  7. dnl Unicode
  8. dnl
  9. -if test -e ../../../../ZenLib/Project/GNU/Library/libzen-config; then
  10. - enable_unicode="$(../../../../ZenLib/Project/GNU/Library/libzen-config Unicode)"
  11. -elif test "$(libzen-config Exists)" = "yes" ; then
  12. - enable_unicode="$(libzen-config Unicode)"
  13. +if pkg-config --exists libzen; then
  14. + enable_unicode="$(pkg-config --variable=Unicode libzen)"
  15. else
  16. - if pkg-config --exists libzen; then
  17. - enable_unicode="$(pkg-config --variable=Unicode libzen)"
  18. - else
  19. - AC_MSG_ERROR([libzen configuration is not found])
  20. - fi
  21. + AC_MSG_ERROR([libzen package is not found])
  22. fi
  23. dnl #########################################################################
  24. @@ -198,41 +192,19 @@ fi
  25. dnl -------------------------------------------------------------------------
  26. dnl ZenLib
  27. dnl
  28. -if test -e ../../../../ZenLib/Project/GNU/Library/libzen.la; then
  29. - CXXFLAGS="$CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
  30. - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
  31. - if test "$enable_staticlibs" = "yes"; then
  32. - with_zenlib="builtin (static)"
  33. - LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS_Static)"
  34. - else
  35. - with_zenlib="builtin"
  36. - LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
  37. - fi
  38. -elif test "$(libzen-config Exists)" = "yes" ; then
  39. - CXXFLAGS="$CXXFLAGS $(libzen-config CXXFLAGS)"
  40. - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(libzen-config CXXFLAGS)"
  41. +
  42. +if pkg-config --exists libzen; then
  43. + CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
  44. + MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
  45. if test "$enable_staticlibs" = "yes"; then
  46. with_zenlib="system (static)"
  47. - LIBS="$LIBS $(libzen-config LIBS_Static)"
  48. + LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
  49. else
  50. with_zenlib="system"
  51. - LIBS="$LIBS $(libzen-config LIBS)"
  52. + LIBS="$LIBS $(pkg-config --libs libzen)"
  53. fi
  54. else
  55. - if pkg-config --exists libzen; then
  56. - CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
  57. - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
  58. - if test "$enable_staticlibs" = "yes"; then
  59. - with_zenlib="system (static)"
  60. - LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
  61. - LIBS="$LIBS $(pkg-config --static --libs libzen)"
  62. - else
  63. - with_zenlib="system"
  64. - LIBS="$LIBS $(pkg-config --libs libzen)"
  65. - fi
  66. - else
  67. - AC_MSG_ERROR([libzen configuration is not found])
  68. - fi
  69. + AC_MSG_ERROR([libzen package is not found])
  70. fi
  71. dnl #########################################################################
  72. diff --git a/Project/GNU/GUI/configure.ac b/Project/GNU/GUI/configure.ac
  73. index 78bdeff..ea9203d 100644
  74. --- a/Project/GNU/GUI/configure.ac
  75. +++ b/Project/GNU/GUI/configure.ac
  76. @@ -79,14 +79,10 @@ dnl #########################################################################
  77. dnl -------------------------------------------------------------------------
  78. dnl Unicode
  79. dnl
  80. -if test -e ../../../../ZenLib/Project/GNU/Library/libzen-config; then
  81. - enable_unicode="$(../../../../ZenLib/Project/GNU/Library/libzen-config Unicode)"
  82. +if pkg-config --exists libzen; then
  83. + enable_unicode="$(pkg-config --variable=Unicode libzen)"
  84. else
  85. - if pkg-config --exists libzen; then
  86. - enable_unicode="$(pkg-config --variable=Unicode libzen)"
  87. - else
  88. - AC_MSG_ERROR([libzen configuration is not found])
  89. - fi
  90. + AC_MSG_ERROR([libzen package is not found])
  91. fi
  92. dnl #########################################################################
  93. @@ -313,31 +309,19 @@ fi
  94. dnl -------------------------------------------------------------------------
  95. dnl ZenLib
  96. dnl
  97. -if test -e ../../../../ZenLib/Project/GNU/Library/libzen.la; then
  98. - CXXFLAGS="$CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
  99. - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
  100. +if pkg-config --exists libzen; then
  101. + CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
  102. + MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
  103. if test "$enable_staticlibs" = "yes"; then
  104. - with_zenlib="builtin (static)"
  105. - LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS_Static)"
  106. + with_zenlib="system (static)"
  107. + LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
  108. + LIBS="$LIBS $(pkg-config --static --libs libzen)"
  109. else
  110. - with_zenlib="builtin"
  111. - LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
  112. + with_zenlib="system"
  113. + LIBS="$LIBS $(pkg-config --libs libzen)"
  114. fi
  115. else
  116. - if pkg-config --exists libzen; then
  117. - CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
  118. - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
  119. - if test "$enable_staticlibs" = "yes"; then
  120. - with_zenlib="system (static)"
  121. - LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
  122. - LIBS="$LIBS $(pkg-config --static --libs libzen)"
  123. - else
  124. - with_zenlib="system"
  125. - LIBS="$LIBS $(pkg-config --libs libzen)"
  126. - fi
  127. - else
  128. - AC_MSG_ERROR([libzen configuration is not found])
  129. - fi
  130. + AC_MSG_ERROR([libzen package is not found])
  131. fi
  132. dnl #########################################################################