svn commit: r903411 - in /commons/sandbox/runtime/trunk/src/main/native: Makefile.msc.in configure support/win32/suexec.c support/win32/wsuexec.c

[mturk]

Author: mturk
Date: Tue Jan 26 20:55:07 2010
New Revision: 903411

URL: http://svn.apache.org/viewvc?rev=903411&view=rev
Log:
Remove w prefix from suexec

Added:
    commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.c
      - copied unchanged from r903406, 
commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c
Removed:
    commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c
Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
    commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=903411&r1=903410&r2=903411&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Tue Jan 26 
20:55:07 2010
@@ -70,7 +70,7 @@
 SQLMODLIB=$(SQLNAME)$(SO)
 EXPORTS=/EXPORT:SubprocMainW
 TESTSUITE=testsuite$(EXE)
-WINSUEXEC=wsuexec$(EXE)
+SUEXECBIN=suexec$(EXE)
 
 COMMON_OBJS=\
        $(SRCDIR)/shared/buildmark.$(OBJ) \
@@ -252,7 +252,7 @@
        $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES) 
-c -Fo$@ -Fd$(LIBNAME)-src $<
 
 {$(SRCDIR)\support\win32}.c{$(SRCDIR)\support\win32}.$(OBJ):
-       $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ 
-Fdwtools-src $<
+       $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ 
-Fdsupport-src $<
 
 {$(SRCDIR)\test}.c{$(SRCDIR)\test}.$(OBJ):
        $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES) 
-c -Fo$@ -Fd$(LIBNAME)-src $<
@@ -291,10 +291,10 @@
        IF EXIST $(SQLMODLIB).manifest \
                mt -nologo -manifest $...@.manifest -outputresource:$@;2
 
-$(WINSUEXEC):  $(SRCDIR)/support/win32/wsuexec.$(OBJ)
+$(SUEXECBIN):  $(SRCDIR)/support/win32/suexec.$(OBJ)
        $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime 
suEXEC\"" /d STR_INTNAME="\"suEXEC\"" /i "$(SRCDIR)\support\win32" /i 
"$(SRCDIR)\os\win32" /i "$(SRCDIR)\include" /fo $...@.res 
$(SRCDIR)/support/win32/support.rc
-       $(LINK) $(SHFLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) /pdb:wsuexec.pdb 
/out:$@ @<<
-       $(SRCDIR)/support/win32/wsuexec.$(OBJ) $...@.res
+       $(LINK) $(SHFLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) /pdb:suexec.pdb 
/out:$@ @<<
+       $(SRCDIR)/support/win32/suexec.$(OBJ) $...@.res
 <<
        IF EXIST $...@.manifest \
                mt -nologo -manifest $...@.manifest -outputresource:$@;1
@@ -336,4 +336,5 @@
 install: all
        @if not exist "$(DESTDIR)\include\$(NULL)" mkdir "$(DESTDIR)\include"
        @if not exist "$(DESTDIR)\$(LIBDIR)\$(NULL)" mkdir 
"$(DESTDIR)\$(LIBDIR)"
+       @if not exist "$(DESTDIR)\$(BINDIR)\$(NULL)" mkdir 
"$(DESTDIR)\$(BINDIR)"
 

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=903411&r1=903410&r2=903411&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Tue Jan 26 20:55:07 
2010
@@ -1137,8 +1137,8 @@
     sqliteobjs=""
 fi
 
-if [ ".$has_sqlite" = .yes ]; then
-    varadds modules '??(WINSUEXEC)'
+if [ ".$has_suexec" = .yes ]; then
+    varadds modules '??(SUEXECBIN)'
 fi
 
 if [ ".$cc" = .gcc ]; then