From kde-commits Wed Jan 11 11:52:54 2012 From: Yury Georgievich Kudryashov Date: Wed, 11 Jan 2012 11:52:54 +0000 To: kde-commits Subject: KDE/kdemultimedia Message-Id: <20120111115254.18EC3AC890 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=132628293408881 SVN commit 1273070 by kudryashov: Remove unused parts of ConfigureChecks.cmake M +0 -18 ConfigureChecks.cmake M +0 -36 config.h.cmake M +0 -18 kmix/ConfigureChecks.cmake M +0 -36 kmix/config.h.cmake --- trunk/KDE/kdemultimedia/ConfigureChecks.cmake #1273069:1273070 @@ -7,14 +7,8 @@ # definitions like _GNU_SOURCE that are needed on each platform. set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS}) -macro_bool_to_01(CARBON_FOUND HAVE_CARBON) - -macro_bool_to_01(AKODE_FOUND HAVE_AKODE) - macro_bool_to_01(OGGVORBIS_FOUND HAVE_VORBIS) -macro_bool_to_01(X11_XShm_FOUND HAVE_XSHMGETEVENTBASE) - macro_bool_to_01(PULSEAUDIO_FOUND HAVE_PULSE) #now check for dlfcn.h using the cmake supplied CHECK_include_FILE() macro @@ -29,20 +23,8 @@ set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES} ) endif (WIN32) -check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H) -check_include_files(soundcard.h HAVE_SOUNDCARD_H) -check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) -check_include_files(sys/stat.h HAVE_SYS_STAT_H) -check_include_files(linux/cdrom.h HAVE_LINUX_CDROM_H) -check_include_files(linux/ucdrom.h HAVE_LINUX_UCDROM_H) check_include_files(machine/endian.h HAVE_MACHINE_ENDIAN_H) -check_include_files(sys/audioio.h HAVE_SYS_AUDIOIO_H) -check_include_files(Alib.h HAVE_ALIB_H) -check_include_files(alloca.h HAVE_ALLOCA_H) # Linux has , FreeBSD has and Solaris has neither. check_include_files(endian.h HAVE_ENDIAN_H) check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H) check_include_files(unistd.h HAVE_UNISTD_H) - -check_type_size("long" SIZEOF_LONG) - --- trunk/KDE/kdemultimedia/config.h.cmake #1273069:1273070 @@ -1,39 +1,12 @@ /* config.h. Generated by cmake from config.h.cmake */ /* Don't add anything new here!!! Use per-directory generated files. */ -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ALIB_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ALLOCA_H 1 - /* define to 1 if you have PulseAudio headers */ #cmakedefine HAVE_PULSE 1 /* Define if you ogg/vorbis installed */ #cmakedefine HAVE_VORBIS ${OGGVORBIS_VERSION} -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LINUX_CDROM_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LINUX_UCDROM_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MACHINE_SOUNDCARD_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SOUNDCARD_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_AUDIOIO_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_SOUNDCARD_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MACHINE_ENDIAN_H 1 @@ -43,14 +16,5 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ENDIAN_H 1 -/* Define if you have XShmGetEventBase in header file. */ #cmakedefine HAVE_UNISTD_H 1 --- trunk/KDE/kdemultimedia/kmix/ConfigureChecks.cmake #1273069:1273070 @@ -7,14 +7,8 @@ # definitions like _GNU_SOURCE that are needed on each platform. set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS}) -macro_bool_to_01(CARBON_FOUND HAVE_CARBON) - -macro_bool_to_01(AKODE_FOUND HAVE_AKODE) - macro_bool_to_01(OGGVORBIS_FOUND HAVE_VORBIS) -macro_bool_to_01(X11_XShm_FOUND HAVE_XSHMGETEVENTBASE) - macro_bool_to_01(PULSEAUDIO_FOUND HAVE_PULSE) #now check for dlfcn.h using the cmake supplied CHECK_include_FILE() macro @@ -29,20 +23,8 @@ set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES} ) endif (WIN32) -check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H) -check_include_files(soundcard.h HAVE_SOUNDCARD_H) -check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) -check_include_files(sys/stat.h HAVE_SYS_STAT_H) -check_include_files(linux/cdrom.h HAVE_LINUX_CDROM_H) -check_include_files(linux/ucdrom.h HAVE_LINUX_UCDROM_H) check_include_files(machine/endian.h HAVE_MACHINE_ENDIAN_H) -check_include_files(sys/audioio.h HAVE_SYS_AUDIOIO_H) -check_include_files(Alib.h HAVE_ALIB_H) -check_include_files(alloca.h HAVE_ALLOCA_H) # Linux has , FreeBSD has and Solaris has neither. check_include_files(endian.h HAVE_ENDIAN_H) check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H) check_include_files(unistd.h HAVE_UNISTD_H) - -check_type_size("long" SIZEOF_LONG) - --- trunk/KDE/kdemultimedia/kmix/config.h.cmake #1273069:1273070 @@ -1,39 +1,12 @@ /* config.h. Generated by cmake from config.h.cmake */ /* Don't add anything new here!!! Use per-directory generated files. */ -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ALIB_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ALLOCA_H 1 - /* define to 1 if you have PulseAudio headers */ #cmakedefine HAVE_PULSE 1 /* Define if you ogg/vorbis installed */ #cmakedefine HAVE_VORBIS ${OGGVORBIS_VERSION} -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LINUX_CDROM_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LINUX_UCDROM_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MACHINE_SOUNDCARD_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SOUNDCARD_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_AUDIOIO_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_SOUNDCARD_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MACHINE_ENDIAN_H 1 @@ -43,14 +16,5 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ENDIAN_H 1 -/* Define if you have XShmGetEventBase in header file. */ #cmakedefine HAVE_UNISTD_H 1