Commit ee92b84d authored by David Zeuthen's avatar David Zeuthen

Merge remote-tracking branch 'origin/udisks2-port'

parents 2ea003d3 cad19345
Copyright (C) 2008 David Zeuthen.
Copyright (C) 2008-2011 David Zeuthen <zeuthen@gmail.com>
All Rights Reserved.
All source code in the gnome-disk-utility project is licensed to you
......
SUBDIRS = src data doc help po
EXTRA_DIST = \
autogen.sh \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
gnome-doc-utils.make \
TODO
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
SUBDIRS = src data po
clean-local :
rm -f *~ po/*~
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
......@@ -7,17 +7,6 @@ AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
# libtool versioning - this applies to all libraries in this package
#
# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
#
LT_CURRENT=0
LT_REVISION=0
LT_AGE=0
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_PROG_CC
AC_ISC_POSIX
AC_HEADER_STDC
......@@ -25,172 +14,26 @@ AC_PROG_LIBTOOL
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
#### gcc warning flags
AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],
[enable -ansi -pedantic gcc flags]),
enable_ansi=$enableval,enable_ansi=no)
if test "x$GCC" = "xyes"; then
changequote(,)dnl
case " $CFLAGS " in
*[\ \ ]-Wall[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wall" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wchar-subscripts[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wmissing-declarations[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wnested-externs[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wnested-externs" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wpointer-arith[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wpointer-arith" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wcast-align[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wcast-align" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wsign-compare[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wsign-compare" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wformat[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wformat" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Wformat-security[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wformat-security" ;;
esac
if test "x$enable_ansi" = "xyes"; then
case " $CFLAGS " in
*[\ \ ]-ansi[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -ansi" ;;
esac
case " $CFLAGS " in
*[\ \ ]-D_POSIX_C_SOURCE*) ;;
*) CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L" ;;
esac
case " $CFLAGS " in
*[\ \ ]-D_BSD_SOURCE[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -D_BSD_SOURCE" ;;
esac
case " $CFLAGS " in
*[\ \ ]-pedantic[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -pedantic" ;;
esac
fi
changequote([,])dnl
fi
# *****
# GNOME
# *****
GNOME_COMMON_INIT
GNOME_DOC_INIT
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc],
[use gtk-doc to build documentation [default=no]]),,
enable_gtk_doc=no)
GTK_DOC_CHECK([1.3])
# ***************************
# Check for required packages
# ***************************
GLIB2_REQUIRED=2.22
GOBJECT2_REQUIRED=2.16
GIO2_REQUIRED=2.22
DBUS_GLIB_REQUIRED=0.74
GNOME_KEYRING_REQUIRED=2.22
GTK3_REQUIRED=2.90.7
UNIQUE_REQUIRED=2.90.1
LIBNOTIFY_REQUIRED=0.6.1
NAUTILUS_REQUIRED=2.24.0
AVAHI_UI_REQUIRED=0.6.25
UDISKS2_REQUIRED=1.90
GTK3_REQUIRED=3.0.0
UDISKS_REQUIRED=1.0.0
UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
SCROLLKEEPER_REQUIRED=0.3.14
INTLTOOL_REQUIRED=0.35.0
PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB2_REQUIRED])
PKG_CHECK_MODULES(GOBJECT2, [gobject-2.0 >= $GOBJECT2_REQUIRED])
PKG_CHECK_MODULES(GIO2, [gio-2.0 >= $GIO2_REQUIRED])
PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
PKG_CHECK_MODULES(GLIB2, [gio-unix-2.0 >= $GLIB2_REQUIRED])
PKG_CHECK_MODULES(UDISKS2, [udisks2 >= $UDISKS2_REQUIRED])
PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
PKG_CHECK_MODULES(UNIQUE, [unique-3.0 >= $UNIQUE_REQUIRED])
PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
PKG_CHECK_MODULES(X11, [x11])
PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED])
# *************
# Remote Access
# *************
have_remote_access=no
AC_ARG_ENABLE(remote_access, AS_HELP_STRING([--disable-remote-access], [disable access to remote udisks daemons]))
if test "x$enable_remote_access" != "xno"; then
AC_DEFINE(HAVE_REMOTE_ACCESS, 1, [Defined if remote access is enabled])
have_remote_access=yes
fi
AM_CONDITIONAL(HAVE_REMOTE_ACCESS, [test "$have_remote_access" = "yes"])
# *************
# GNOME Keyring
# *************
have_gnome_keyring=no
AC_ARG_ENABLE(gnome-keyring, AS_HELP_STRING([--disable-gnome-keyring], [disable use of GNOME Keyring]))
if test "x$enable_gnome_keyring" != "xno"; then
PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED,
[AC_DEFINE(HAVE_GNOME_KEYRING, 1, [Define if gnome-keyring is available])
have_gnome_keyring=yes], have_gnome_keyring=no)
if test "x$have_gnome_keyring" = xno -a "x$enable_gnome_keyring" = xyes; then
AC_MSG_ERROR([gnome-keyring support requested but libraries not found])
fi
fi
AC_SUBST(GNOME_KEYRING_LIBS)
AC_SUBST(GNOME_KEYRING_CFLAGS)
AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
# *************
# Documentation
# *************
AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
if test x$SCROLLKEEPER_CONFIG = xno; then
AC_MSG_ERROR(Could not find scrollkeeper-config, please install the scrollkeeper package)
fi
# ********************
# Internationalization
......@@ -203,31 +46,6 @@ AC_SUBST([GETTEXT_PACKAGE])
AM_GLIB_GNU_GETTEXT
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
# ******************
# Nautilus extension
# ******************
have_nautilus=no
AC_ARG_ENABLE(nautilus, AS_HELP_STRING([--disable-nautilus], [disable nautilus extension]))
if test "x$enable_nautilus" != "xno"; then
PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED,
[AC_DEFINE(HAVE_NAUTILUS, 1, [Define if nautilus is available])
have_nautilus=yes], have_nautilus=no)
if test "x$have_nautilus" = xno -a "x$enable_nautilus" = xyes; then
AC_MSG_ERROR([nautilus support requested but libraries not found])
fi
fi
AC_SUBST(NAUTILUS_LIBS)
AC_SUBST(NAUTILUS_CFLAGS)
AC_SUBST(NAUTILUS_EXTENSION_DIR)
AM_CONDITIONAL(ENABLE_NAUTILUS, [test "$have_nautilus" = "yes"])
# *************************************
# *************************************
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS])
......@@ -236,26 +54,18 @@ AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
src/Makefile
src/gdu/Makefile
src/gdu/gdu.pc
src/gdu-gtk/Makefile
src/gdu-gtk/gdu-gtk.pc
src/palimpsest/Makefile
src/notification/Makefile
src/format-tool/Makefile
src/nautilus-extension/Makefile
po/Makefile.in
data/Makefile
data/gdu-notification-daemon.desktop.in.in
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/22x22/Makefile
data/icons/24x24/Makefile
data/icons/32x32/Makefile
data/icons/48x48/Makefile
data/icons/256x256/Makefile
data/icons/scalable/Makefile
help/Makefile
doc/Makefile
doc/version.xml
data/ui/Makefile
])
AC_OUTPUT
......@@ -278,9 +88,4 @@ echo "
cppflags: ${CPPFLAGS}
Maintainer mode: ${USE_MAINTAINER_MODE}
Building api docs: ${enable_gtk_doc}
Nautilus extension: ${have_nautilus}
GNOME Keyring support: ${have_gnome_keyring}
Remote Access: ${have_remote_access}
"
NULL =
SUBDIRS = icons
SUBDIRS = ui icons
desktopdir = $(datadir)/applications
desktop_in_files = palimpsest.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
autostartdir = $(sysconfdir)/xdg/autostart
autostart_in_files = gdu-notification-daemon.desktop.in
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
gdu-notification-daemon.desktop.in: gdu-notification-daemon.desktop.in.in
@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
@INTLTOOL_DESKTOP_RULE@
distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
EXTRA_DIST = \
$(desktop_in_files) \
$(autostart_in_files) \
$(NULL)
CLEANFILES = \
$(desktop_DATA) \
$(autostart_DATA) \
gdu-notification-daemon.desktop.in \
gdu-notification-daemon.desktop.in.in \
$(desktop_DATA) \
$(NULL)
clean-local :
......
[Desktop Entry]
_Name=Disk Notifications
_Comment=Provides notifications related to disks
Icon=gdu-notification-daemon
Exec=@LIBEXECDIR@/gdu-notification-daemon
Terminal=false
Type=Application
Categories=
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-disk-utility
X-GNOME-Bugzilla-Component=notifications
X-GNOME-Bugzilla-Version=@VERSION@
#X-GNOME-AutoRestart=true
......@@ -3,43 +3,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/16x16/apps
icon_DATA = \
palimpsest.png \
gdu-eject.png \
gdu-detach.png \
gdu-mount.png \
gdu-unmount.png \
gdu-raid-array.png \
gdu-raid-array-start.png \
gdu-raid-array-stop.png \
gdu-encrypted-lock.png \
gdu-encrypted-unlock.png \
gdu-smart-failing.png \
gdu-smart-threshold.png \
gdu-smart-healthy.png \
gdu-smart-unknown.png \
gdu-check-disk.png \
gdu-info.png \
gdu-error.png \
gdu-warning.png \
gdu-unmountable.png \
nautilus-gdu.png \
gdu-multidisk-drive.png \
gdu-hba.png \
gdu-expander.png \
gdu-category-multidisk.png \
gdu-category-multipath.png \
gdu-category-peripheral.png \
gdu-emblem-mp.png \
gdu-emblem-mp-component.png \
gdu-emblem-lvm-vg.png \
gdu-emblem-lvm-lv.png \
gdu-emblem-raid-linear.png \
gdu-emblem-raid0.png \
gdu-emblem-raid1.png \
gdu-emblem-raid3.png \
gdu-emblem-raid4.png \
gdu-emblem-raid5.png \
gdu-emblem-raid6.png \
gdu-emblem-raid10.png \
$(NULL)
EXTRA_DIST = \
......
data/icons/16x16/palimpsest.png

678 Bytes | W: | H:

data/icons/16x16/palimpsest.png

1.06 KB | W: | H:

data/icons/16x16/palimpsest.png
data/icons/16x16/palimpsest.png
data/icons/16x16/palimpsest.png
data/icons/16x16/palimpsest.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -3,43 +3,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/22x22/apps
icon_DATA = \
palimpsest.png \
gdu-eject.png \
gdu-detach.png \
gdu-mount.png \
gdu-unmount.png \
gdu-raid-array.png \
gdu-raid-array-start.png \
gdu-raid-array-stop.png \
gdu-encrypted-lock.png \
gdu-encrypted-unlock.png \
gdu-smart-failing.png \
gdu-smart-threshold.png \
gdu-smart-healthy.png \
gdu-smart-unknown.png \
gdu-check-disk.png \
gdu-info.png \
gdu-error.png \
gdu-warning.png \
gdu-unmountable.png \
nautilus-gdu.png \
gdu-multidisk-drive.png \
gdu-hba.png \
gdu-expander.png \
gdu-category-multidisk.png \
gdu-category-multipath.png \
gdu-category-peripheral.png \
gdu-emblem-mp.png \
gdu-emblem-mp-component.png \
gdu-emblem-lvm-vg.png \
gdu-emblem-lvm-lv.png \
gdu-emblem-raid-linear.png \
gdu-emblem-raid0.png \
gdu-emblem-raid1.png \
gdu-emblem-raid3.png \
gdu-emblem-raid4.png \
gdu-emblem-raid5.png \
gdu-emblem-raid6.png \
gdu-emblem-raid10.png \
$(NULL)
EXTRA_DIST = \
......