Fix FTBFS with missing xconfig.h. Thanks to Matt Kraai for the patch.

git-svn-id: svn://svn.debian.org/debburn/cdrkit/trunk@839 a95a6be8-091b-0410-adaf-d31e6857962f
openEuler-Networking · Nov 27, 2009 · 3917d08 · 3917d08
1 parent 2fadf5b
commit 3917d08
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 11 deletions.
diff --git a/Changelog b/Changelog
@@ -7,6 +7,7 @@ cdrkit (1.1.10) UNRELEASED; urgency=low
     time-consuming, so split it out into multiple threads if possible.
   * genisoimage: allow user to specify which checksum algorithms to run
     on the command line.
+  * Fix FTBFS with missing xconfig.h. Thanks to Matt Kraai for the patch.
 
   [ Nikola Pajkovsky ]
   * genisoimage: fix string overflow breakage when using the -root

diff --git a/debian/changelog b/debian/changelog
@@ -2,6 +2,8 @@ cdrkit (9:1.1.10-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Several functions that clash with POSIX renamed.  (Closes: #547886)
+  * Fix FTBFS with missing xconfig.h. Thanks to Matt Kraai for the patch.
+    Closes: #556382
 
  -- Peter Samuelson <[email protected]>  Sun, 11 Oct 2009 17:34:51 -0500
 

diff --git a/genisoimage/CMakeLists.txt b/genisoimage/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT (MKISOFS C)
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
 
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 
 INCLUDE(CheckIncludeFiles)
 CHECK_INCLUDE_FILES("magic.h" USE_MAGIC)

diff --git a/icedax/CMakeLists.txt b/icedax/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (icedax C)
-INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 include(../include/AddScgBits.cmake)
 include(../include/AddSchilyBits.cmake)
 include(../include/AddNetworkBits.cmake)

diff --git a/libedc/CMakeLists.txt b/libedc/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBEDC C)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 
 AUX_SOURCE_DIRECTORY(. LIBEDC_SRCS)
 

diff --git a/libhfs_iso/CMakeLists.txt b/libhfs_iso/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBhfs_iso C)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 ADD_DEFINITIONS(-DUSE_LARGEFILES -DABORT_DEEP_ISO_ONLY -DAPPLE_HYB -DUDF -DDVD_VIDEO -DSORTING -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG)
 
 

diff --git a/libparanoia/CMakeLists.txt b/libparanoia/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBparanoia C)
-INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../wodim)
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../wodim ${CMAKE_BINARY_DIR}/include)
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 SET(LIBparanoia_SRCS gap.c isort.c overlap.c p_block.c paranoia.c pmalloc.c)
 

diff --git a/librols/CMakeLists.txt b/librols/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBROLS C)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim)
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim ${CMAKE_BINARY_DIR}/include)
 
 SET(LIBROLS_SRCS  astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c  stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/peekc.c default.c)
 

diff --git a/libunls/CMakeLists.txt b/libunls/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBunls C)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
     IF(HAVE_ICONV_H)

diff --git a/libusal/CMakeLists.txt b/libusal/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBSCG C)
-INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 include(../include/AddScgBits.cmake)
 ADD_DEFINITIONS(-DUSE_RCMD_RSH)
 

diff --git a/netscsid/CMakeLists.txt b/netscsid/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (netscsid C)
-INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} )
+INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
 INCLUDE(../include/AddNetworkBits.cmake)

diff --git a/readom/CMakeLists.txt b/readom/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (READECD C)
-INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
 

diff --git a/wodim/CMakeLists.txt b/wodim/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (CDRECORD C)
-INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
 INCLUDE(../include/AddScgBits.cmake)
 include(../include/AddSchilyBits.cmake)