onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 00:19:55 +02:00
Code Issues Releases Wiki Activity

hardcode path to rcs tools on windows in configure

Browse Source
This commit is contained in:
Vadim Kurland
2012-03-21 09:00:15 -07:00
parent 5ba2b54779
commit 60c5faf491
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.h.in
-6
View File
@@ -107,12 +107,6 @@ using namespace std;
#define PACKAGE_DATA_DIR "" #define PACKAGE_DATA_DIR ""
#define PACKAGE_SOURCE_DIR "" #define PACKAGE_SOURCE_DIR ""
#define RCS_FILE_NAME "rcs.exe"
#define RCSDIFF_FILE_NAME "rcsdiff.exe"
#define RLOG_FILE_NAME "rlog.exe"
#define CI_FILE_NAME "ci.exe"
#define CO_FILE_NAME "co.exe"
/* /*
* Normally this macro defines directory where system-wide QT * Normally this macro defines directory where system-wide QT
* translations are installed. We do not use it on win32 since * translations are installed. We do not use it on win32 since
configure.in
+19 -14
View File
@@ -201,20 +201,6 @@ AC_CHECK_FUNCS(stat _stat signal)
AC_STRUCT_TM AC_STRUCT_TM
AC_STRUCT_TIMEZONE AC_STRUCT_TIMEZONE
dnl do not insert spaces in these macros, even outside of []
AC_PATH_PROG(RCS_FILE_NAME,[rcs],[rcs],[$EXTENDED_PATH])
AC_PATH_PROG(RCSDIFF_FILE_NAME,[rcsdiff],[rcsdiff],[$EXTENDED_PATH])
AC_PATH_PROG(RLOG_FILE_NAME,[rlog],[rlog],[$EXTENDED_PATH])
AC_PATH_PROG(CI_FILE_NAME,[ci],[ci],[$EXTENDED_PATH])
AC_PATH_PROG(CO_FILE_NAME,[co],[co],[$EXTENDED_PATH])
AC_DEFINE_UNQUOTED(RCS_FILE_NAME, ["$RCS_FILE_NAME"], [rcs_file_name])
AC_DEFINE_UNQUOTED(RCSDIFF_FILE_NAME, ["$RCSDIFF_FILE_NAME"], [rcsdiff_file_name])
AC_DEFINE_UNQUOTED(RLOG_FILE_NAME, ["$RLOG_FILE_NAME"], [rlog_file_name])
AC_DEFINE_UNQUOTED(CI_FILE_NAME, ["$CI_FILE_NAME"], [ci_file_name])
AC_DEFINE_UNQUOTED(CO_FILE_NAME, ["$CO_FILE_NAME"], [co_file_name])
AC_SUBST(LIBS) AC_SUBST(LIBS)
AC_LANG([C++]) AC_LANG([C++])
@@ -472,6 +458,13 @@ fi
ICONSDIR="" ICONSDIR=""
dnl do not insert spaces in these macros, even outside of []
AC_PATH_PROG(RCS_FILE_NAME,[rcs],[rcs],[$EXTENDED_PATH])
AC_PATH_PROG(RCSDIFF_FILE_NAME,[rcsdiff],[rcsdiff],[$EXTENDED_PATH])
AC_PATH_PROG(RLOG_FILE_NAME,[rlog],[rlog],[$EXTENDED_PATH])
AC_PATH_PROG(CI_FILE_NAME,[ci],[ci],[$EXTENDED_PATH])
AC_PATH_PROG(CO_FILE_NAME,[co],[co],[$EXTENDED_PATH])
AC_MSG_CHECKING(what OS this is) AC_MSG_CHECKING(what OS this is)
case ${host} in case ${host} in
@@ -487,6 +480,11 @@ case ${host} in
OS_MINGW=1 OS_MINGW=1
AC_MSG_RESULT(Win32 mingw) AC_MSG_RESULT(Win32 mingw)
DEFAULT_RES_DIR="resources" DEFAULT_RES_DIR="resources"
RCS_FILE_NAME="rcs.exe"
RCSDIFF_FILE_NAME="rcsdiff.exe"
RLOG_FILE_NAME="rlog.exe"
CI_FILE_NAME="ci.exe"
CO_FILE_NAME="co.exe"
;; ;;
*-*-darwin*) *-*-darwin*)
@@ -579,6 +577,13 @@ fi
AC_DEFINE_UNQUOTED(RES_DIR, "$RES_DIR", [res_dir]) AC_DEFINE_UNQUOTED(RES_DIR, "$RES_DIR", [res_dir])
AC_SUBST(RES_DIR) AC_SUBST(RES_DIR)
AC_DEFINE_UNQUOTED(RCS_FILE_NAME, ["$RCS_FILE_NAME"], [rcs_file_name])
AC_DEFINE_UNQUOTED(RCSDIFF_FILE_NAME, ["$RCSDIFF_FILE_NAME"], [rcsdiff_file_name])
AC_DEFINE_UNQUOTED(RLOG_FILE_NAME, ["$RLOG_FILE_NAME"], [rlog_file_name])
AC_DEFINE_UNQUOTED(CI_FILE_NAME, ["$CI_FILE_NAME"], [ci_file_name])
AC_DEFINE_UNQUOTED(CO_FILE_NAME, ["$CO_FILE_NAME"], [co_file_name])
dnl prefix has bogus value while building RPM. Since program dnl prefix has bogus value while building RPM. Since program
dnl should incrorporate full path to the templates directory into dnl should incrorporate full path to the templates directory into
dnl the code via config.h file, we need to keep track of dnl the code via config.h file, we need to keep track of