- more configure options

diff --git a/configure.in b/configure.in
index 84e13667de6f0795ba594959425f796e5aefdcd0..d53723262c8f5f3911bc240a0f5082ada86947d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,26 @@ AM_PROG_LIBTOOL
 
 AC_PREFIX_DEFAULT(/usr)
 
+AC_PATH_PROG([CHSNAPBIN], [chsnap], [/sbin/chsnap])
+AC_PATH_PROG([CPBIN], [cp], [/bin/cp])
+AC_PATH_PROG([TOUCHBIN], [touch], [/usr/bin/touch])
+AC_PATH_PROG([RMBIN], [rm], [/bin/rm])
+AC_PATH_PROG([DIFFBIN], [diff], [/usr/bin/diff])
+AC_PATH_PROG([CHATTRBIN], [chattr], [/usr/bin/chattr])
+AC_PATH_PROG([LVCREATEBIN], [lvcreate], [/sbin/lvcreate])
+AC_PATH_PROG([LVREMOVEBIN], [lvremove], [/sbin/lvremove])
+AC_PATH_PROG([LVSBIN], [lvs], [/sbin/lvs])
+
+AC_DEFINE_UNQUOTED([CHSNAPBIN], ["$CHSNAPBIN"], [Path of chsnap program.])
+AC_DEFINE_UNQUOTED([CPBIN], ["$CPBIN"], [Path of cp program.])
+AC_DEFINE_UNQUOTED([TOUCHBIN], ["$TOUCHBIN"], [Path of touch program.])
+AC_DEFINE_UNQUOTED([RMBIN], ["$RMBIN"], [Path of rm program.])
+AC_DEFINE_UNQUOTED([DIFFBIN], ["$DIFFBIN"], [Path of diff program.])
+AC_DEFINE_UNQUOTED([CHATTRBIN], ["$CHATTRBIN"], [Path of chattr program.])
+AC_DEFINE_UNQUOTED([LVCREATEBIN], ["$LVCREATEBIN"], [Path of lvcreate program.])
+AC_DEFINE_UNQUOTED([LVREMOVEBIN], ["$LVREMOVEBIN"], [Path of lvremove program.])
+AC_DEFINE_UNQUOTED([LVSBIN], ["$LVSBIN"], [Path of lvs program.])
+
 dnl Automake 1.11 enables silent compilation
 dnl Disable it by "configure --disable-silent-rules" or "make V=1"
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -33,6 +53,12 @@ CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra -Wformat=2 -Wnon-virtual-dtor -Wn
 
 fillupdir=/var/adm/fillup-templates
 
+AC_ARG_WITH([conf], AC_HELP_STRING([--with-conf], [Use a custom sysconfig directory (default is /etc/sysconfig)]),
+       [with_conf=$withval], [with_conf=no])
+
+AS_IF([test "x$with_conf" != xno], [CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${with_conf}\"'"],
+       [CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"/etc/sysconfig\"'"])
+
 AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
                [with_btrfs=$enableval],[with_btrfs=yes])
 

diff --git a/snapper/Ext4.cc b/snapper/Ext4.cc
index 6ed4262a3c38316ecf3e70af7389759201ae1c3b..4037d297f73b6dff2dd40cc0eb2f89d4392dc478 100644 (file)
--- a/snapper/Ext4.cc
+++ b/snapper/Ext4.cc
@@ -20,6 +20,8 @@
  */
 
 
+#include "config.h"
+
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>

diff --git a/snapper/Lvm.cc b/snapper/Lvm.cc
index 0182c4adbdce0462703813d58ac1483b9c40048b..9b32d44cca5db558ba56214537a61c58e55cf34e 100644 (file)
--- a/snapper/Lvm.cc
+++ b/snapper/Lvm.cc
@@ -20,6 +20,8 @@
  */
 
 
+#include "config.h"
+
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>

diff --git a/snapper/SnapperDefines.h b/snapper/SnapperDefines.h
index eb26eb5091a19e6d586fb1ea9585b7e34a443e84..240a6bd4e029490e61ae61033cd88448f96a806b 100644 (file)
--- a/snapper/SnapperDefines.h
+++ b/snapper/SnapperDefines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2004-2012] Novell, Inc.
+ * Copyright (c) [2004-2013] Novell, Inc.
  *
  * All Rights Reserved.
  *
@@ -24,24 +24,12 @@
 #define SNAPPER_SNAPPER_DEFINES_H
 
 
-#define SYSCONFIGFILE "/etc/sysconfig/snapper"
+#define SYSCONFIGFILE CONFDIR "/snapper"
 
 #define CONFIGSDIR "/etc/snapper/configs"
 #define CONFIGTEMPLATEDIR "/etc/snapper/config-templates"
 
 #define FILTERSDIR "/etc/snapper/filters"
 
-#define CHSNAPBIN "/sbin/chsnap"
-
-#define CPBIN "/bin/cp"
-#define TOUCHBIN "/usr/bin/touch"
-#define RMBIN "/bin/rm"
-#define DIFFBIN "/usr/bin/diff"
-#define CHATTRBIN "/usr/bin/chattr"
-
-#define LVCREATEBIN "/sbin/lvcreate"
-#define LVREMOVEBIN "/sbin/lvremove"
-#define LVSBIN "/sbin/lvs"
-
 
 #endif