cmake: Code clean up, set up options before we start including custom macros, add...

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

diff --git a/extras/buildsystem/cmake/config.h.cmake b/extras/buildsystem/cmake/config.h.cmake
index 0f58594bc9c08575bbd59937e9a08383dab48b26..29a1a8d13a12cd347791669ca996e19c520ce5e9 100644 (file)
--- a/extras/buildsystem/cmake/config.h.cmake
+++ b/extras/buildsystem/cmake/config.h.cmake
@@ -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
@@ -331,7 +334,6 @@
 #cmakedefine PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR}
 #cmakedefine 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
+