diff options
author | jfclere <jfclere@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-12 15:59:27 +0000 |
---|---|---|
committer | jfclere <jfclere@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-12 15:59:27 +0000 |
commit | 5357cebed2eb935a9fd54400b4f9e740ca461a75 (patch) | |
tree | 1479d2403c8e97473eceeaf2d719c045f2b2024d | |
parent | df34a3f788ef205c7a8d78b7ac2aa734f0dab744 (diff) | |
download | libapr-5357cebed2eb935a9fd54400b4f9e740ca461a75.tar.gz |
Add support for the -R dir and -Rdir of libtool.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@124971 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | build/jlibtool.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/build/jlibtool.c b/build/jlibtool.c index c2bb89163..39520aad0 100644 --- a/build/jlibtool.c +++ b/build/jlibtool.c @@ -251,6 +251,10 @@ typedef struct { const char *version_info; } command_t; +#ifdef RPATH +void add_rpath(count_chars *cc, const char *path); +#endif + #if defined(NEED_SNPRINTF) /* Write at most n characters to the buffer in str, return the * number of chars written or -1 if the buffer would have been @@ -455,6 +459,16 @@ void print_config() printf("SHELL=\"%s\"\n", SHELL_CMD); #endif } +/* + * Add a directory to the runtime library search path. + */ +void add_runtimedirlib(char *arg, command_t *cmd_data) +{ +#ifdef RPATH + add_rpath(cmd_data->shared_opts.dependencies, arg); +#else +#endif +} int parse_long_opt(char *arg, command_t *cmd_data) { @@ -555,6 +569,10 @@ int parse_short_opt(char *arg, command_t *cmd_data) arg--; push_count_chars(cmd_data->shared_opts.dependencies, arg); return 1; + } else if (arg[0] == 'R' && arg[1]) { + /* -Rdir Add dir to runtime library search path. */ + add_runtimedirlib(&arg[1], cmd_data); + return 1; } } return 0; @@ -1283,6 +1301,10 @@ void parse_args(int argc, char *argv[], command_t *cmd_data) /* Skip the argument. */ ++a; argused = 1; + } else if (arg[1] == 'R' && !arg[2]) { + /* -R dir Add dir to runtime library search path. */ + add_runtimedirlib(argv[++a], cmd_data); + argused = 1; } } } else { |