You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by je...@apache.org on 2006/07/14 20:19:52 UTC

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

Author: jerenkrantz
Date: Fri Jul 14 11:19:52 2006
New Revision: 421977

URL: http://svn.apache.org/viewvc?rev=421977&view=rev
Log:
Teach jlibtool how to deal with .exe's on MinGW.

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

Modified: apr/apr/trunk/build/jlibtool.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/jlibtool.c?rev=421977&r1=421976&r2=421977&view=diff
==============================================================================
--- apr/apr/trunk/build/jlibtool.c (original)
+++ apr/apr/trunk/build/jlibtool.c Fri Jul 14 11:19:52 2006
@@ -160,6 +160,7 @@
 #  define SHARED_OPTS "-shared"
 #  define MODULE_OPTS "-shared"
 #  define MKDIR_NO_UMASK
+#  define EXE_EXT ".exe"
 #endif
 
 #ifndef SHELL_CMD
@@ -1230,7 +1231,11 @@
         }
     }
 
+#ifdef EXE_EXT
+    if (!ext || strcmp(ext, EXE_EXT) == 0) {
+#else
     if (!ext) {
+#endif
         cmd_data->basename = arg;
         cmd_data->output = otProgram;
 #if defined(_OSD_POSIX)
@@ -1239,7 +1244,9 @@
         newarg = (char *)malloc(strlen(arg) + 5);
         strcpy(newarg, arg);
 #ifdef EXE_EXT
+	if (!ext) {
         strcat(newarg, EXE_EXT);
+	}
 #endif
         cmd_data->output_name = newarg;
         return 1;