[vhffs-dev] [1318] Fixed path of locales, various autoconf/automake paths

[subversion@xxxxxxxxxxxxx]

Revision: 1318
Author:   gradator
Date:     2008-12-17 22:34:22 +0100 (Wed, 17 Dec 2008)

Log Message:
-----------
Fixed path of locales, various autoconf/automake paths

Modified Paths:
--------------
    trunk/configure.ac
    trunk/vhffs-fs/configure.ac

Property Changed:
----------------
    trunk/bootstrap.sh


Property changes on: trunk/bootstrap.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-12-13 14:11:05 UTC (rev 1317)
+++ trunk/configure.ac	2008-12-17 21:34:22 UTC (rev 1318)
@@ -6,10 +6,10 @@
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_SED
-AC_PREFIX_DEFAULT([/])
+AC_PREFIX_DEFAULT([/usr])
 
 # Ugly but will remain until we do some cleanup in directories handling
-test "x$prefix" = "xNONE" && prefix=
+test "x$prefix" = "xNONE" && prefix="/usr"
 
 AC_PATH_PROG([PERL], [perl], [not found])
 if test "$PERL" = 'not found'; then
@@ -29,7 +29,11 @@
 	AC_HELP_STRING([--with-conf-path=path],
 		[Complete path for configuration files (/etc/vhffs)]),
 	CONFDIR=$withval,
-	CONFDIR=${prefix}/etc/vhffs
+	if test "x$prefix" = "x/usr"; then
+		CONFDIR=/etc/vhffs
+	else
+		CONFDIR=${prefix}/etc/vhffs
+	fi
 )
 AC_SUBST(CONFDIR)
 
@@ -37,7 +41,7 @@
 	AC_HELP_STRING([--with-shell-path=path],
 		[Complete path for tux shell and falseshell(/bin)]),
 	SHELLDIR=$withval,
-	SHELLDIR=${prefix}/usr/bin
+	SHELLDIR=${prefix}/bin
 )
 AC_SUBST(SHELLDIR)
 
@@ -46,7 +50,7 @@
 	AC_HELP_STRING([--with-tools-path=path],
 		[Complete path for tools (executables) (/usr/local/bin)]),
 	TOOLSDIR=$withval,
-	TOOLSDIR=${prefix}/usr/local/bin
+	TOOLSDIR=${prefix}/bin
 )
 AC_SUBST(TOOLSDIR)
 
@@ -55,7 +59,7 @@
 	AC_HELP_STRING([--with-doc-path=path],
 		[Complete path for documentation files (/usr/share/doc/vhffs)]),
 	DOCDIR=$withval,
-	DOCDIR=${prefix}/usr/share/doc/vhffs
+	DOCDIR=${prefix}/share/doc/vhffs
 )
 AC_SUBST(DOCDIR)
 
@@ -64,7 +68,7 @@
     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
+    VHFFS_LIBDIR=${prefix}/share/vhffs/api
 )
 APIDIR=$VHFFS_LIBDIR/Vhffs
 AC_SUBST(APIDIR)
@@ -75,7 +79,7 @@
 	AC_HELP_STRING([--with-panel-path=path],
 		[Complete path for panel interface (/usr/share/vhffs/panel)]),
 	PANELDIR=$withval,
-	PANELDIR=${prefix}/usr/share/vhffs/panel
+	PANELDIR=${prefix}/share/vhffs/panel
 )
 AC_SUBST(PANELDIR)
 
@@ -84,7 +88,7 @@
 	AC_HELP_STRING([--with-public-path=path],
 		[Complete path for public interface (/usr/share/vhffs/public)]),
 	PUBLICDIR=$withval,
-	PUBLICDIR=${prefix}/usr/share/vhffs/public
+	PUBLICDIR=${prefix}/share/vhffs/public
 )
 AC_SUBST(PUBLICDIR)
 
@@ -93,7 +97,7 @@
 	AC_HELP_STRING([--with-template-path=path],
 		[Complete path for web templates (/usr/share/vhffs/templates)]),
 	TEMPLATESDIR=$withval,
-	TEMPLATESDIR=${prefix}/usr/share/vhffs/templates
+	TEMPLATESDIR=${prefix}/share/vhffs/templates
 )
 AC_SUBST(TEMPLATESDIR)
 
