From b706831c3d71e8251fc061c89c6e98ea316ab35f Mon Sep 17 00:00:00 2001 From: smorlat Date: Wed, 19 Aug 2009 19:59:17 +0000 Subject: [PATCH] support for custom config path. git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@585 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/configure.in | 8 ++++---- linphone/gtk-glade/main.c | 11 +++++++++-- linphone/scripts/builder-mingw.mk | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/linphone/configure.in b/linphone/configure.in index d091255ca..cd360bbce 100644 --- a/linphone/configure.in +++ b/linphone/configure.in @@ -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], diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c index 5198eca49..8a13b79e0 100644 --- a/linphone/gtk-glade/main.c +++ b/linphone/gtk-glade/main.c @@ -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"); diff --git a/linphone/scripts/builder-mingw.mk b/linphone/scripts/builder-mingw.mk index 78c8804dc..1108e4bc8 100644 --- a/linphone/scripts/builder-mingw.mk +++ b/linphone/scripts/builder-mingw.mk @@ -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