Fix various bugs / missing checks for cmake

[vlc] / extras / buildsystem / cmake / config.h.cmake

diff --git a/extras/buildsystem/cmake/config.h.cmake b/extras/buildsystem/cmake/config.h.cmake
index 1665974aac8e773ec7ee56434f360997c8775369..a4ee546933ca068b12e66b00e2113acc53ffc4ba 100644 (file)
--- a/extras/buildsystem/cmake/config.h.cmake
+++ b/extras/buildsystem/cmake/config.h.cmake
@@ -90,8 +90,11 @@
 #cmakedefine HAVE_FFMPEG_AVCODEC_H
 #cmakedefine HAVE_FFMPEG_AVFORMAT_H
 #cmakedefine HAVE_FFMPEG_AVUTIL_H
-#cmakedefine HAVE_FFMPEG_AVUTIL_H_
 #cmakedefine HAVE_FFMPEG_SWSCALE_H
+#cmakedefine HAVE_LIBAVCODEC_AVCODEC_H
+#cmakedefine HAVE_LIBAVFORMAT_AVFORMAT_H
+#cmakedefine HAVE_LIBAVUTIL_AVUTIL_H
+#cmakedefine HAVE_LIBSWSCALE_SWSCALE_H
 #cmakedefine HAVE_FLAC_STREAM_DECODER_H
 #cmakedefine HAVE_FONTCONFIG_FONTCONFIG_H
 #cmakedefine HAVE_FORK
@@ -283,6 +286,7 @@
 #cmakedefine HAVE_UNISTD_H
 #cmakedefine HAVE_UNSIGNED_LONG_LONG
 #cmakedefine HAVE_UNSIGNED_LONG_LONG_INT
+#cmakedefine HAVE_USELOCALE
 #cmakedefine HAVE_VASPRINTF
 #cmakedefine HAVE_VA_COPY
 #cmakedefine HAVE_VCDINFO
@@ -314,6 +318,9 @@
 #cmakedefine HAVE___FSETLOCKING
 #cmakedefine HAVE___VA_COPY
 #cmakedefine ICONV_CONST ${ICONV_CONST}
+#ifndef ICONV_CONST
+# define ICONV_CONST
+#endif
 #cmakedefine INTDIV0_RAISES_SIGFPE
 #cmakedefine LIBEXT "${LIBEXT}"
 #cmakedefine NDEBUG
@@ -327,11 +334,10 @@
 #cmakedefine PACKAGE_TARNAME "${PACKAGE_TARNAME}"
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
 #cmakedefine PACKAGE_VERSION_EXTRA "${PACKAGE_VERSION_EXTRA}"
-#cmakedefine PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR}
-#cmakedefine PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR}
-#cmakedefine PACKAGE_VERSION_REVISION ${PACKAGE_VERSION_REVISION}
+#define PACKAGE_VERSION_MAJOR "@PACKAGE_VERSION_MAJOR@"
+#define PACKAGE_VERSION_MINOR "@PACKAGE_VERSION_MINOR@"
+#define PACKAGE_VERSION_REVISION "@PACKAGE_VERSION_REVISION@"
 #cmakedefine PRI_MACROS_BROKEN
-#cmakedefine PTHREAD_IN_USE_DETECTION_HARD
 #cmakedefine RETSIGTYPE
 #cmakedefine SDL_IMAGE_INCLUDE_FILE
 #cmakedefine SDL_INCLUDE_FILE