mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

support for custom config path.

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@585 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
smorlat 2009-08-19 19:59:17 +00:00
parent 12500c3de5
commit b706831c3d
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone/configure.in
View file

@ -132,11 +132,11 @@ case "$host_cpu" in
;;
esac
AC_ARG_WITH( realprefix,
[ --with-realprefix Set the real installation prefix. This option has to be used for cross-compilation only. (ex:/usr or /usr/local)[default=none] ],
[ realprefix=${withval}],[ realprefix="none" ])
AC_ARG_WITH( configdir,
[ --with-configdir Set a APPDATA subdir where linphone is supposed to find its config (windows only) ],
[ configdir=${withval}],[ configdir="Linphone" ])
AC_DEFINE_UNQUOTED(LINPHONE_CONFIG_DIR,"$configdir",[Windows appdata subdir where linphonerc can be found])
AC_ARG_ENABLE(manual,
[ --disable-manual Do not attempt to build html linphone's user documentation],

11
linphone/gtk-glade/main.c
View file

@ -82,7 +82,14 @@ static GOptionEntry linphone_options[2]={
#define INSTALLED_XML_DIR PACKAGE_DATA_DIR "/linphone"
#define BUILD_TREE_XML_DIR "gtk-glade"
#ifndef WIN32
#define CONFIG_FILE ".linphonerc"
#else
#define CONFIG_FILE "linphonerc"
#endif
static char _config_file[1024];
@ -94,9 +101,9 @@ const char *linphone_gtk_get_config_file(){
#ifdef WIN32
const char *appdata=getenv("APPDATA");
if (appdata){
snprintf(_config_file,sizeof(_config_file),"%s\\%s",appdata,"Linphone\\");
snprintf(_config_file,sizeof(_config_file),"%s\\%s",appdata,LINPHONE_CONFIG_DIR);
CreateDirectory(_config_file,NULL);
snprintf(_config_file,sizeof(_config_file),"%s\\%s",appdata,"Linphone\\linphonerc");
snprintf(_config_file,sizeof(_config_file),"%s\\%s",appdata,LINPHONE_CONFIG_DIR "\\" CONFIG_FILE);
}
#else
const char *home=getenv("HOME");

2
linphone/scripts/builder-mingw.mk
View file

@ -27,7 +27,7 @@ $(LINPHONE_SRC_DIR)/configure:
$(LINPHONE_SRC_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure
cd $(LINPHONE_SRC_DIR) && \
./configure --prefix=$(prefix) --enable-shared --disable-static
./configure --prefix=$(prefix) --enable-shared --disable-static $(LINPHONE_CONFIGURE_EXTRA_OPTIONS)
build-linphone: $(LINPHONE_SRC_DIR)/Makefile
cd $(LINPHONE_SRC_DIR) && make && make install