summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-06-29 18:53:40 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-06-29 18:53:40 +0000
commitb06075acf2859d4796270d634c9acfc5b0a5a005 (patch)
treeadb4a5863dc02a03767444da934b8d19ae3fa827
parentf2caf4707cab7adb6bb07cceca67ec50927d0115 (diff)
eeze_scanner seems to finally be complete, have at it
SVN revision: 60833
-rw-r--r--legacy/eeze/ChangeLog1
-rw-r--r--legacy/eeze/configure.ac3
-rw-r--r--legacy/eeze/src/bin/Makefile.am10
3 files changed, 12 insertions, 2 deletions
diff --git a/legacy/eeze/ChangeLog b/legacy/eeze/ChangeLog
index 02384a11d7..1b6bab9a67 100644
--- a/legacy/eeze/ChangeLog
+++ b/legacy/eeze/ChangeLog
@@ -45,3 +45,4 @@
452011-06-29 Mike Blumenkrantz (discomfitor/zmike) 452011-06-29 Mike Blumenkrantz (discomfitor/zmike)
46 * fixed bug where EEZE_UDEV_EVENT_NONE would not match all events for watches 46 * fixed bug where EEZE_UDEV_EVENT_NONE would not match all events for watches
47 * fixed segv when detecting removable drives 47 * fixed segv when detecting removable drives
48 * added eeze_scanner utility daemon
diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac
index 2433fe6cb8..4c80479a1b 100644
--- a/legacy/eeze/configure.ac
+++ b/legacy/eeze/configure.ac
@@ -104,6 +104,7 @@ PKG_CHECK_EXISTS([mount >= 2.18.0],
104 ], 104 ],
105 AM_CONDITIONAL([HAVE_EEZE_MOUNT], [false]) 105 AM_CONDITIONAL([HAVE_EEZE_MOUNT], [false])
106) 106)
107
107if test "x$eeze_mount" = "xyes";then 108if test "x$eeze_mount" = "xyes";then
108 with_mount="/bin/mount" 109 with_mount="/bin/mount"
109 with_umount="/bin/umount" 110 with_umount="/bin/umount"
@@ -113,6 +114,8 @@ if test "x$eeze_mount" = "xyes";then
113 PKG_CHECK_MODULES([LIBMOUNT], [mount >= 2.18.0]) 114 PKG_CHECK_MODULES([LIBMOUNT], [mount >= 2.18.0])
114 mount_v=$(pkg-config --modversion mount) 115 mount_v=$(pkg-config --modversion mount)
115 PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0]) 116 PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0])
117 PKG_CHECK_MODULES([EET], [eet >= 1.4.0])
118 PKG_CHECK_MODULES([ECORE_CON], [ecore-con >= 1.0.0])
116 119
117 if test "x$with_mount" = "xdetect";then 120 if test "x$with_mount" = "xdetect";then
118 AC_PATH_PROG([with_mount], [mount], AC_MSG_ERROR([mount could not be found in PATH])) 121 AC_PATH_PROG([with_mount], [mount], AC_MSG_ERROR([mount could not be found in PATH]))
diff --git a/legacy/eeze/src/bin/Makefile.am b/legacy/eeze/src/bin/Makefile.am
index 0724ff72f8..8ce27918f6 100644
--- a/legacy/eeze/src/bin/Makefile.am
+++ b/legacy/eeze/src/bin/Makefile.am
@@ -5,10 +5,10 @@ EEZE_CFLAGS = \
5@EEZE_CFLAGS@ 5@EEZE_CFLAGS@
6 6
7noinst_PROGRAMS = @EEZE_UDEV_TEST_PRG@ 7noinst_PROGRAMS = @EEZE_UDEV_TEST_PRG@
8EXTRA_PROGRAMS = eeze_udev_test eeze_mount eeze_umount eeze_disk_ls 8EXTRA_PROGRAMS = eeze_udev_test eeze_mount eeze_umount eeze_disk_ls eeze_scanner
9 9
10if HAVE_EEZE_MOUNT 10if HAVE_EEZE_MOUNT
11 DISK_PROGS = eeze_mount eeze_umount eeze_disk_ls 11 DISK_PROGS = eeze_mount eeze_umount eeze_disk_ls eeze_scanner
12else 12else
13 DISK_PROGS = 13 DISK_PROGS =
14endif 14endif
@@ -31,4 +31,10 @@ if HAVE_EEZE_MOUNT
31 eeze_disk_ls_SOURCES = eeze_disk_ls.c 31 eeze_disk_ls_SOURCES = eeze_disk_ls.c
32 eeze_disk_ls_CFLAGS = -I$(top_srcdir)/src/lib $(EEZE_CFLAGS) @LIBMOUNT_CFLAGS@ @ECORE_FILE_CFLAGS@ 32 eeze_disk_ls_CFLAGS = -I$(top_srcdir)/src/lib $(EEZE_CFLAGS) @LIBMOUNT_CFLAGS@ @ECORE_FILE_CFLAGS@
33 eeze_disk_ls_LDADD = $(top_builddir)/src/lib/libeeze.la @LIBMOUNT_LIBS@ @ECORE_FILE_LIBS@ 33 eeze_disk_ls_LDADD = $(top_builddir)/src/lib/libeeze.la @LIBMOUNT_LIBS@ @ECORE_FILE_LIBS@
34
35 eeze_scanner_SOURCES = eeze_scanner.c
36 eeze_scanner_CFLAGS = -I$(top_srcdir)/src/lib $(EEZE_CFLAGS) @LIBMOUNT_CFLAGS@ @ECORE_FILE_CFLAGS@ @ECORE_CON_CFLAGS@ @EET_CFLAGS@
37 eeze_scanner_LDADD = $(top_builddir)/src/lib/libeeze.la @LIBMOUNT_LIBS@ @ECORE_FILE_LIBS@ @ECORE_CON_LIBS@ @EET_LIBS@
38 includesdir = $(includedir)/eeze-@VMAJ@
39 includes_HEADERS = eeze_scanner.h
34endif 40endif