c1bb46f2a8
changes: minor bugfixes, translation updates pkgsrc changes: -in scsi io code, remove the code which builds a raw device path from a block device - use the raw_device hal property instead -split out the nautilus plugin, allows to use brasero (and its clients, eg sound-juicer) with less gnome desktop overhead -support playlist parsing as an option -- unfortunately this pulls in evolution-data-server indirectly which is pretty large for that limited gain of functionality (on per default, as in other pkgs able to use the evolution database) -cleanup
175 lines
4.9 KiB
Text
175 lines
4.9 KiB
Text
$NetBSD: patch-ac,v 1.2 2009/07/26 18:25:01 drochner Exp $
|
|
|
|
--- configure.orig 2009-07-01 03:03:18.000000000 +0200
|
|
+++ configure
|
|
@@ -900,6 +900,8 @@ ENABLE_GTK_DOC_TRUE
|
|
GTKDOC_CHECK
|
|
PKG_CONFIG
|
|
HTML_DIR
|
|
+HAVE_SCSIIO_H_FALSE
|
|
+HAVE_SCSIIO_H_TRUE
|
|
HAVE_USCSI_H_FALSE
|
|
HAVE_USCSI_H_TRUE
|
|
HAVE_SG_IO_HDR_T_FALSE
|
|
@@ -12828,6 +12830,116 @@ else
|
|
fi
|
|
|
|
|
|
+{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5
|
|
+$as_echo_n "checking for scsireq_t... " >&6; }
|
|
+if test "${ac_cv_type_scsireq_t+set}" = set; then
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_cv_type_scsireq_t=no
|
|
+cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+#include <sys/types.h>
|
|
+ #include <sys/scsiio.h>
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+if (sizeof (scsireq_t))
|
|
+ return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (ac_try="$ac_compile"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo") >&5
|
|
+ (eval "$ac_compile") 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest.$ac_objext; then
|
|
+ cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+#include <sys/types.h>
|
|
+ #include <sys/scsiio.h>
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+if (sizeof ((scsireq_t)))
|
|
+ return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (ac_try="$ac_compile"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo") >&5
|
|
+ (eval "$ac_compile") 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest.$ac_objext; then
|
|
+ :
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_cv_type_scsireq_t=yes
|
|
+fi
|
|
+
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+
|
|
+fi
|
|
+
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scsireq_t" >&5
|
|
+$as_echo "$ac_cv_type_scsireq_t" >&6; }
|
|
+if test "x$ac_cv_type_scsireq_t" = x""yes; then
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_SCSIREQ_T 1
|
|
+_ACEOF
|
|
+
|
|
+has_scsiio="yes"
|
|
+else
|
|
+ has_scsiio="no"
|
|
+fi
|
|
+
|
|
+
|
|
{ $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5
|
|
$as_echo_n "checking for struct uscsi_cmd... " >&6; }
|
|
if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then
|
|
@@ -12942,11 +13054,13 @@ if test x"$has_cam" = x"yes"; then
|
|
BRASERO_SCSI_LIBS="-lcam"
|
|
elif test x"$has_sg" = x"yes"; then
|
|
:
|
|
+elif test x"$has_scsiio" = x"yes"; then
|
|
+ :
|
|
elif test x"$has_uscsi" = x"yes"; then
|
|
:
|
|
else
|
|
- { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
|
|
-$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
|
|
+ { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
|
|
+$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
|
|
{ (exit 1); exit 1; }; }
|
|
fi
|
|
|
|
@@ -12974,6 +13088,14 @@ else
|
|
HAVE_USCSI_H_FALSE=
|
|
fi
|
|
|
|
+ if test x"$has_scsiio" = "xyes"; then
|
|
+ HAVE_SCSIIO_H_TRUE=
|
|
+ HAVE_SCSIIO_H_FALSE='#'
|
|
+else
|
|
+ HAVE_SCSIIO_H_TRUE='#'
|
|
+ HAVE_SCSIIO_H_FALSE=
|
|
+fi
|
|
+
|
|
|
|
|
|
# Check whether --enable-largefile was given.
|
|
@@ -19787,6 +19909,13 @@ $as_echo "$as_me: error: conditional \"H
|
|
Usually this means the macro was only invoked conditionally." >&2;}
|
|
{ (exit 1); exit 1; }; }
|
|
fi
|
|
+if test -z "${HAVE_SCSIIO_H_TRUE}" && test -z "${HAVE_SCSIIO_H_FALSE}"; then
|
|
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SCSIIO_H\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." >&5
|
|
+$as_echo "$as_me: error: conditional \"HAVE_SCSIIO_H\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
+fi
|
|
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
|
|
{ { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
|
|
Usually this means the macro was only invoked conditionally." >&5
|