git://git.jankratochvil.net
/
captive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
198f41c
)
Compile lufs client optionally.
author
short
<>
Sun, 17 Aug 2003 12:55:34 +0000
(12:55 +0000)
committer
short
<>
Sun, 17 Aug 2003 12:55:34 +0000
(12:55 +0000)
configure.in
patch
|
blob
|
history
src/client/lufs/Makefile.am
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index
c83ffc8
..
1609bb0
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-227,6
+227,10
@@
PKG_CHECK_MODULES(OPENSSL,openssl,,[
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
+have_lufs_includes=true
+AC_CHECK_HEADERS(lufs/fs.h lufs/proto.h,,[ have_lufs_includes=false ])
+AM_CONDITIONAL(HAVE_LUFS_INCLUDES,$have_lufs_includes)
+
dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c
AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c
AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
diff --git
a/src/client/lufs/Makefile.am
b/src/client/lufs/Makefile.am
index
37ec1ec
..
1cdaac7
100644
(file)
--- a/
src/client/lufs/Makefile.am
+++ b/
src/client/lufs/Makefile.am
@@
-19,8
+19,6
@@
include $(top_srcdir)/Makefile-head.am
include $(top_srcdir)/src/libcaptive/Makefile-libcaptive.am
include $(top_srcdir)/Makefile-head.am
include $(top_srcdir)/src/libcaptive/Makefile-libcaptive.am
-lib_LTLIBRARIES+=liblufs-captivefs.la
-
liblufs_captivefs_la_CFLAGS= $(GNOME_VFS_MODULE_CFLAGS) $(LIBXML_CFLAGS)
liblufs_captivefs_la_LIBADD=$(captive_library) $(GNOME_VFS_MODULE_LIBS)
liblufs_captivefs_la_LDFLAGS=-release $(VERSION)
liblufs_captivefs_la_CFLAGS= $(GNOME_VFS_MODULE_CFLAGS) $(LIBXML_CFLAGS)
liblufs_captivefs_la_LIBADD=$(captive_library) $(GNOME_VFS_MODULE_LIBS)
liblufs_captivefs_la_LDFLAGS=-release $(VERSION)
@@
-32,3
+30,8
@@
liblufs_captivefs_la_SOURCES= \
captivefs-misc.c \
captivefs-misc.h \
captivefs-vfs.c
captivefs-misc.c \
captivefs-misc.h \
captivefs-vfs.c
+
+if HAVE_LUFS_INCLUDES
+liblufs_captivefs_la_cond=liblufs-captivefs.la
+endif
+lib_LTLIBRARIES+=$(liblufs_captivefs_la_cond)