Projects
Extra
cdctl
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
cdctl.changes
Added
@@ -0,0 +1,35 @@ +------------------------------------------------------------------- +Sun Nov 17 08:52:23 UTC 2019 - Luigi Baldoni <aloisio@gmx.com> + +- Update to version 0.16 + * Matthew Clarke <Matthew_Clarke@mindlink.bc.ca> fixed a + problem with the memory allocation of a variable in the + volume setting code. + * Better packaging, man page updates. + * "make rpms" works now, if you have rpm configured correctly. + * Removed CDC_IOCTLS, which doesn't exist in the kernel headers + anymore. + +- Refreshed cdctl-0.15-Makefile.in.patch as + cdctl-0.16-Makefile.in.patch + +- Dropped cdctl-0.15-cdc_ioctls.patch (no longer useful) + +- Spec cleanup + +------------------------------------------------------------------- +Sat Jun 13 00:00:00 UTC 2009 - AxelKoellhofer@web.de + +- spec cleanup +- fixed use of RPM_OPT_FLAGS + +------------------------------------------------------------------- +Wed Oct 1 00:00:00 UTC 2008 - AxelKoellhofer@web.de + +- Added patches 0 and 1, rebuild for openSUSE 10.x/11.x + +------------------------------------------------------------------- +Sun Mar 26 00:00:00 UTC 2000 - thalakan@technologist.com + +- First spec file for cdctl, version 0.15 +
View file
cdctl.spec
Changed
@@ -1,5 +1,7 @@ -# spec file for package cdctl (version 0.15) # +# spec file for package cdctl +# +# Copyright (c) 2019 Packman Team <packman@links2linux.de> # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties @@ -10,60 +12,49 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ + +# Please submit bugfixes or comments via https://bugs.links2linux.org/ # -# norootforbuild -Summary: Controls your cdrom drive -Name: cdctl -Version: 0.15 -Release: 0.pm.0 -Url: http://cdctl.sourceforge.net/ -Source0: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-Makefile.in.patch -Patch1: %{name}-%{version}-cdc_ioctls.patch -License: Other -Group: System/Base -BuildRoot: %{_tmppath}/%{name}-buildroot -%description +Name: cdctl +Version: 0.16 +Release: 0 +Summary: Controls your cdrom drive +License: SUSE-Permissive +Group: System/Base +URL: http://cdctl.sourceforge.net/ +Source0: https://sourceforge.net/projects/cdctl/files/%{name}-%{version}.tar.gz +Patch0: %{name}-0.16-Makefile.in.patch +BuildRequires: autoconf +BuildRequires: automake + +%description Cdctl controls your cdrom drive under Linux. It is an user-level console application which gives the user access to the ioctl() interfaces of the Uniform CDROM Driver of the Linux kernel. It can play audio CDs, control the drive's tray motor, change the drive's volume levels, read the current type of disc in the drive, and much more. - - %prep -%setup -%patch0 -p0 -%patch1 -p1 +%setup -q -n %{name} +%patch0 -p1 %build +autoreconf -fiv %configure -%__make %{?jobs:-j%{jobs}} +make %{?_smp_mflags} %install -%makeinstall +%make_install %find_lang %{name} -%clean -rm -rf "$RPM_BUILD_ROOT" - -%files -f %{name}.lang -%defattr(-,root,root) -%doc README LICENSE NEWS NUTSANDBOLTS PUBLICKEY +%files -f %{name}.lang +%license LICENSE +%doc README NEWS NUTSANDBOLTS PUBLICKEY %{_bindir}/%{name} -%{_mandir}/man1/%{name}* +%{_mandir}/man1/%{name}.1%{?ext_man} %changelog -* Sat Jun 13 2009 <AxelKoellhofer@web.de> -- spec cleanup -- fixed use of RPM_OPT_FLAGS -* Wed Oct 01 2008 <AxelKoellhofer@web.de> -- Added patches 0 and 1, rebuild for openSUSE 10.x/11.x -* Sun Mar 26 2000 Jason Spence <thalakan@technologist.com> -- First spec file for cdctl, version 0.15
View file
cdctl-0.15-Makefile.in.patch
Deleted
@@ -1,59 +0,0 @@ ---- Makefile.in.orig 2000-03-27 03:06:53.000000000 +0200 -+++ Makefile.in 2009-06-13 02:48:53.576008981 +0200 -@@ -1,11 +1,13 @@ - CC=gcc --CFLAGS=-Wall -g --BINS=cdctl sndreset -+CFLAGS=$(RPM_OPT_FLAGS) -+BINS=cdctl - OBJS=cdctl.o version.o ioctls.o iso_header.o --DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS -+DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README - MANS=cdctl.1 - MOS=cdctl.mo - -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ - bindir = @bindir@ - mandir = @mandir@ - datadir = @datadir@ -@@ -16,6 +18,10 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = $(INSTALL) -m 644 - -+DESTDIR = -+ -+man1dir = $(mandir)/man1 -+ - all: $(BINS) - - cdctl: $(OBJS) -@@ -26,21 +32,21 @@ - version.o: version.c - iso_header.o: iso_header.c - --install: install-bins install-docs install-mans install-mos -+install: install-bins install-mans install-mos - - install-bins: $(BINS) -- $(INSTALL) -s $(BINS) $(bindir) -- --install-docs: $(DOCS) -- $(INSTALL_DATA) $(DOCS) $(datadir) -+ $(INSTALL) -d $(DESTDIR)$(bindir) -+ $(INSTALL) $(BINS) $(DESTDIR)$(bindir) - - install-mans: $(MANS) -- $(INSTALL_DATA) $(MANS) $(mandir) -+ $(INSTALL) -d $(DESTDIR)$(man1dir) -+ $(INSTALL_DATA) $(MANS) $(DESTDIR)$(man1dir) - - # FIXME: need to deal with other languages besides German - - install-mos: cdctl.mo -- $(INSTALL_DATA) $(MOS) $(localedir)/de/LC_MESSAGES -+ $(INSTALL) -d $(DESTDIR)$(localedir)/de/LC_MESSAGES -+ $(INSTALL_DATA) $(MOS) $(DESTDIR)$(localedir)/de/LC_MESSAGES - - cdctl.mo: cdctl.po - msgfmt cdctl.po -o cdctl.mo
View file
cdctl-0.15-cdc_ioctls.patch
Deleted
@@ -1,13 +0,0 @@ -diff -Naurp cdctl-0.15-orig/cdctl.c cdctl-0.15/cdctl.c ---- cdctl-0.15-orig/cdctl.c 2006-08-08 23:18:44.000000000 +0200 -+++ cdctl-0.15/cdctl.c 2006-08-08 23:19:33.000000000 +0200 -@@ -337,7 +337,9 @@ int do_print_capabilities(int cdrom) { - printf("Can report media change: %i\n", (ret & CDC_MEDIA_CHANGED)?1:0); - printf("Can play audio discs : %i\n", (ret & CDC_PLAY_AUDIO)?1:0); - printf("Can do a hard reset : %i\n", (ret & CDC_RESET)?1:0); -+#ifdef CDC_IOCTLS - printf("Has non-standard ioctls: %i\n", (ret & CDC_IOCTLS)?1:0); -+#endif - printf("Can report drive status: %i\n", (ret & CDC_DRIVE_STATUS)?1:0); - - #ifdef CDROM_CHANGER_NSLOTS
View file
cdctl-0.16-Makefile.in.patch
Added
@@ -0,0 +1,59 @@ +Index: cdctl/Makefile.in +=================================================================== +--- cdctl.orig/Makefile.in ++++ cdctl/Makefile.in +@@ -1,8 +1,8 @@ + CC=gcc +-CFLAGS=-Wall -g +-BINS=cdctl sndreset ++CFLAGS=$(RPM_OPT_FLAGS) ++BINS=cdctl + OBJS=cdctl.o version.o ioctls.o iso_header.o +-DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS ++DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README + # NOTE: all man pages are installed in $(mandir)/man1 -- see install-mans + MANS=cdctl.1 + MOS=cdctl.mo +@@ -22,6 +22,9 @@ INSTALL = @INSTALL@ + INSTALL_DIR = $(INSTALL) -d + INSTALL_DATA = $(INSTALL) -m 644 + ++DESTDIR = ++man1dir = $(mandir)/man1 ++ + all: $(BINS) + + cdctl: $(OBJS) +@@ -35,25 +38,21 @@ iso_header.o: iso_header.c + indent: + indent -kr -cdb -sc *.c + +-install: install-bins install-docs install-mans install-mos ++install: install-bins install-mans install-mos + + install-bins: $(BINS) +- $(INSTALL_DIR) $(bindir) +- $(INSTALL) -s $(BINS) $(bindir) +- +-install-docs: $(DOCS) +- $(INSTALL_DIR) $(docdir) +- $(INSTALL_DATA) $(DOCS) $(docdir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL) $(BINS) $(DESTDIR)$(bindir) + + install-mans: $(MANS) +- $(INSTALL_DIR) $(mandir)/man1 +- $(INSTALL_DATA) $(MANS) $(mandir)/man1 ++ $(INSTALL) -d $(DESTDIR)$(man1dir) ++ $(INSTALL_DATA) $(MANS) $(DESTDIR)$(man1dir) + + # FIXME: need to deal with other languages besides German + + install-mos: cdctl.mo +- $(INSTALL_DIR) $(localedir)/de/LC_MESSAGES +- $(INSTALL_DATA) $(MOS) $(localedir)/de/LC_MESSAGES ++ $(INSTALL) -d $(DESTDIR)$(localedir)/de/LC_MESSAGES ++ $(INSTALL_DATA) $(MOS) $(DESTDIR)$(localedir)/de/LC_MESSAGES + + cdctl.mo: cdctl.po + msgfmt cdctl.po -o cdctl.mo
View file
cdctl-0.15.tar.bz2/config.h.in
Deleted
@@ -1,7 +0,0 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if you have the <malloc.h> header file. */ -#undef HAVE_MALLOC_H
View file
cdctl-0.15.tar.bz2/configure
Deleted
@@ -1,1543 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.14.1 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/-_a-zA-Z0-9*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/-a-zA-Z0-9_//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/-_a-zA-Z0-9//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure options host -Options: defaults in brackets after descriptions -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - $ac_default_prefix - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - same as prefix - --bindir=DIR user executables in DIR EPREFIX/bin - --sbindir=DIR system admin executables in DIR EPREFIX/sbin - --libexecdir=DIR program executables in DIR EPREFIX/libexec - --datadir=DIR read-only architecture-independent data in DIR - PREFIX/share - --sysconfdir=DIR read-only single-machine data in DIR PREFIX/etc - --sharedstatedir=DIR modifiable architecture-independent data in DIR - PREFIX/com - --localstatedir=DIR modifiable single-machine data in DIR PREFIX/var - --libdir=DIR object code libraries in DIR EPREFIX/lib - --includedir=DIR C header files in DIR PREFIX/include - --oldincludedir=DIR C header files for non-gcc in DIR /usr/include - --infodir=DIR info documentation in DIR PREFIX/info - --mandir=DIR man documentation in DIR PREFIX/man - --srcdir=DIR find the sources in DIR configure dir or .. - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD BUILD=HOST - --host=HOST configure for HOST guessed - --target=TARGET configure for TARGET TARGET=HOST -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE=ARG include FEATURE ARG=yes - --with-PACKAGE=ARG use PACKAGE ARG=yes - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.14.1" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/-_a-zA-Z0-9//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/-a-zA-Z0-9_//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/-a-z0-9.//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*\\\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=cdctl.c - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/^/^/*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\(^/\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - test -f "$cache_file" && . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:529: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:559: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32* | *CYGWIN*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:610: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:642: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 653 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:684: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:689: checking whether we are using GNU C" >&5 -if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <<EOF -#ifdef __GNUC__ - yes; -#endif -EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:717: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:779: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"\${ac_cv_path_install+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - - -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:838: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF -#line 853 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF -#line 870 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF -#line 887 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:918: checking for ANSI C header files" >&5 -if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 923 "configure" -#include "confdefs.h" -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <<EOF -#line 948 "configure" -#include "confdefs.h" -#include <string.h> -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext <<EOF -#line 966 "configure" -#include "confdefs.h" -#include <stdlib.h> -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then - : -else - cat > conftest.$ac_ext <<EOF -#line 987 "configure" -#include "confdefs.h" -#include <ctype.h> -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } - -EOF -if { (eval echo configure:998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no -fi -rm -fr conftest* -fi - -fi -fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 -if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -for ac_hdr in fcntl.h malloc.h sys/ioctl.h unistd.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1025: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1030 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1063: checking for working const" >&5 -if eval "test \"\${ac_cv_c_const+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1068 "configure" -#include "confdefs.h" - -int main() { - -/* Ultrix mips cc rejects this. */ -typedef int charset2; const charset x; -/* SunOS 4.1.1 cc rejects this. */ -char const *const *ccp; -char **p; -/* NEC SVR4.0.2 mips cc rejects this. */ -struct point {int x, y;}; -static struct point const zero = {0,0}; -/* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in an arm - of an if-expression whose if-part is not a constant expression */ -const char *g = "string"; -ccp = &g + (g ? g-g : 0); -/* HPUX 7.0 cc rejects these. */ -++ccp; -p = (char**) ccp; -ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -} -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x = {25, 17}; - const int *foo = &x0; - ++foo; -} -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; -} -{ /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap3; }; - struct s *b; b->j = 5; -} -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -} - -; return 0; } -EOF -if { (eval echo configure:1117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 -if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const -EOF - -fi - - -if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1140: checking whether ${CC-cc} needs -traditional" >&5 -if eval "test \"\${ac_cv_prog_gcc_traditional+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <<EOF -#line 1146 "configure" -#include "confdefs.h" -#include <sgtty.h> -Autoconf TIOCGETP -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_prog_gcc_traditional=yes -else - rm -rf conftest* - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <<EOF -#line 1164 "configure" -#include "confdefs.h" -#include <termio.h> -Autoconf TCGETA -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* - - fi -fi - -echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - -echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1186: checking return type of signal handlers" >&5 -if eval "test \"\${ac_cv_type_signal+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1191 "configure" -#include "confdefs.h" -#include <sys/types.h> -#include <signal.h> -#ifdef signal -#undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif - -int main() { -int i; -; return 0; } -EOF -if { (eval echo configure:1208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_type_signal=int -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_type_signal" 1>&6 -cat >> confdefs.h <<EOF -#define RETSIGTYPE $ac_cv_type_signal -EOF - - -for ac_func in strstr -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1229: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1234 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); -char (*f)(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; -#endif - -; return 0; } -EOF -if { (eval echo configure:1258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <<EOF -#define $ac_tr_func 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\(a-zA-Z0-9_*_cv_a-zA-Z0-9_*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\(a-zA-Z0-9_*_cv_a-zA-Z0-9_*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^ *VPATH *=^:*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \(^ ^ *\) *\(.*\)%-D\1=\2%g -s% `~#$^&*(){}\\|;'"<>?%\\&%g -s%\%\\&%g -s%\%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <<EOF -#! /bin/sh -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS --recheck --version --help" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.14.1" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "Makefile" | sed "s/:^ *//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS <<EOF - -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/\\\\&%/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@CC@%$CC%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@CPP@%$CPP%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <<EOF - -CONFIG_FILES=\${CONFIG_FILES-"Makefile"} -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile:infile:infile...", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%^:*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/^/^/*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/^/*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - /$*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <<EOF - -EOF -cat >> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 -
View file
cdctl-0.15.tar.bz2/Makefile.in -> cdctl-0.16.tar.gz/Makefile.in
Changed
@@ -3,17 +3,23 @@ BINS=cdctl sndreset OBJS=cdctl.o version.o ioctls.o iso_header.o DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS +# NOTE: all man pages are installed in $(mandir)/man1 -- see install-mans MANS=cdctl.1 MOS=cdctl.mo +prefix = @prefix@ +exec_prefix = @exec_prefix@ + bindir = @bindir@ mandir = @mandir@ datadir = @datadir@ +docdir = @docdir@ # FIXME: autoconf needs to generate this localedir = /usr/share/locale INSTALL = @INSTALL@ +INSTALL_DIR = $(INSTALL) -d INSTALL_DATA = $(INSTALL) -m 644 all: $(BINS) @@ -26,35 +32,48 @@ version.o: version.c iso_header.o: iso_header.c +indent: + indent -kr -cdb -sc *.c + install: install-bins install-docs install-mans install-mos install-bins: $(BINS) + $(INSTALL_DIR) $(bindir) $(INSTALL) -s $(BINS) $(bindir) install-docs: $(DOCS) - $(INSTALL_DATA) $(DOCS) $(datadir) + $(INSTALL_DIR) $(docdir) + $(INSTALL_DATA) $(DOCS) $(docdir) install-mans: $(MANS) - $(INSTALL_DATA) $(MANS) $(mandir) + $(INSTALL_DIR) $(mandir)/man1 + $(INSTALL_DATA) $(MANS) $(mandir)/man1 # FIXME: need to deal with other languages besides German install-mos: cdctl.mo + $(INSTALL_DIR) $(localedir)/de/LC_MESSAGES $(INSTALL_DATA) $(MOS) $(localedir)/de/LC_MESSAGES cdctl.mo: cdctl.po msgfmt cdctl.po -o cdctl.mo clean: - rm -f $(OBJS) $(BINS) config.cache config.log config.status Makefile *~ + rm -f $(OBJS) $(BINS) + +distclean: clean + rm -f config.cache config.log config.status Makefile config.h *~ commit: clean cvs commit -dist: clean - cd .. && tar czvf cdctl0.15.tar.gz cdctl +rpms: distclean + cd .. && tar czvf cdctl-@VERSION@.tar.gz cdctl + rpm -ta --target=i386 --buildroot ~/RPM ../cdctl-@VERSION@.tar.gz + +dist: distclean rpms + cd .. && tar czvf cdctl-@VERSION@.tar.gz cdctl -dist-devel: clean - cd .. && tar czvf cdctl-devel.tar.gz cdctl +dist-devel: distclean dist # gpg --detach-sign ../cdctl-devel.tar.gz scp ../cdctl-devel.tar.gz* NEWS root@host30.frys.com:/home/thalakan/cdctl
View file
cdctl-0.15.tar.bz2/NEWS -> cdctl-0.16.tar.gz/NEWS
Changed
@@ -1,3 +1,11 @@ +Version 0.16 + - Matthew Clarke <Matthew_Clarke@mindlink.bc.ca> fixed a problem with + the memory allocation of a variable in the volume setting code. + - Better packaging, man page updates. + - "make rpms" works now, if you have rpm configured correctly. + - Removed CDC_IOCTLS, which doesn't exist in the kernel headers anymore. + + Version 0.15 - Fixed an option parsing bug - 2.0 support by Andy Thaller <andy_thaller@physik.tu-muenchen.de> @@ -22,9 +30,7 @@ - NOTE THAT CAPABILITY READBACK IS BROKEN IN 2.2 ON ATAPI DRIVES, says Jens Axboe, the kernel cdrom maintainer. - Granted permission to Debian to make a package for commercial distribution. - - Does anyone know how to make RPMS? Mail thalakan@technologist.com if you - do. - + Version 0.14 - Updated version.c and the usage message; thanks to Andy Piper <andyp@argonet.co.uk> for the diff.
View file
cdctl-0.15.tar.bz2/README -> cdctl-0.16.tar.gz/README
Changed
@@ -1,10 +1,10 @@ cdctl README -Last updated on Sat Mar 25 2000 +Last updated on Tue Apr 11 2000 Hi, thanks for trying out cdctl. I hope you find it useful. cdctl is a program to control your cdrom drive under Linux, and hopefully many other UNIXes in the -future. Right now, it does so much stuff that Í don't even bother maintaining +future. Right now, it does so much stuff that I don't even bother maintaining a list anymore. Build it and do a 'cdctl --help' if you want the complete list for your system. I say "your system" because older Linux kernels can't do certain things. cdctl detects this and doesn't build those features into @@ -64,7 +64,7 @@ If you're the paranoid type, you can verify that this REALLY IS cdctl and not some nefarious subversion of the open source development system by importing my public key, getting the digital signature of the tarball at -http://host30.frys.com/cdctl/cdctl-latest.tar.gz.sig, and verifying the digital +http://cdctl.sourceforge.net/cdctl-latest.tar.gz.sig, and verifying the digital signature matches up with my key. You can get my public key from the file PUBLICKEY in this distribution, by fingering thalakan@host30.frys.com, or from pgpkeys.mit.edu. This should be a simple as @@ -111,3 +111,5 @@ You can reach me at thalakan@technologist.com if you have any questions, patches, or pizza. + +Dedicated to Jo. Thanks for your support, Mistress :)
View file
cdctl-0.15.tar.bz2/cdctl.1 -> cdctl-0.16.tar.gz/cdctl.1
Changed
@@ -1,4 +1,4 @@ -.TH CDCTL 1 "March 25, 1999" +.TH CDCTL 1 "April 5, 2000" .\" defines cdctl with formatting .ds cd \fIcdctl\fP @@ -182,7 +182,11 @@ .TP .I "\-vV, \-\-volume=V" Prints out the current volume if V is not given, otherwise sets the current -volume to V. +volume to V. If V is given, it may be a single number, to set both CD-ROM +channels to that volume, or two numbers (separated by a colon (:), hyphen +(-), or space,) to set each channel independently. For kernels that +support 4 channels in the CD-ROM volume control ioctl, cdctl will report +on all four, but set only the first two. .TP .I "\-V, \-\-version" Prints out the current version of cdctl. @@ -212,6 +216,12 @@ the DRIVE_NOT_FOUND error message, which inspired kernel capability checking using the preprocessor, +Andy Piper <andyp@argonet.co.uk> for a usage message bug report, being +a sounding board, and lots of patches, + +Matthew Clarke <Matthew_Clarke@mindlink.bc.ca>, for a big patch which +fixed many oversights on my part, + Beat Rupp <beat.rupp@gmx.net> for DVD testing and some German localization, Gabor Z Papp <gzp@gzp.org.hu> for testing the jukebox code on his NEC 4x4 ATAPI @@ -220,8 +230,6 @@ Dan Morrison <dmorriso@buffalo.edu> for testing on an ATAPI system, -Andy Piper <andyp@argonet.co.uk> for a usage message bug report and a patch, - Nick <nikk@phreaker.net> for helping to get the autoeject (-u option) working correctly, @@ -229,7 +237,7 @@ line / CDROM env variable logic working right, Fry's Electronics Black Ops <http://host30.frys.com/febo> for hosting the site, -hiring the maintainers, and providing a DS-1 to work on, and +hiring the maintainers, and providing a DS-3 to work on, and Jason Spence <thalakan@technologist.com>. He currently maintains the cdctl source at \fIhttp://host30.frys.com/cdctl\fP in his spare time. Thanks to the
View file
cdctl-0.15.tar.bz2/cdctl.c -> cdctl-0.16.tar.gz/cdctl.c
Changed
@@ -2,7 +2,7 @@ vim:ts=4 -$Id: cdctl.c,v 1.1.1.1 2000/03/27 01:06:54 thalakan Exp $ +$Id: cdctl.c,v 1.5 2009/02/09 00:36:27 thalakan Exp $ 2.0 patches by Andy Thaller <andy_thaller@physik.tu-muenchen.de> MSF patches by Jens Axboe <axboe@image.dk> @@ -47,21 +47,22 @@ int main(int argc, char *argv) { - int ret; + int ret; + int i; char *arg = ""; int done = 0; - int cdrom; + int cdrom = -1; int option = 0; - static char options = "ab:cd:eghiklmo::p::rst:u:v::V"; + static char options = "ab:cd:eghiklmno::p::rst:u:v::V"; static struct option longoptions = { - { "pause", 0, NULL, 'a' }, - { "speed", 1, NULL, 'b' }, - { "close", 0, NULL, 'c' }, + { "pause", 0, NULL, 'a' }, + { "speed", 1, NULL, 'b' }, + { "close", 0, NULL, 'c' }, { "disc", 1, NULL, 'd' }, - { "eject", 0, NULL, 'e' }, + { "eject", 0, NULL, 'e' }, { "getstatus", 0, NULL, 'g' }, - { "help", 0, NULL, 'h' }, + { "help", 0, NULL, 'h' }, { "iso-header", 0, NULL, 'i' }, { "iso-header-hex", 0, NULL, '2' }, @@ -76,13 +77,24 @@ #ifdef CDROM_CHANGER_NSLOTS { "numslots", 0, NULL, '1' }, #endif - { "play", 2, NULL, 'p' }, - { "resume", 0, NULL, 'r' }, - { "stop", 0, NULL, 's' }, - { "tocentry", 1, NULL, 't' }, +#ifdef HAVE_DVD_IOCTLS + { "dvdinfo", 0, NULL, 'n' }, +#endif + { "play", 2, NULL, 'p' }, + { "resume", 0, NULL, 'r' }, + { "stop", 0, NULL, 's' }, + { "tocentry", 1, NULL, 't' }, { "autoclose", 1, NULL, 'u' }, - { "volume", 2, NULL, 'v' }, - { "version", 0, NULL, 'V' }, + { "volume", 2, NULL, 'v' }, + { "version", 0, NULL, 'V' }, + }; + + static struct action actions = { + { "eject", cd_eject }, + { "shut", cd_close }, + { "open", cd_eject }, + { "close", cd_close }, + { NULL, NULL } }; /* @@ -120,36 +132,35 @@ optarg = arg; /* - * End master initalization + * End master initialization, try to find the cdrom device. + * In order of priority: + * 1: as a command-line argument + * 2: as an environment variable + * 3: "/dev/cdrom" + * - if *that* fails, turn on DEBUG and start from 3 again + * 4: "/dev/scd0" + * 5: "/dev/sr0" */ - - -/* Try to find the cdrom device */ - - if(argvoptind != 0) { + if(argvoptind != NULL) { cdrom = open_cdrom(argvoptind); if(cdrom == -1) { warn(_("can't open %s"), argvoptind); return 1; } - } else { - cdrom = -1; } - if(getenv("CDROM") != NULL) { cdrom = open_cdrom(getenv("CDROM")); if(cdrom == -1) { warn(_("can't open %s"), getenv("CDROM")); } - } else { - cdrom = -1; } - if(cdrom == -1) { cdrom = open_cdrom("/dev/cdrom"); - } - if(cdrom == -1) { /* I've seen this one a couple times... */ - cdrom = open_cdrom("/dev/cd"); + } + if(cdrom == -1) { + warnx(_("Um, I can't seem to open /dev/cdrom. Trying harder...")); + setenv("DEBUG", "1", 0); + cdrom = open_cdrom("/dev/cdrom"); } if(cdrom == -1) { /* SCSI cdroms */ cdrom = open_cdrom("/dev/scd0"); @@ -157,25 +168,26 @@ if(cdrom == -1) { cdrom = open_cdrom("/dev/sr0"); } - -if (cdrom == -1) { - fprintf(stderr, _("\nUm, I can't seem to open any cd or dvd device. Try setting the\n" - "CDROM environment variable to the device to open.\n" - "Example: \"export CDROM=/dev/hdb\"\n")); - - return 1; -} + if (cdrom == -1) { + warnx(_("Hmm, I can't seem to open any cd or dvd device. Try giving the\n" + "name of a cdrom device (/dev/hdc, maybe?) to cdctl.")); -/* - * A symlink to cdctl named eject will trigger this code. - */ + return 1; + } -if(strstr(argv0, "eject") != NULL) { - cd_eject(cdrom); - exit(0); -} +/* + * Various possibilities for symlinks to trigger eject or close. + * actions is an array of struct action, and action is a function + * pointer to the action to be performed. + */ + for(i = 0; actionsi.name != NULL; ++i) { + if(strstr(argv0, actionsi.name) != NULL) { + (* actionsi.action)(cdrom); + return 0; + } + } /* Ok, it's open or we're dead. Proceed. */ switch(option) { @@ -205,7 +217,7 @@ break; case 'r': cd_resume(cdrom); - break; + break; case 'p': do_play(cdrom); break; @@ -218,6 +230,9 @@ case 'm': do_print_mcn(cdrom); break; + case 'n': + do_print_dvdinfo(cdrom); + break; case 'u': cd_set_autoeject(cdrom, atoi(optarg)); break; @@ -337,7 +352,6 @@ printf("Can report media change: %i\n", (ret & CDC_MEDIA_CHANGED)?1:0); printf("Can play audio discs : %i\n", (ret & CDC_PLAY_AUDIO)?1:0); printf("Can do a hard reset : %i\n", (ret & CDC_RESET)?1:0); - printf("Has non-standard ioctls: %i\n", (ret & CDC_IOCTLS)?1:0); printf("Can report drive status: %i\n", (ret & CDC_DRIVE_STATUS)?1:0); #ifdef CDROM_CHANGER_NSLOTS @@ -393,8 +407,8 @@ struct cdrom_volctrl *volume; const char delim = ":- "; - char *one; - char *two; + char *one = (char *)NULL; /* initialized here because unconditionally */ + char *two = (char *)NULL; /* freed below, even if never allocated */ char *tmp; @@ -414,8 +428,8 @@ /* * Ok, we're going to assume that the user doesn't want the volume - * changed if we get a wierd argument. If *I* screwed up and - * entered a wierd argument, I know I wouldn't want my sound system to + * changed if we get a weird argument. If *I* screwed up and + * entered a weird argument, I know I wouldn't want my sound system to * suddenly cut out or jump to maximum volume! */ @@ -441,8 +455,13 @@ printf("DEBUG: do_set_volume(): two is %i\n", atoi(two)); } + /* If only one volume given, set it on both channels. */ if(two != NULL) { volume->channel1 = atoi(two); + } else { + if (one != NULL) { + volume->channel1 = atoi(one); + } } free(one); @@ -576,6 +595,205 @@ } +int do_print_dvdinfo(int cdrom) { + int i; + int ret; + dvd_struct dvdinfo; + + memset(&dvdinfo, 0, sizeof(dvd_struct)); + ret = ioctl(cdrom, DVD_READ_STRUCT, &dvdinfo); + if(ret == -1) { + err(1, "couldn't read dvd info"); + } + printf("Total layers: %i\n", dvdinfo.physical.layer0.nlayers + 1); + + memset(&dvdinfo, 0, sizeof(dvd_struct)); + dvdinfo.physical.layer_num = 0; + + ret = ioctl(cdrom, DVD_READ_STRUCT, &dvdinfo); + if(ret == -1) { + err(1, "couldn't read dvd info"); + } + + for(i = 0; i <= dvdinfo.physical.layer0.nlayers; ++i) { + memset(&dvdinfo, 0, sizeof(dvd_struct)); + dvdinfo.type = DVD_STRUCT_PHYSICAL; + dvdinfo.physical.layer_num = i; + + ret = ioctl(cdrom, DVD_READ_STRUCT, &dvdinfo); + if(ret == -1) { + err(1, "couldn't read dvd info"); + } + + printf("*** Layer %i ***\n\n", i); + printf("book_version : %i\n", + dvdinfo.physical.layeri.book_version); + + printf("book_type : %i ", dvdinfo.physical.layeri.book_type); + switch(dvdinfo.physical.layeri.book_type) { + case 0: + printf("(DVD-ROM)\n"); + break; + case 1: + printf("(DVD_RAM)\n"); + break; + case 2: + printf("(DVD_R)\n"); + break; + case 3: + printf("(DVD-RW)\n"); + break; + case 9: + printf("(DVD+RW)\n"); + break; + default: + printf("(reserved)\n"); + break; + } + + printf("min_rate : %i ", + dvdinfo.physical.layeri.min_rate); + + switch(dvdinfo.physical.layeri.min_rate) { + case 0: + printf("(2.52Mbps)\n"); + break; + case 1: + printf("(5.04Mbps)\n"); + break; + case 2: + printf("(10.08Mbps)\n"); + break; + case 15: + printf("(none specified)\n"); + break; + default: + printf("(reserved)\n"); + break; + } + + printf("disc_size : %i ", + dvdinfo.physical.layeri.disc_size); + switch(dvdinfo.physical.layeri.disc_size) { + case 0: + printf("(120mm disc)\n"); + break; + case 1: + printf("(80mm disc)\n"); + break; + default: + printf("(reserved)\n"); + break; + } + + printf("layer_type : %i ", + dvdinfo.physical.layeri.layer_type); + switch(dvdinfo.physical.layeri.layer_type) { + case 0: + printf("(embossed area)\n"); + break; + case 1: + printf("(recordable area)\n"); + break; + case 2: + printf("(re-writable area)\n"); + break; + case 3: + printf("(reserved)\n"); + break; + } + + printf("track_path : %i ", + dvdinfo.physical.layeri.track_path); + switch(dvdinfo.physical.layeri.track_path) { + case 0: + printf("(PTP dual layer or single layer)\n"); + break; + case 1: + printf("(OTP)\n"); + break; + default: + printf("(reserved)\n"); + break; + } + + printf("nlayers : %i ", + dvdinfo.physical.layeri.nlayers); + switch(dvdinfo.physical.layeri.nlayers) { + case 0: + printf("(one layer)\n"); + break; + case 1: + printf("(two layers)\n"); + break; + default: + printf("(reserved)\n"); + break; + } + + printf("track_density : %i ", + dvdinfo.physical.layeri.track_density); + switch(dvdinfo.physical.layeri.track_density) { + case 0: + printf("(0.74 micrometers/track)\n"); + break; + case 1: + printf("(0.80 micrometers/track)\n"); + break; + case 2: + printf("(0.615 micrometers/track)\n"); + break; + default: + printf("(reserved)\n"); + break; + } + + printf("linear_density: %i ", + dvdinfo.physical.layeri.track_density); + switch(dvdinfo.physical.layeri.track_density) { + case 0: + printf("(0.267 micrometers/bit)\n"); + break; + case 1: + printf("(0.293 micrometers/bit)\n"); + break; + case 2: + printf("(0.409~0.435 micrometers/bit)\n"); + break; + case 4: + printf("(0.280~0.291 micrometers/bit)\n"); + break; + case 8: + printf("(0.353 micrometers/bit)\n"); + break; + default: + printf("(reserved)\n"); + break; + + } + + printf("bca : %i %s\n", + dvdinfo.physical.layeri.bca, + dvdinfo.physical.layeri.bca ? + "(bca present)" : "(no bca)" + ); + + printf("start_sector : %i (0x%x)\n", + dvdinfo.physical.layeri.start_sector, + dvdinfo.physical.layeri.start_sector); + + printf("end_sector : %i (0x%x)\n", + dvdinfo.physical.layeri.end_sector, + dvdinfo.physical.layeri.end_sector); + + printf("end_sector_l0 : %i (0x%x)\n", + dvdinfo.physical.layeri.end_sector_l0, + dvdinfo.physical.layeri.end_sector_l0); + } + return 1; +} + + struct cdrom_tochdr *do_get_audio_tracks(int cdrom) { struct cdrom_tochdr *tracks; @@ -788,7 +1006,10 @@ int cdrom; cdrom = open(cdrom_dev_file, O_RDONLY | O_NONBLOCK); - if(cdrom == -1) { + if(cdrom == -1) { + if(getenv("DEBUG")) { + warn("can't open \"%s\"", cdrom_dev_file); + } return -1; } else { return cdrom;
View file
cdctl-0.15.tar.bz2/cdctl.h -> cdctl-0.16.tar.gz/cdctl.h
Changed
@@ -1,4 +1,4 @@ -#define VERSION "cdctl 0.15" +#include "config.h" /* cdctl config header */ /* * rt == red tape, async signal handling in C, arrrgggggghhhhhhhh @@ -15,6 +15,11 @@ struct rt *next_rt; /* pointer to next struct rt */ }; +struct action { + char * name; + int (* action)(int); +}; + /* * NLS stuff */ @@ -63,6 +68,7 @@ extern int do_dump_header(int cdrom, int hex); extern int do_print_status(int cdrom); extern int do_print_volume(int cdrom); +extern int do_print_dvdinfo(int cdrom); extern char * do_parse_iso_date(char *date); extern int do_print_capabilities(int cdrom); extern int do_set_volume(int cdrom, char *input);
View file
cdctl-0.15.tar.bz2/cdctl.spec -> cdctl-0.16.tar.gz/cdctl.spec
Changed
@@ -1,5 +1,5 @@ %define name cdctl -%define version 0.15 +%define version 0.16 %define release 1 Summary: Controls your cdrom drive. @@ -11,7 +11,7 @@ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} -Requires: +URL: http://cdctl.sourceforge.net %description cdctl controls your cdrom drive under Linux. It is an user-level console @@ -22,31 +22,40 @@ %prep -%setup +%setup -n cdctl %build -CXXFLAGS="$RPM_OPT_FLAGS" %configure -uname -a|grep SMP && make -j 2 || make +#CXXFLAGS="$RPM_OPT_FLAGS" %configure +#uname -a|grep SMP && make -j 2 || make +./configure +make %install rm -rf $RPM_BUILD_ROOT -mkdir -p "$RPM_BUILD_ROOT/usr/local/bin" -mkdir -p "$RPM_BUILD_ROOT/usr/doc/cdctl-$VERSION" +mkdir -p $RPM_BUILD_ROOT/usr/local/bin +mkdir -p $RPM_BUILD_ROOT/usr/local/man/man1 -install -s -m 755 cdctl "$RPM_BUILD_ROOT/usr/local/bin" -install -m 755 LICENSE NEWS NUTSANDBOLTS PUBLICKEY README "$RPM_BUILD_ROOT/usr/doc/cdctl-$VERSION" +install -s -m 755 cdctl $RPM_BUILD_ROOT/usr/local/bin +install -m 644 cdctl.1 $RPM_BUILD_ROOT/usr/local/man/man1 %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,775) %doc README LICENSE NEWS NUTSANDBOLTS PUBLICKEY /usr/local/bin/cdctl - +/usr/local/man/man1/cdctl.1 %changelog +* Sun Apr 02 2000 Andy Piper <squiggle@ukgateway.net> +- Added man page to RPM package. + +* Sat Apr 01 2000 Andy Piper <squiggle@ukgateway.net> +- Modified spec file to remove redundant line and follow standards from the +HOWTO. + * Sun Mar 26 2000 Jason Spence <thalakan@technologist.com> - First spec file for cdctl.
View file
cdctl-0.16.tar.gz/cdctl.spec.in
Added
@@ -0,0 +1,62 @@ +%define name cdctl +%define version @VERSION@ +%define release 1 + +Summary: Controls your cdrom drive. +Name: %{name} +Version: %{version} +Release: %{release} +Source0: %{name}-%{version}.tar.gz +Copyright: Free for non-commercial use +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-buildroot +Prefix: %{_prefix} +URL: http://cdctl.sourceforge.net + +%description +cdctl controls your cdrom drive under Linux. It is an user-level console +application which gives the user access to the ioctl() interfaces of +the Uniform CDROM Driver of the Linux kernel. It can play audio CDs, +control the drive's tray motor, change the drive's volume levels, read +the current type of disc in the drive, and much more. + +%prep + +%setup -n cdctl + +%build +#CXXFLAGS="$RPM_OPT_FLAGS" %configure +#uname -a|grep SMP && make -j 2 || make +./configure +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/local/bin +mkdir -p $RPM_BUILD_ROOT/usr/local/man/man1 + +install -s -m 755 cdctl $RPM_BUILD_ROOT/usr/local/bin +install -m 644 cdctl.1 $RPM_BUILD_ROOT/usr/local/man/man1 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,775) +%doc README LICENSE NEWS NUTSANDBOLTS PUBLICKEY + +/usr/local/bin/cdctl +/usr/local/man/man1/cdctl.1 + +%changelog +* Sun Apr 02 2000 Andy Piper <squiggle@ukgateway.net> +- Added man page to RPM package. + +* Sat Apr 01 2000 Andy Piper <squiggle@ukgateway.net> +- Modified spec file to remove redundant line and follow standards from the +HOWTO. + +* Sun Mar 26 2000 Jason Spence <thalakan@technologist.com> +- First spec file for cdctl. + +# end of file
View file
cdctl-0.15.tar.bz2/configure.in -> cdctl-0.16.tar.gz/configure.in
Changed
@@ -1,6 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(cdctl.c) +dnl JRS: this is where THE version for cdctl is stored. +VERSION="0.16" +AC_DEFINE(VERSION, "$VERSION", The current version of cdctl) +AC_SUBST(VERSION) + dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL @@ -9,14 +14,52 @@ dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h malloc.h sys/ioctl.h unistd.h) + +dnl Make sure that asm/ioctls.h comes first to catch the case that the +dnl kernel headers aren't available or are symlinked to a Linux kernel +dnl tree that hasn't been compiled yet. +AC_CHECK_HEADERS(fcntl.h malloc.h) +AC_CHECK_HEADERS(asm/ioctls.h,, + + echo "You probably don't have your kernel headers installed right." + echo "Look at /usr/include/asm and make sure it's pointing to" + echo "include/asm in a valid kernel source tree. You may have" + echo "to run 'make symlinks' or 'make config' to create the right" + echo "links." + exit 1 + ) + +AC_CHECK_HEADERS(asm/cdrom.h unistd.h linux/cdrom.h linux/errno.h sys/ioctl.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST +AC_EGREP_HEADER( + struct dvd_layer, linux/cdrom.h, + AC_DEFINE(HAVE_DVD_IOCTLS, 1, + Define if <linux/cdrom.h> has the DVD ioctls. + ) + +) + dnl Checks for library functions. AC_PROG_GCC_TRADITIONAL AC_TYPE_SIGNAL AC_CHECK_FUNCS(strstr) -AC_OUTPUT(Makefile) +dnl Where to put the documentation (NEWS, INSTALL, etc.) +AC_MSG_CHECKING(where to put the documentation) +AC_ARG_WITH(docdir, + --with-docdir=PATH Where to put the documentation PREFIX/doc/cdctl, + cdctl_cv_docdir=$withval, + AC_CACHE_VAL(cdctl_cv_docdir, + cdctl_cv_docdir='${prefix}/doc/cdctl' + ) + ) +docdir=$cdctl_cv_docdir +AC_MSG_RESULT($docdir) +AC_SUBST(docdir) + +AC_CONFIG_HEADER(config.h) + +AC_OUTPUT(Makefile cdctl.spec)
View file
cdctl-0.15.tar.bz2/iso_header.c -> cdctl-0.16.tar.gz/iso_header.c
Changed
@@ -15,7 +15,7 @@ #include "cdctl.h" -/* $Id: iso_header.c,v 1.1.1.1 2000/03/27 01:06:54 thalakan Exp $ */ +/* $Id: iso_header.c,v 1.2 2000/04/11 09:19:58 thalakan Exp $ */ /* * Types of values we find in the ISO 9660 headers for struct iso_header @@ -48,12 +48,12 @@ char * s; /* s is for string */ struct iso_header_entry * current; /* current is for current entry */ struct iso_header_entry iso_header = { - { "First Volume Descriptor", 0x8000, 1, ISO_VOLDESC }, - { "Volume ID ", 0x8001, 6, ISO_VOLID }, - { "System ID ", 0x8008, 31, ISO_TEXT }, - { "Application ID ", 0x823e, 127, ISO_TEXT }, - { "Volume Set ID ", 0x827f, 127, ISO_TEXT }, - { "Preparer ID ", 0x81be, 127, ISO_TEXT }, + { "First Volume Descriptor", 0x8000, 1, ISO_VOLDESC }, + { "Volume ID ", 0x8001, 6, ISO_VOLID }, + { "System ID ", 0x8008, 0x1f, ISO_TEXT }, + { "Application ID ", 0x823e, 0x7f, ISO_TEXT }, + { "Volume Set ID ", 0x827f, 0x7f, ISO_TEXT }, + { "Preparer ID ", 0x81be, 0x7f, ISO_TEXT }, { NULL, 0, 0, 0 }, };
View file
cdctl-0.15.tar.bz2/version.c -> cdctl-0.16.tar.gz/version.c
Changed
@@ -1,3 +1,4 @@ +#include "config.h" /* cdctl config header */ #include <stdio.h> /* standard libs */ #ifndef _LINUX_TYPES_H @@ -21,22 +22,15 @@ * fixed in recent kernel headers. */ +static char vcid = "$Id: version.c,v 1.3 2001/07/31 09:07:27 thalakan Exp $\n"; + #include <linux/cdrom.h> #include "cdctl.h" -/* - * The GNU coding standards say that you're supposed to give only the program - * name and version, but I want the CVS Id as well. Linus says we should - * burn the coding standards anyway. - */ - -static char vcid = "$Id: version.c,v 1.1.1.1 2000/03/27 01:06:54 thalakan Exp $"; - void version(void) { printf("%s\n", VERSION); printf("%s\n", vcid); } - /* * I really wish there was a command like perl's qw// to deal with @@ -62,6 +56,9 @@ #ifdef CDROM_LOCKDOOR "-oA --lockdoor=A lOck or unlock the eject button\n" #endif +#ifdef HAVE_DVD_IOCTLS +"-n --dvdinfo Display info for DVD discs\n" +#endif "-pT --play=T Play track T\n" "-r --resume Resume playing\n" "-s --stop Stop playing\n"
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.