svn commit: r124971 - /apr/apr/trunk/build/jlibtool.c

[jf...@apache.org]

Author: jfclere
Date: Wed Jan 12 07:59:27 2005
New Revision: 124971

URL: http://svn.apache.org/viewcvs?view=rev&rev=124971
Log:
Add support for the -R dir and -Rdir of libtool.

Modified:
   apr/apr/trunk/build/jlibtool.c

Modified: apr/apr/trunk/build/jlibtool.c
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/build/jlibtool.c?view=diff&rev=124971&p1=apr/apr/trunk/build/jlibtool.c&r1=124970&p2=apr/apr/trunk/build/jlibtool.c&r2=124971
==============================================================================
--- apr/apr/trunk/build/jlibtool.c	(original)
+++ apr/apr/trunk/build/jlibtool.c	Wed Jan 12 07:59:27 2005
@@ -251,6 +251,10 @@
     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 @@
     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 @@
             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;
@@ -1282,6 +1300,10 @@
                 } else if (strcmp(arg+1, "export-symbols-regex") == 0) {
                     /* 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;
                 }
             }