[Debburn-changes] r270 - in nonameyet/trunk: . cdda2wav doc/READMEs
doc/READMEs/plattforms include mkisofs
Eduard Bloch
blade at costa.debian.org
Tue Sep 12 08:43:59 UTC 2006
Author: blade
Date: 2006-09-12 08:43:59 +0000 (Tue, 12 Sep 2006)
New Revision: 270
Added:
nonameyet/trunk/doc/READMEs/plattforms/README.volmgt
nonameyet/trunk/include/test_SYS_UNION_WAIT.c
nonameyet/trunk/include/test_UNION_WAIT.c
Removed:
nonameyet/trunk/doc/READMEs/README.volmgt
Modified:
nonameyet/trunk/TODO
nonameyet/trunk/cdda2wav/CMakeLists.txt
nonameyet/trunk/doc/READMEs/plattforms/README.aix
nonameyet/trunk/doc/READMEs/plattforms/README.win32
nonameyet/trunk/include/CMakeLists.txt
nonameyet/trunk/include/xconfig.h.in
nonameyet/trunk/mkisofs/CMakeLists.txt
Log:
Cygwin fixes, README rewritten (needs better tests, though)
Modified: nonameyet/trunk/TODO
===================================================================
--- nonameyet/trunk/TODO 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/TODO 2006-09-12 08:43:59 UTC (rev 270)
@@ -1,13 +1,17 @@
- Check the readmes. Drop obsolete instructions. (assigned to: ???)
+ - POSIX checks for sys/wait.h rather than pure existence check
+ - proper getnameinfo/inet_ntoa checks, see include/CMakeLists.txt
+ - find out why spawn.c breaks in WAIT_H while the WAIT_UNION check works quite well on sys/wait.h. See include/CMakeLists.txt comments.
+ - rewrite or drop fconv.c, it does not compile on AIX, missing isnan symbol. Or link libm, as alternative.
- check notes in help output, drop advisories, notes about future plans...
- some cdda2wav defined moved from the ueber-long command line to lconfig.h ,
make them configurable. Implement generation of cdda2wav/lconfig.h or just
replace with cmake macros (assigned to: ???)
- - add better detection for various functions. Eg. correct checks for have_soundcard, have_mlockall and have_wait_h for cygwin. (volunteers?)
+ - add better detection for various functions. Eg. correct checks for have_soundcard, have_mlockall for cygwin. (volunteers?)
- see http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=cdrkit and try to solve upstream related problems
- find and eliminate remaining ".mk" ".mk*" files (where? cleanup branch)
- Can we rename the 'cdrecord' directory into 'wodim'?
That may be hard on the build system, this could be the best time
- to change it.
+ to change it. (No, it isn't hard. EB.)
Modified: nonameyet/trunk/cdda2wav/CMakeLists.txt
===================================================================
--- nonameyet/trunk/cdda2wav/CMakeLists.txt 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/cdda2wav/CMakeLists.txt 2006-09-12 08:43:59 UTC (rev 270)
@@ -11,12 +11,16 @@
ADD_DEFINITIONS(-DHAVE_LINUX_SOUNDCARD_H)
ENDIF(HAVE_LINUX_SOUNDCARD_H)
+LIST(APPEND LIBS schily deflt paranoia)
+IF (WIN32)
+ LIST(APPEND LIBS winmm)
+ENDIF (WIN32)
+
LINK_DIRECTORIES(../libschily ../libscg ../libdeflt ../libparanoia)
ADD_EXECUTABLE (cdda2wav aifc.c aiff.c base64.c cd_misc.c cdda2wav.c defaults.c getnum.c interface.c ioctl.c md5c.c modes.c raw.c resample.c ringbuff.c scsi_cdr.c scsi_cmds.c scsi_scan.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
-TARGET_LINK_LIBRARIES(cdda2wav ${SCG_LIBS} schily deflt paranoia)
+TARGET_LINK_LIBRARIES(cdda2wav ${SCG_LIBS} ${LIBS})
SET_TARGET_PROPERTIES(cdda2wav PROPERTIES SKIP_BUILD_RPATH TRUE)
-
INSTALL(TARGETS cdda2wav DESTINATION bin)
INSTALL(PROGRAMS pitchplay readmult cdda2mp3 cdda2ogg DESTINATION bin)
INSTALL(FILES cdda2ogg.1 cdda2wav.1 pitchplay.1 readmult.1 list_audio_tracks.1 DESTINATION share/man/man1)
Deleted: nonameyet/trunk/doc/READMEs/README.volmgt
===================================================================
--- nonameyet/trunk/doc/READMEs/README.volmgt 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/doc/READMEs/README.volmgt 2006-09-12 08:43:59 UTC (rev 270)
@@ -1,44 +0,0 @@
-If you are on NeXT-Step/Apple Rhapsody,
-you must disable volume management before creating a CD.
-On older Solaris versions, you may also need to disable the volume management.
-
-This is needed because newer drives identify themselves correctly
-as CD-ROM drives. Unfortunately, the volume management daemon from
-Sun/Apple does not grok, that there may be a recordable medium in the drive.
-
-You do this on Solaris permanently by editing /etc/vold.conf
-NeXT-Step/Apple Rhapsody will only work correctly if you reboot while
-the CD-R drive is powered off.
-
-On Solaris you need to stop the volume management if you like to use the USCSI
-fallback SCSI transport code. Even things like cdrecord -scanbus
-will not work if the volume management is running.
-
-If the Solaris version you are running is recent enough, libscg will try to
-interace with the volume management. However, Solaris does not allow you to
-access a drive that is maintained by the volume management but does not
-include a medium. Cdrecord will mark this fact by printing a '?' during
-a -scanbus run.
-
-Cdrecord-ProDVD-Clone 2.01a23 (i386-pc-solaris2.9) Copyright (C) 1995-2003 Jörg Schilling
-scsidev: 'USCSI:'
-devname: 'USCSI'
-scsibus: -1 target: -1 lun: -1
-Warning: Using USCSI interface.
-Warning: Volume management is running, medialess managed drives are invisible.
-Using libscg version 'schily-0.7'.
-scsibus1:
- 1,0,0 100) ?
- 1,1,0 101) 'HP ' 'DVD Writer 200j ' '1.36' Removable CD-ROM
- 1,2,0 102) *
- 1,3,0 103) *
- 1,4,0 104) *
- 1,5,0 105) *
- 1,6,0 106) *
- 1,7,0 107) *
-
-If you insert a medium and close the tray, the medium becomes visible again.
-Note that for this reason, it is impossible to use cdrecord with automated
-scripts if the volume manager is configured to include a CD/DVD writer
-as it is impossible to close the door of the drive.
-
Modified: nonameyet/trunk/doc/READMEs/plattforms/README.aix
===================================================================
--- nonameyet/trunk/doc/READMEs/plattforms/README.aix 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/doc/READMEs/plattforms/README.aix 2006-09-12 08:43:59 UTC (rev 270)
@@ -1,7 +1,8 @@
NOTE:
- - wodim has not been tested on AIX yet. It may need porting efforts.
+wodim does not compile on AIX yet. It needs porting effors.
+
- the following information has been extracted from the cdrecord documentation
(cdrtools package by Joerg Schilling)
Copied: nonameyet/trunk/doc/READMEs/plattforms/README.volmgt (from rev 269, nonameyet/trunk/doc/READMEs/README.volmgt)
===================================================================
--- nonameyet/trunk/doc/READMEs/plattforms/README.volmgt (rev 0)
+++ nonameyet/trunk/doc/READMEs/plattforms/README.volmgt 2006-09-12 08:43:59 UTC (rev 270)
@@ -0,0 +1,44 @@
+If you are on NeXT-Step/Apple Rhapsody,
+you must disable volume management before creating a CD.
+On older Solaris versions, you may also need to disable the volume management.
+
+This is needed because newer drives identify themselves correctly
+as CD-ROM drives. Unfortunately, the volume management daemon from
+Sun/Apple does not grok, that there may be a recordable medium in the drive.
+
+You do this on Solaris permanently by editing /etc/vold.conf
+NeXT-Step/Apple Rhapsody will only work correctly if you reboot while
+the CD-R drive is powered off.
+
+On Solaris you need to stop the volume management if you like to use the USCSI
+fallback SCSI transport code. Even things like cdrecord -scanbus
+will not work if the volume management is running.
+
+If the Solaris version you are running is recent enough, libscg will try to
+interace with the volume management. However, Solaris does not allow you to
+access a drive that is maintained by the volume management but does not
+include a medium. Cdrecord will mark this fact by printing a '?' during
+a -scanbus run.
+
+Cdrecord-ProDVD-Clone 2.01a23 (i386-pc-solaris2.9) Copyright (C) 1995-2003 Jörg Schilling
+scsidev: 'USCSI:'
+devname: 'USCSI'
+scsibus: -1 target: -1 lun: -1
+Warning: Using USCSI interface.
+Warning: Volume management is running, medialess managed drives are invisible.
+Using libscg version 'schily-0.7'.
+scsibus1:
+ 1,0,0 100) ?
+ 1,1,0 101) 'HP ' 'DVD Writer 200j ' '1.36' Removable CD-ROM
+ 1,2,0 102) *
+ 1,3,0 103) *
+ 1,4,0 104) *
+ 1,5,0 105) *
+ 1,6,0 106) *
+ 1,7,0 107) *
+
+If you insert a medium and close the tray, the medium becomes visible again.
+Note that for this reason, it is impossible to use cdrecord with automated
+scripts if the volume manager is configured to include a CD/DVD writer
+as it is impossible to close the door of the drive.
+
Modified: nonameyet/trunk/doc/READMEs/plattforms/README.win32
===================================================================
--- nonameyet/trunk/doc/READMEs/plattforms/README.win32 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/doc/READMEs/plattforms/README.win32 2006-09-12 08:43:59 UTC (rev 270)
@@ -1,207 +1,36 @@
-# @(#)README.win32 1.7 02/12/16 Copyright 2000 J. Schilling
-cdrecord-1.8a22 or later can be compiled on Win9X/NT4 using Cygnus' cygwin
-which is freely available from:
+Cdrkit suite can be compiled on Windows XP (Service Pack 2) using cygwin
+environment and tools set, available on:
- http://sourceware.cygnus.com/cygwin/
-or
http://sources.redhat.com/cygwin/
-To compile on Cygwin, get Cygwin by executing setup.exe
+and many mirrors.
-You will need approx. 120 MB to install a full cygwin developer release.
+To compile on Cygwin, execute setup.exe to install it. You will need to select
+cmake, make, gcc compiler in the package selection. Also choose subversion if
+you wish to fetch the latest development version.
-Get the tar'ed cdrtools source and unpack it with 'gnutar' or 'star',
+When done, you can start the Cygwin Shell by the new icon in the Start menu or
+on the desktop. Visit cdrkit.org and download a tarball of a recent version and store it under <cygwin_directory>\home\your_user_name.
-e.g. Start a bash command line window and type:
+Untar the package with tar -z -x -f <tarball>, go into this directory and run
+"make". Ignore messages about clock skew etc.
- star -xpz < cdrtools-1.10.tar.gz
+NOTE: at the time of writting this document it appears like the Cygwin version
+of cmake is unable to install files.
- don't use winzip to unpack the tar archive, it will not
- unpack symlinks correctly.
+However, you can copy the created executables in build/... subdirectories to
+your system path manualy. To learn about the purpose of each executable, run:
-Then (from the bash command line window) run 'make' ...
+man cdrecord/wodim.1
+man mkisofs/mkisofs.8
+man cdda2wav/cddda2wav.1
-If you have problems with GNU make, get 'smake' from:
+Most things described there are relevant to Cygwin as well. Windows drives are
+available in paths like /cygdrive/c/, /cygdrive/d/. The drive IDs can be
+detected using "wodim -scanbus".
- ftp://ftp.berlios.de/pub/smake/alpha/
+USUAL WARNING: test in dummy mode before you really write data to the disks.
+Report trouble to maintainer.
-/*--------------------------------------------------------------------------*/
-A bash window is available from the START -> Programs -> Cygnus Solutions
-menu or by clicking at the Cygwin Logo on the desktop.
-/*--------------------------------------------------------------------------*/
-Pre-compiled current 'cdrtools' Win32 binaries which should run on
-W95, W98 and WNT are available from:
-
- ftp://ftp.berlios.de/pub/cdrecord/alpha/win32
-
-To use the pre-compiled binary, put the files cygwin1.dll, mount.exe as well
-as the files:
-
-cdrecord.exe - The CD recording program
-cdda2wav.exe - The DAE (Digital Audio Extraction) program
-mkisofs.exe - The ISO-9660/Rock Ridge/Joliet Filesystem formatter
-readcd.exe - A simple program to extract CD-ROM raw data to a file
-
-in your WINDOWS binary directory and from a Command/MS-DOS (or bash) window
-type:
- cdrecord -help
-
-for usage, see also:
-
-http://www.fokus.fhg.de/research/cc/glone/employees/joerg.schilling/private/man/cdrecord.html
-
-All programs in this directory are Unix command line utilities and know
-nothing about DOS/WIN. They run in a POSIX subsystem that is supplied by
-cygwin1.dll. Therefore all directory names are given in Unix (POSIX) format
-(i.e. use '/' for a directory separator, not '\'). To access files on another
-disks (i.e. floppy, CDROM and network disk), you need to use the supplied "mount"
-command e.g.
-
- mount a: /a
- mount d: /cdrom
-
-i.e. files on the floppy disk are accessed as being in directory /a and
-files on the CDROM are accessed as /cdrom (assuming your CDROM is drive d:)
-
-Yu may also use the new /cygpath notation by typing /cygpath/a for
-your local floppy.
-
-The notation //a/dir as a replacement for the DOS directory name a:\dir
-may not work in future releases of Cygwin.
-
-The following command creates a CD image in the current directory
-using a source directories on the CDROM drive, a sub-directory and the
-floppy drive:
-
- mkisofs -o hsfs.iso -J -R /cdrom/subdir dir1 /a
-
-If you use the options noted above, the hsfs.iso image is ISO-9660
-compliant and includes both Rock Ridge (IEEE P1282) and
-Joliet (Microsoft proprietary) extensions.
-
-If your CD writer is on target 6, type
-
- cdrecord dev=6,0 -v speed=4 hsfs.iso
-
-to write the image at speed 4 in TAO mode, or
-
- cdrecord dev=6,0 -v speed=4 -dao hsfs.iso
-
-to write the image in DAO mode.
-
-If you don't like to create the image file 'hsfs.iso' you may use a PIPE
-to connect mkisofs's output to cdrecord's input by calling:
-
- mkisofs -J -R /cdrom/subdir dir1 /a | cdrecord dev=6,0 -v speed=4 -
-
-IMPORTANT NOTE: If you use PIPE's on Win32, you definitely need a POSIX
- compliant shell to start the programs. Native Win32 PIPE's
- are not POSIX compliant and will not work with POSIX compliant
- programs.
-
-/*--------------------------------------------------------------------------*/
-If you don't know which target your CD-writer is, call
-
- cdrecord -scanbus
-
-This gives output similar to:
-
-Cdrecord-ProDVD sparc-sun-solaris2.4 release 1.8a39 Copyright (C) 1995-2000 Jörg Schilling
-Using libscg version 'schily-0.1'
-scsibus0:
- 0,0,0 0) 'Quantum ' 'XP34300 ' 'F76D' Disk
- 0,1,0 1) 'SEAGATE ' 'ST11200N ' '8334' Disk
- 0,2,0 2) *
- 0,3,0 3) 'TOSHIBA ' 'MK537FB/ ' '6258' Disk
- 0,4,0 4) 'WANGTEK ' '5150ES SCSI-36 ' 'ESB6' Removable Tape
- 0,5,0 5) 'EXABYTE ' 'EXB-8500-85QUE ' '0428' Removable Tape
- 0,6,0 6) 'TOSHIBA ' 'XM-3401TASUNSLCD' '3593' Removable CD-ROM
- 0,7,0 7) HOST ADAPTOR
-scsibus1:
- 1,0,0 100) 'IBM ' 'DCAS-34330 ' 'S65A' Disk
- 1,1,0 101) *
- 1,2,0 102) *
- 1,3,0 103) *
- 1,4,0 104) 'PLEXTOR ' 'CD-R PX-W8220T' '1.00' Removable CD-ROM
- 1,5,0 105) 'YAMAHA ' 'CRW4416S ' '1.0f' Removable CD-ROM
- 1,6,0 106) *
- 1,7,0 107) HOST ADAPTOR
-
-The numbers on the labels are SCSIbus# * 100 + target#
-
-You then call cdrecord dev=bus#,target#,0
-
-If you e.g. like to talk to the Yamaha drive from the list above, you need to
-call:
-
- cdrecord dev=1,5,0 ......
-
-/*--------------------------------------------------------------------------*/
-
- NOTE
-
-If "cdrecord -scanbus" dumps core (dies from program fault), you have
-a broken ASPI driver on your PC.
-
-If you cannot see your drive(s), the following registry changes should make
-them visible:
-
- [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Aspi32]
- "ErrorControl"=dword:00000001
- "Start"=dword:00000001
- "Type"=dword:00000001
-
- [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Aspi32\Parameters]
- "ExcludeMiniports"=""
-
-
-If you like to use the tools with SCSI or ATAPI, you need a working
-ASPI32 driver and dll on your system. If you don't have it already,
-look for 'aspi_me'. You need to set you clock back to a time before
-Jan 1st 1999 to be able to install it. Note that 'aspi_me' contains
-original Adaptec drivers and is banned from most ftp servers for this
-reason.
-
-You need a special ASPI driver version on NT-5.0 (Win2000)
-
-************************************ Seems to be dead
-You may get one by downloading
-
- http://www.poikosoft.com/writer/download.html
-
-and unpacking the file mightywriter121.exe using unzip.
-after you renamed ntaspi32.dll to wnaspi32.dll, cdrecord should work.
-************************************ Seems to be dead
-
-But here is a new source for ASPI drivers:
-
-http://www.fortunecity.com/skyscraper/solo/719/aspi_drivers.htm
-
-
- IMPORTANT
-
-In order to avoid damaging CD blanks because Win is trying to access
-the drive while cdrecord writes to it, you definitely should edit
-your registry and set the value of
-
-HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Cdrom\Autorun
-
-to '0'.
-
-The Registry entry noted above is valid for WNT, I don't know
-if you need to do this for W95 or W98, nor do I know the
-correct Registry entry for these systems.
-
-/*--------------------------------------------------------------------------*/
-
- For binary only users:
-
-Error messages and help output is directed to stderr. Win32 command
-interpreters don't know about stderr. I recommend to install bash.exe
-because it is a POSIX compliant shell and allow working PIPE's and
-it also gives you a command line history that may be edited using
-cursor commands.
-
-Otherwise you may want to install the Cygwin light version which
-only includes the user commands.
+ -- Eduard Bloch <blade at debian.org> -- Tue, 12 Sep 2006 10:06:34 +0200
Modified: nonameyet/trunk/include/CMakeLists.txt
===================================================================
--- nonameyet/trunk/include/CMakeLists.txt 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/include/CMakeLists.txt 2006-09-12 08:43:59 UTC (rev 270)
@@ -35,6 +35,24 @@
TRY_RUN(BITFIELDS_HTOL TEST_DUMMY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_BITFIELDS_HTOL.c)
+FIND_FILE(HAVE_WAIT_H "wait.h")
+FIND_FILE(HAVE_SYS_WAIT_H "sys/wait.h")
+TRY_COMPILE(HAVE_UNION_WAIT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_UNION_WAIT.c )
+# disabled, though the alternative works on cygwin and both headers are present
+# there.
+#IF(NOT HAVE_UNION_WAIT)
+# TRY_COMPILE(HAVE_UNION_WAIT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_SYS_UNION_WAIT.c )
+#MESSAGE("syswait: ${HAVE_UNION_WAIT}")
+#ENDIF(NOT HAVE_UNION_WAIT)
+
+SET(HAVE_GETNAMEINFO true)
+SET(HAVE_INET_NTOA true)
+IF (WIN32) # workaround for cygwin
+SET(HAVE_GETNAMEINFO false)
+SET(HAVE_INET_NTOA false)
+ENDIF (WIN32) # workaround for cygwin
+
+
CONFIGURE_FILE( xconfig.h.in xconfig.h)
# FIXME! Does not work as expected. Not important for out-of-source builds but
Added: nonameyet/trunk/include/test_SYS_UNION_WAIT.c
===================================================================
--- nonameyet/trunk/include/test_SYS_UNION_WAIT.c (rev 0)
+++ nonameyet/trunk/include/test_SYS_UNION_WAIT.c 2006-09-12 08:43:59 UTC (rev 270)
@@ -0,0 +1,7 @@
+#include <sys/types.h>
+#include <sys/wait.h>
+int main() {
+ union wait w;
+ return 0;
+}
+
Added: nonameyet/trunk/include/test_UNION_WAIT.c
===================================================================
--- nonameyet/trunk/include/test_UNION_WAIT.c (rev 0)
+++ nonameyet/trunk/include/test_UNION_WAIT.c 2006-09-12 08:43:59 UTC (rev 270)
@@ -0,0 +1,7 @@
+#include <sys/types.h>
+#include <wait.h>
+int main() {
+ union wait w;
+ return 0;
+}
+
Modified: nonameyet/trunk/include/xconfig.h.in
===================================================================
--- nonameyet/trunk/include/xconfig.h.in 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/include/xconfig.h.in 2006-09-12 08:43:59 UTC (rev 270)
@@ -60,8 +60,10 @@
/* #undef HAVE_SYS_MNTENT_H */ /* if sys/mntent.h is present */
/* #undef HAVE_SYS_MNTTAB_H */ /* if sys/mnttab.h is present */
#define HAVE_SYS_MOUNT_H 1 /* if sys/mount.h is present */
-#define HAVE_WAIT_H 1 /* to use wait.h for prototypes and union wait */
-#define HAVE_SYS_WAIT_H 1 /* else use sys/wait.h */
+/* to use wait.h for prototypes and union wait */
+#cmakedefine HAVE_WAIT_H
+/* else use sys/wait.h */
+#cmakedefine define HAVE_SYS_WAIT_H
#define HAVE_SYS_RESOURCE_H 1 /* to use sys/resource.h for rlimit() and wait3() */
/* #undef HAVE_PROCFS_H */ /* to use procfs.h instead of sys/procfs.h (Solaris forces profcs-2) */
#define HAVE_SYS_PROCFS_H 1 /* to use sys/procfs.h for wait3() emulation */
@@ -313,9 +315,11 @@
#define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */
#define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */
#define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */
-#define HAVE_INET_NTOA 1 /* inet_ntoa() is present in libc/libsocket */
+/* inet_ntoa() is present in libc/libsocket */
+#cmakedefine HAVE_INET_NTOA
#define HAVE_GETADDRINFO 1 /* getaddrinfo() is present in libc/libsocket */
-#define HAVE_GETNAMEINFO 1 /* getnameinfo() is present in libc/libsocket */
+/* getnameinfo() is present in libc/libsocket */
+#cmakedefine define HAVE_GETNAMEINFO
#if defined(HAVE_QUOTACTL) || defined(HAVE_QUOTAIOCTL)
# define HAVE_QUOTA /* The system inludes quota */
@@ -358,7 +362,8 @@
#define HAVE_STRUCT_RUSAGE 1 /* have struct rusage in sys/resource.h */
/* #undef HAVE_SI_UTIME */ /* if struct siginfo contains si_utime */
/* #undef HAVE_UNION_SEMUN */ /* have an illegal definition for union semun in sys/sem.h */
-#define HAVE_UNION_WAIT 1 /* have union wait in wait.h */
+/* have union wait in wait.h */
+#cmakedefine HAVE_UNION_WAIT
/*
* SCO UnixWare has st_atim.st__tim.tv_nsec but the st_atim.tv_nsec tests also
* succeeds. If you use st_atim.tv_nsec on UnixWare, you get a warning about
Modified: nonameyet/trunk/mkisofs/CMakeLists.txt
===================================================================
--- nonameyet/trunk/mkisofs/CMakeLists.txt 2006-09-11 22:23:13 UTC (rev 269)
+++ nonameyet/trunk/mkisofs/CMakeLists.txt 2006-09-12 08:43:59 UTC (rev 270)
@@ -7,6 +7,7 @@
FIND_FILE (USE_MAGIC magic.h)
IF(USE_MAGIC)
ADD_DEFINITIONS(-DUSE_MAGIC)
+ SET(MAGICLIBS magic)
ENDIF(USE_MAGIC)
FIND_FILE (USE_ICONV iconv.h)
@@ -29,7 +30,7 @@
LINK_DIRECTORIES(../libhfs_iso ../libschily ../libscg ../libunls ../libdeflt)
ADD_EXECUTABLE (mkisofs mkisofs.c ${MKISOFS_MOST_SRCS})
-TARGET_LINK_LIBRARIES(mkisofs schily hfs_iso deflt magic unls z ${EXTRA_LIBICONV} ${SCG_LIBS})
+TARGET_LINK_LIBRARIES(mkisofs schily hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${SCG_LIBS})
# common lib set and mkisofs source parts for the rest
LINK_LIBRARIES(${SCG_LIBS} schily deflt unls ${EXTRA_LIBICONV} )
More information about the Debburn-changes
mailing list