summaryrefslogtreecommitdiff
path: root/libgphoto2_port/disk
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2006-02-02 21:25:14 +0000
committerMarcus Meissner <marcus@jet.franken.de>2006-02-02 21:25:14 +0000
commitd75e90009d5346463e66418d1d53735cdf10a448 (patch)
treee9647163ae315247afb5c6a3293fbfc7c067abf9 /libgphoto2_port/disk
parent17f035ab7bbabe4a19404026ad47960fd6316de3 (diff)
downloadlibgphoto2-d75e90009d5346463e66418d1d53735cdf10a448.tar.gz
check for presence of mntent.h , disable fstab reading if its not there.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8539 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/disk')
-rw-r--r--libgphoto2_port/disk/disk.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libgphoto2_port/disk/disk.c b/libgphoto2_port/disk/disk.c
index bd8c58afb..830cd4a2c 100644
--- a/libgphoto2_port/disk/disk.c
+++ b/libgphoto2_port/disk/disk.c
@@ -33,7 +33,9 @@
#include <sys/param.h>
#include <dirent.h>
#include <string.h>
-#include <mntent.h>
+#ifdef HAVE_MNTENT_H
+# include <mntent.h>
+#endif
#ifdef HAVE_HAL
#include <hal/libhal.h>
@@ -176,6 +178,7 @@ gp_port_library_list (GPPortInfoList *list)
dbus_connection_disconnect (dbus_connection);
dbus_connection_unref (dbus_connection);
#else
+# ifdef HAVE_MNTENT_H
FILE *mnt;
struct mntent *mntent;
char path[1024];
@@ -226,6 +229,8 @@ gp_port_library_list (GPPortInfoList *list)
CHECK (gp_port_info_list_append (list, info));
}
endmntent(mnt);
+# endif
+/* actually else ... "no ports available here." */
#endif
return GP_OK;
}