summaryrefslogtreecommitdiff
path: root/legacy/eeze/configure.ac
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-01-29 04:21:53 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-01-29 04:21:53 +0000
commitc9e2fc434e2d477be0a1c2e2c5f19bcbe715aa80 (patch)
tree4900b9b9e58b1806ee0ce07becb2b14deb85062d /legacy/eeze/configure.ac
parent0cb7271e970294065e0d1a4b552897bce28b23dc (diff)
eeze 1.1 in trunk: disk mounting is now possible
SVN revision: 56362
Diffstat (limited to 'legacy/eeze/configure.ac')
-rw-r--r--legacy/eeze/configure.ac39
1 files changed, 35 insertions, 4 deletions
diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac
index 156ad55f5d..bfe3417f73 100644
--- a/legacy/eeze/configure.ac
+++ b/legacy/eeze/configure.ac
@@ -7,9 +7,6 @@ m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v expor
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9dnl m4_undefine([v_rev]) 9dnl m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line
11dnl dnl m4_define([relname], [ver-pre-svn-06])
12dnl m4_define([v_rel], [-release relname])
13##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 10##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
14m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])]) 11m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])])
15m4_define([lt_rev], m4_eval(v_maj + v_min)) 12m4_define([lt_rev], m4_eval(v_maj + v_min))
@@ -67,6 +64,7 @@ requirement_eeze="ecore >= 1.0.0 eina >= 1.0.0 libudev"
67### Checks for programs 64### Checks for programs
68AC_PROG_CC 65AC_PROG_CC
69AM_PROG_CC_C_O 66AM_PROG_CC_C_O
67AC_C___ATTRIBUTE__
70 68
71# pkg-config 69# pkg-config
72PKG_PROG_PKG_CONFIG 70PKG_PROG_PKG_CONFIG
@@ -97,6 +95,33 @@ elif test $udev_version -lt 148;then
97 AC_DEFINE([OLD_UDEV_RRRRRRRRRRRRRR],[1],[compat functionality for udev < 148]) 95 AC_DEFINE([OLD_UDEV_RRRRRRRRRRRRRR],[1],[compat functionality for udev < 148])
98fi 96fi
99 97
98eeze_mount=
99PKG_CHECK_EXISTS([mount >= 2.18.0],
100 [
101 AC_DEFINE([HAVE_EEZE_MOUNT], [1], [Eeze is mount-capable])
102 AM_CONDITIONAL([HAVE_EEZE_MOUNT], [true])
103 eeze_mount="yes"
104 ],
105 AM_CONDITIONAL([HAVE_EEZE_MOUNT], [false])
106)
107if test "x$eeze_mount" = "xyes";then
108 with_mount="/bin/mount"
109 with_umount="/bin/umount"
110 AC_ARG_WITH([mount], AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@]))
111 AC_ARG_WITH([umount], AS_HELP_STRING([--with-umount], [specify umount bin @<:@default=detect@:>@]))
112 PKG_CHECK_MODULES([LIBMOUNT], [mount >= 2.18.0])
113 PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0])
114
115 if test "x$with_mount" = "xdetect";then
116 AC_PATH_PROG([with_mount], [mount], AC_MSG_ERROR([mount could not be found in PATH]))
117 fi
118 AC_DEFINE_UNQUOTED([EEZE_MOUNT_BIN], ["$with_mount"], [mount bin to use])
119
120 if test "x$with_umount" = "xdetect";then
121 AC_PATH_PROG([with_umount], [umount], AC_MSG_ERROR([umount could not be found in PATH]))
122 fi
123 AC_DEFINE_UNQUOTED([EEZE_UNMOUNT_BIN], ["$with_umount"], [umount bin to use])
124fi
100 125
101### Checks for header files 126### Checks for header files
102 127
@@ -148,7 +173,12 @@ echo "$PACKAGE $VERSION"
148echo "------------------------------------------------------------------------" 173echo "------------------------------------------------------------------------"
149echo 174echo
150echo "Configuration Options Summary:" 175echo "Configuration Options Summary:"
151echo 176if test "x$eeze_mount" = "xyes";then
177 echo
178 echo "Mount..................: ${with_mount}"
179 echo "Umount.................: ${with_umount}"
180 echo
181fi
152echo "Test...................: ${have_eeze_udev_test}" 182echo "Test...................: ${have_eeze_udev_test}"
153echo 183echo
154echo "Documentation..........: ${build_doc}" 184echo "Documentation..........: ${build_doc}"
@@ -161,3 +191,4 @@ echo
161echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" 191echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
162echo " prefix...............: $prefix" 192echo " prefix...............: $prefix"
163echo 193echo
194