From: Christoph Egger <Christoph_Egger@gmx.de>
Date: Thu, 4 Aug 2005 12:13:53 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_mode_link) <cwrappersource>: Change
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ccbf87c4fb70658215ab91e1ecaa2a5eca75414;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (func_mode_link) <cwrappersource>: Change
basename() to base_name() and have it return a pointer to const,
fix compilation warnings.
---

diff --git a/ChangeLog b/ChangeLog
index 3e732b80c..b808cbbbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-04  Christoph Egger  <Christoph_Egger@gmx.de>
+
+	* config/ltmain.m4sh (func_mode_link) <cwrappersource>: Change
+	basename() to base_name() and have it return a pointer to const,
+	fix compilation warnings.
+
 2005-07-30  Peter Ekberg  <peda@lysator.liu.se>
 
 	* m4/libtool.m4 (_LT_PROG_F77): Set it up so that saying F77=no
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index dcb9a6b51..a0166b8c9 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -5752,7 +5752,7 @@ const char *program_name = NULL;
 
 void * xmalloc (size_t num);
 char * xstrdup (const char *string);
-char * basename (const char *name);
+const char * base_name (const char *name);
 char * find_executable(const char *wrapper);
 int    check_executable(const char *path);
 char * strendzap(char *str, const char *pat);
@@ -5764,14 +5764,14 @@ main (int argc, char *argv[[]])
   char **newargz;
   int i;
 
-  program_name = (char *) xstrdup ((char *) basename (argv[[0]]));
+  program_name = (char *) xstrdup (base_name (argv[[0]]));
   DEBUG("(main) argv[[0]]      : %s\n",argv[[0]]);
   DEBUG("(main) program_name : %s\n",program_name);
   newargz = XMALLOC(char *, argc+2);
 EOF
 
 	    cat >> $cwrappersource <<EOF
-  newargz[[0]] = "$SHELL";
+  newargz[[0]] = (char *) xstrdup("$SHELL");
 EOF
 
 	    cat >> $cwrappersource <<"EOF"
@@ -5828,8 +5828,8 @@ xstrdup (const char *string)
 ;
 }
 
-char *
-basename (const char *name)
+const char *
+base_name (const char *name)
 {
   const char *base;