X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fbuildsystem%2Fcmake%2Fconfig.h.cmake;h=e04d1ab0a6825521bff3fe329a0252277999f207;hb=f2b2e37c04b2921e29daa3260dc696646ad4f10c;hp=0f58594bc9c08575bbd59937e9a08383dab48b26;hpb=07868f1396d57621c48ca8d1721dacecc98668f5;p=vlc

diff --git a/extras/buildsystem/cmake/config.h.cmake b/extras/buildsystem/cmake/config.h.cmake
index 0f58594bc9..e04d1ab0a6 100644
--- a/extras/buildsystem/cmake/config.h.cmake
+++ b/extras/buildsystem/cmake/config.h.cmake
@@ -57,9 +57,6 @@
 #cmakedefine HAVE_D3D9_H
 #cmakedefine HAVE_DAEMON
 #cmakedefine HAVE_DBUS
-#cmakedefine HAVE_DBUS_1
-#cmakedefine HAVE_DBUS_2
-#cmakedefine HAVE_DBUS_3
 #cmakedefine HAVE_DCGETTEXT
 #cmakedefine HAVE_DDRAW_H
 #cmakedefine HAVE_DECL_FEOF_UNLOCKED
@@ -90,8 +87,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
@@ -119,7 +119,6 @@
 #cmakedefine HAVE_GMTIME_R
 #cmakedefine HAVE_GOOM_GOOM_H
 #cmakedefine HAVE_HAL
-#cmakedefine HAVE_HAL_1
 #cmakedefine HAVE_ICONV
 #cmakedefine HAVE_ID3TAG_H
 #cmakedefine HAVE_IF_NAMETOINDEX
@@ -283,6 +282,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,8 +314,11 @@
 #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
+#cmakedefine LIBEXT "${LIBEXT}"
 #cmakedefine NDEBUG
 #cmakedefine NO_MINUS_C_MINUS_O
 #cmakedefine NTOHL_IN_SYS_PARAM_H
@@ -327,11 +330,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
@@ -419,4 +421,5 @@
 #cmakedefine glthread_once_call            libintl_once_call
 #cmakedefine glthread_once_singlethreaded  libintl_once_singlethreaded
 #include <vlc_fixups.h>
-#endif
\ No newline at end of file
+#endif
+