@@ -101,7 +105,7 @@
 	AC_HELP_STRING([--with-backend-path=path],
 		[Complete path for backend (/usr/share/vhffs/backend)]),
 	BACKENDDIR=$withval,
-	BACKENDDIR=${prefix}/usr/share/vhffs/backend
+	BACKENDDIR=${prefix}/share/vhffs/backend
 )
 AC_SUBST(BACKENDDIR)
 
@@ -110,7 +114,7 @@
 	AC_HELP_STRING([--with-robot-path=path],
 		[Complete path for robots file (/usr/lib/vhffs/bots)]),
 	BOTSDIR=$withval,
-	BOTSDIR=${prefix}/usr/lib/vhffs/bots
+	BOTSDIR=${prefix}/lib/vhffs/bots
 )
 AC_SUBST(BOTSDIR)
 
@@ -119,7 +123,7 @@
 	AC_HELP_STRING([--with-jabber-path=path],
 		[Complete path for jabber pipe (/usr/share/vhffs/jabber)]),
 	JABBERDIR=$withval,
-	JABBERDIR=${prefix}/usr/share/vhffs/jabber
+	JABBERDIR=${prefix}/share/vhffs/jabber
 )
 AC_SUBST(JABBERDIR)
 
@@ -128,7 +132,7 @@
 	AC_HELP_STRING([--with-listengine-path=path],
 		[Complete path for listengine bouncer (/usr/lib/vhffs/listengine)]),
 	LEDIR=$withval,
-	LEDIR=${prefix}/usr/lib/vhffs/listengine
+	LEDIR=${prefix}/lib/vhffs/listengine
 )
 AC_SUBST(LEDIR)
 
@@ -137,7 +141,7 @@
 	AC_HELP_STRING([--with-doc-path=path],
 		[Complete path for documentation files (/usr/share/doc/vhffs)]),
 	DOCSDIR=$withval,
-	DOCSDIR=${prefix}/usr/share/doc/vhffs
+	DOCSDIR=${prefix}/share/doc/vhffs
 )
 AC_SUBST(DOCSDIR)
 
@@ -147,7 +151,7 @@
     AC_HELP_STRING([--with-compat-path=path],
         [Complete path for compatibility scripts (/usr/share/doc/vhffs/compat)]),
     COMPATDIR=$withval,
-    COMPATDIR=${prefix}/usr/share/doc/vhffs/compat
+    COMPATDIR=${prefix}/share/doc/vhffs/compat
 )
 AC_SUBST(COMPATDIR)
 

Modified: trunk/vhffs-fs/configure.ac
===================================================================
--- trunk/vhffs-fs/configure.ac	2008-12-13 14:11:05 UTC (rev 1317)
+++ trunk/vhffs-fs/configure.ac	2008-12-17 21:34:22 UTC (rev 1318)
@@ -10,7 +10,7 @@
 AM_INIT_AUTOMAKE
 PKG_PROG_PKG_CONFIG
 
-test "x$prefix" = "xNONE" && prefix=
+test "x$prefix" = "xNONE" && prefix=/usr
 
 # Checks for programs.
 AC_PROG_CC
@@ -110,7 +110,11 @@
     AC_HELP_STRING([--with-conf-path=path],
         [Complete path for configuration files (/etc/vhffs)]),
     CONFDIR=$withval,
-    CONFDIR=$prefix/etc/vhffs
+	if test "x$prefix" = "x/usr"; then
+		CONFDIR=/etc/vhffs
+	else
+		CONFDIR=$prefix/etc/vhffs
+	fi
 )
 AC_SUBST(CONFDIR)
 
@@ -131,7 +135,7 @@
 AC_HEADER_TIME
 AC_CHECK_HEADERS([sys/xattr.h])
 AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS(fuse.h,,, [#define _FILE_OFFSET_BITS 64])
+AC_CHECK_HEADERS([fuse.h],,[AC_MSG_ERROR([Cannot find fuse headers])], [#define _FILE_OFFSET_BITS 64])
 AC_CHECK_HEADERS([fcntl.h inttypes.h postgresql/libpq-fe.h pthread.h signal.h stdint.h stdio.h unistd.h], 
     [], [AC_MSG_ERROR([Missing headers, bailing out])])
 if test "$enable_cache_query" = yes || test "$enable_checkquota_cache" = yes ; then