| [vhffs-dev] [713] Added vhffs-fs support to top level configure. |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 713
Author: beuss
Date: 2007-07-12 09:53:45 +0000 (Thu, 12 Jul 2007)
Log Message:
-----------
Added vhffs-fs support to top level configure.
Prefix is now repected.
Modified Paths:
--------------
trunk/Makefile.am
trunk/configure.ac
trunk/vhffs-fs/configure.ac
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-07-11 20:25:39 UTC (rev 712)
+++ trunk/Makefile.am 2007-07-12 09:53:45 UTC (rev 713)
@@ -2,9 +2,14 @@
SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
+if INSTALL_VHFFS_FS
+ SUB_VHFFS_FS=vhffs-fs
+endif
+
SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
- vhffs-panel vhffs-robots vhffs-shells vhffs-tests vhffs-tools
+ vhffs-panel vhffs-robots vhffs-shells vhffs-tests vhffs-tools $(SUB_VHFFS_FS)
+
EXTRA_DIST = vhffs-forum vhffs-irc vhffs-packages \
vhffs-rfc vhffs-tests
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-07-11 20:25:39 UTC (rev 712)
+++ trunk/configure.ac 2007-07-12 09:53:45 UTC (rev 713)
@@ -25,7 +25,7 @@
AC_HELP_STRING([--with-conf-path=path],
[Complete path for configuration files (/etc/vhffs)]),
CONFDIR=$withval,
- CONFDIR=/etc/vhffs
+ CONFDIR=$prefix/etc/vhffs
)
AC_SUBST(CONFDIR)
@@ -33,7 +33,7 @@
AC_HELP_STRING([--with-shell-path=path],
[Complete path for tux shell (/bin)]),
SHELLDIR=$withval,
- SHELLDIR=/usr/bin
+ SHELLDIR=$prefix/usr/bin
)
AC_SUBST(SHELLDIR)
@@ -42,7 +42,7 @@
AC_HELP_STRING([--with-tools-path=path],
[Complete path for tools (executables) (/usr/local/bin)]),
TOOLSDIR=$withval,
- TOOLSDIR=/usr/local/bin
+ TOOLSDIR=$prefix/usr/local/bin
)
AC_SUBST(TOOLSDIR)
@@ -51,16 +51,16 @@
AC_HELP_STRING([--with-doc-path=path],
[Complete path for documentation files (/usr/share/doc/vhffs)]),
DOCDIR=$withval,
- DOCDIR=/usr/share/doc/vhffs
+ DOCDIR=$prefix/usr/share/doc/vhffs
)
AC_SUBST(DOCDIR)
dnl perl modules
AC_ARG_WITH(api-path,
- AC_HELP_STRING([--with-api-path=path],
- [Path for perl modules (API) (/usr/share/vhffs/api)]),
- VHFFS_LIBDIR=$withval,
- VHFFS_LIBDIR=/usr/share/vhffs/api
+ AC_HELP_STRING([--with-api-path=path],
+ [Path for perl modules (API) (/usr/share/vhffs/api)]),
+ VHFFS_LIBDIR=$withval,
+ VHFFS_LIBDIR=$prefix/usr/share/vhffs/api
)
APIDIR=$VHFFS_LIBDIR/Vhffs
AC_SUBST(APIDIR)
@@ -71,7 +71,7 @@
AC_HELP_STRING([--with-web-path=path],
[Complete path for web interface (panel) (/usr/share/vhffs/panel)]),
PANELDIR=$withval,
- PANELDIR=/usr/share/vhffs/panel
+ PANELDIR=$prefix/usr/share/vhffs/panel
)
AC_SUBST(PANELDIR)
@@ -80,7 +80,7 @@
AC_HELP_STRING([--with-template-path=path],
[Complete path for web templates (panel) (/usr/share/vhffs/templates)]),
TEMPLATESDIR=$withval,
- TEMPLATESDIR=/usr/share/vhffs/templates
+ TEMPLATESDIR=$prefix/usr/share/vhffs/templates
)
AC_SUBST(TEMPLATESDIR)
@@ -88,7 +88,7 @@
AC_HELP_STRING([--with-backend-path=path],
[Complete path for web backend (/usr/share/vhffs/backend)]),
BACKENDDIR=$withval,
- BACKENDDIR=/usr/share/vhffs/backend
+ BACKENDDIR=$prefix/usr/share/vhffs/backend
)
AC_SUBST(BACKENDDIR)
@@ -97,7 +97,7 @@
AC_HELP_STRING([--with-robot-path=path],
[Complete path for robots file (/usr/lib/vhffs/bots)]),
BOTSDIR=$withval,
- BOTSDIR=/usr/lib/vhffs/bots
+ BOTSDIR=$prefix/usr/lib/vhffs/bots
)
AC_SUBST(BOTSDIR)
@@ -106,7 +106,7 @@
AC_HELP_STRING([--with-jabber-path=path],
[Complete path for jabber pipe (/usr/share/vhffs/jabber)]),
JABBERDIR=$withval,
- JABBERDIR=/usr/share/vhffs/jabber
+ JABBERDIR=$prefix/usr/share/vhffs/jabber
)
AC_SUBST(JABBERDIR)
@@ -115,7 +115,7 @@
AC_HELP_STRING([--with-listengine-path=path],
[Complete path for jabber pipe (/usr/lib/vhffs/listengine)]),
LEDIR=$withval,
- LEDIR=/usr/lib/vhffs/listengine
+ LEDIR=$prefix/usr/lib/vhffs/listengine
)
AC_SUBST(LEDIR)
@@ -124,7 +124,7 @@
AC_HELP_STRING([--with-listengine-web-path=path],
[Complete path for listengine web file (/usr/share/vhffs/listengine)]),
LEWEB=$withval,
- LEWEB=/usr/lib/vhffs/listengine
+ LEWEB=$prefix/usr/lib/vhffs/listengine
)
AC_SUBST(LEWEB)
@@ -133,7 +133,7 @@
AC_HELP_STRING([--with-mail-path=path],
[Complete path for email files (/usr/share/vhffs/listengine)]),
MAILSDIR=$withval,
- MAILSDIR=/usr/lib/vhffs/listengine
+ MAILSDIR=$prefix/usr/lib/vhffs/listengine
)
AC_SUBST(MAILSDIR)
@@ -142,7 +142,7 @@
AC_HELP_STRING([--with-intl-path=path],
[Complete path for localization files (/usr/share/vhffs/intl)]),
INTLDIR=$withval,
- INTLDIR=/usr/share/vhffs/intl
+ INTLDIR=$prefix/usr/share/vhffs/intl
)
AC_SUBST(INTLDIR)
@@ -151,7 +151,7 @@
AC_HELP_STRING([--with-doc-path=path],
[Complete path for documentation files (/usr/share/doc/vhffs)]),
DOCSDIR=$withval,
- DOCSDIR=/usr/share/doc/vhffs
+ DOCSDIR=$prefix/usr/share/doc/vhffs
)
AC_SUBST(DOCSDIR)
@@ -161,7 +161,7 @@
AC_HELP_STRING([--with-compat-path=path],
[Complete path for compatibility scripts (/usr/share/doc/vhffs/compat)]),
COMPATDIR=$withval,
- COMPATDIR=/usr/share/doc/vhffs/compat
+ COMPATDIR=$prefix/usr/share/doc/vhffs/compat
)
AC_SUBST(COMPATDIR)
@@ -255,7 +255,14 @@
AM_CONDITIONAL(INSTALL_TOOLS, test "$enable_tools" = yes)
+dnl Install vhffs-fs or not ?
+AC_ARG_ENABLE(vhffs-fs,
+ AC_HELP_STRING([--enable-vhffs-fs],
+ [Enable VHFFS filesystem (on the fly homedirs using VHFFS DB)
+ [default=no]]),
+ enable_vhffs_fs=$enableval, enable_vhffs_fs=no)
+AM_CONDITIONAL(INSTALL_VHFFS_FS, test "$enable_vhffs_fs" = yes)
# -- Starting system checks
AC_CHECK_HEADERS([stdlib.h string.h sys/time.h syslog.h unistd.h])
@@ -275,6 +282,12 @@
# -- Files to generate
+
+# Configures vhffs-fs if needed
+if test "$enable_vhffs_fs" = yes ; then
+ AC_CONFIG_SUBDIRS([vhffs-fs])
+fi
+
AC_CONFIG_FILES([
vhffs-test-dependencies],
[chmod ug+x $ac_file]
Modified: trunk/vhffs-fs/configure.ac
===================================================================
--- trunk/vhffs-fs/configure.ac 2007-07-11 20:25:39 UTC (rev 712)
+++ trunk/vhffs-fs/configure.ac 2007-07-12 09:53:45 UTC (rev 713)
@@ -33,18 +33,21 @@
fi
# fuse stuff
-AC_ARG_WITH(fuse-path,
- AC_HELP_STRING([--with-fuse-path],
- [Specify fuse include files path [default=/usr/include/fuse]]),
- CPPFLAGS="$CPPFLAGS -I$withval",
- CPPFLAGS="$CPPFLAGS -I/usr/include/fuse")
-
AC_ARG_WITH(fuse-version,
AC_HELP_STRING([--with-fuse-version],
[Specify fuse version to use [default=25]]),
AC_DEFINE([FUSE_USE_VERSION], $withval, [Fuse version to use]),
AC_DEFINE([FUSE_USE_VERSION], [25], [Fuse version to use]))
+AC_ARG_WITH(vhffs-fs-path,
+ AC_HELP_STRING([--with-vhffs-fs-path],
+ [Specify vhffs-fs installation path]),
+ VHFFSFSDIR=$withval,
+ VHFFSFSDIR=$prefix/sbin)
+
+AC_SUBST(VHFFSFSDIR)
+
+# Needed for fuse
AC_DEFINE([_FILE_OFFSET_BITS], [64], [Required for fuse to works correctly])
AC_DEFINE([_REENTRANT], [1], [Reentrant program])