diff -Nru apr-1.5.2/apr.dsp apr-1.6.5/apr.dsp --- apr-1.5.2/apr.dsp 2014-09-22 02:12:38.000000000 +0000 +++ apr-1.6.5/apr.dsp 2016-12-03 20:49:29.000000000 +0000 @@ -19,8 +19,6 @@ !MESSAGE !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -79,53 +77,6 @@ # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"LibD\apr-1.lib" -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "9x\LibR" -# PROP BASE Intermediate_Dir "9x\LibR" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "9x\LibR" -# PROP Intermediate_Dir "9x\LibR" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"9x\LibR\apr-1.lib" - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "9x\LibD" -# PROP BASE Intermediate_Dir "9x\LibD" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "9x\LibD" -# PROP Intermediate_Dir "9x\LibD" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"9x\LibD\apr-1.lib" - !ELSEIF "$(CFG)" == "apr - x64 Release" # PROP BASE Use_MFC 0 @@ -179,8 +130,6 @@ # Name "apr - Win32 Release" # Name "apr - Win32 Debug" -# Name "apr - Win32 Release9x" -# Name "apr - Win32 Debug9x" # Name "apr - x64 Release" # Name "apr - x64 Debug" # Begin Group "Source Files" @@ -439,6 +388,10 @@ SOURCE=.\poll\unix\select.c # End Source File +# Begin Source File + +SOURCE=.\poll\unix\wakeup.c +# End Source File # End Group # Begin Group "random" @@ -642,26 +595,6 @@ # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - !ELSEIF "$(CFG)" == "apr - x64 Release" # Begin Custom Build - Creating apr.h from apr.hw @@ -708,76 +641,48 @@ # Begin Source File SOURCE=.\include\apr_escape.h -# End Source File -# Begin Source File - -SOURCE=.\include\apr_escape.h - -!IF "$(CFG)" == "apr - Win32 Release" -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibR\gen_test_char /Fe.\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - Win32 Debug" - -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibD\gen_test_char /Fe.\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" +!IF "$(CFG)" == "libapr - Win32 Release" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibR\gen_test_char /Fe.\9x\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\9x\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Release\gen_test_char /Fe.\Release\gen_test_char.exe .\tools\gen_test_char.c + .\Release\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" +!ELSEIF "$(CFG)" == "libapr - Win32 Debug" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h -InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibD\gen_test_char /Fe.\9x\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\9x\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Debug\gen_test_char /Fe.\Debug\gen_test_char.exe .\tools\gen_test_char.c + .\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - x64 Release" +!ELSEIF "$(CFG)" == "libapr - x64 Release" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h -InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibR\gen_test_char /Fe.\x64\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\x64\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Release\gen_test_char /Fe.\x64\Release\gen_test_char.exe .\tools\gen_test_char.c + .\x64\Release\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - x64 Debug" +!ELSEIF "$(CFG)" == "libapr - x64 Debug" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibD\gen_test_char /Fe.\x64\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\x64\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char.exe .\tools\gen_test_char.c + .\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build diff -Nru apr-1.5.2/apr.mak apr-1.6.5/apr.mak --- apr-1.5.2/apr.mak 2013-11-06 05:15:39.000000000 +0000 +++ apr-1.6.5/apr.mak 2016-12-06 21:38:30.000000000 +0000 @@ -4,7 +4,7 @@ !MESSAGE No configuration specified. Defaulting to apr - Win32 Release. !ENDIF -!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - Win32 Release9x" && "$(CFG)" != "apr - Win32 Debug9x" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug" +!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,8 +15,6 @@ !MESSAGE !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -45,6 +43,7 @@ -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -115,6 +114,7 @@ -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" -@erase ".\include\apr_gen_test_char.h" @@ -215,12 +215,14 @@ "$(INTDIR)\poll.obj" \ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\select.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -259,6 +261,7 @@ -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -329,6 +332,7 @@ -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" -@erase ".\include\apr_gen_test_char.h" @@ -430,439 +434,13 @@ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ "$(INTDIR)\select.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_skiplist.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -OUTDIR=.\9x\LibR -INTDIR=.\9x\LibR -# Begin Custom Macros -OutDir=.\9x\LibR -# End Custom Macros - -ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_escape.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_skiplist.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\apr_escape.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_skiplist.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -OUTDIR=.\9x\LibD -INTDIR=.\9x\LibD -# Begin Custom Macros -OutDir=.\9x\LibD -# End Custom Macros - -ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibD\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_escape.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_skiplist.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\apr_escape.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -901,6 +479,7 @@ -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -971,6 +550,7 @@ -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" -@erase ".\include\apr_gen_test_char.h" @@ -1072,11 +652,13 @@ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ "$(INTDIR)\select.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -1115,6 +697,7 @@ -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -1185,6 +768,7 @@ -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" -@erase ".\include\apr_gen_test_char.h" @@ -1286,11 +870,13 @@ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ "$(INTDIR)\select.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -1325,7 +911,7 @@ !ENDIF -!IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug" || "$(CFG)" == "apr - Win32 Release9x" || "$(CFG)" == "apr - Win32 Debug9x" || "$(CFG)" == "apr - x64 Release" || "$(CFG)" == "apr - x64 Debug" +!IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug" || "$(CFG)" == "apr - x64 Release" || "$(CFG)" == "apr - x64 Debug" SOURCE=.\atomic\win32\apr_atomic.c "$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" @@ -1633,6 +1219,11 @@ $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=.\poll\unix\wakeup.c + +"$(INTDIR)\wakeup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" + $(CPP) $(CPP_PROJ) $(SOURCE) + SOURCE=.\random\unix\apr_random.c "$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" @@ -1662,6 +1253,11 @@ "$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=.\strings\apr_cstr.c + +"$(INTDIR)\apr_cstr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_cstr.h" + $(CPP) $(CPP_PROJ) $(SOURCE) + SOURCE=.\strings\apr_fnmatch.c @@ -1783,28 +1379,6 @@ << -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - !ELSEIF "$(CFG)" == "apr - x64 Release" InputPath=.\include\apr.hw @@ -1855,30 +1429,6 @@ << -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_escape_test_char.h -<< - - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_escape_test_char.h -<< - - !ELSEIF "$(CFG)" == "apr - x64 Release" InputPath=.\include\apr_escape.h @@ -1922,28 +1472,6 @@ InputPath=.\include\apr_want.h -"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -InputPath=.\include\apr_want.h - -"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -InputPath=.\include\apr_want.h - "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_SYS_UN_H +#include +#endif +],[ +struct sockaddr_un sa; +],[ + ac_cv_define_sockaddr_un=yes +],[ + ac_cv_define_sockaddr_un=no +]) +]) + +if test "$ac_cv_define_sockaddr_un" = "yes"; then + have_sockaddr_un=1 +else + have_sockaddr_un=0 +fi +AC_SUBST(have_sockaddr_un) +]) + dnl dnl APR_H_ERRNO_COMPILE_CHECK dnl diff -Nru apr-1.5.2/build/buildcheck.sh apr-1.6.5/build/buildcheck.sh --- apr-1.5.2/build/buildcheck.sh 2009-11-13 00:27:16.000000000 +0000 +++ apr-1.6.5/build/buildcheck.sh 2017-06-09 12:54:37.000000000 +0000 @@ -1,35 +1,37 @@ #! /bin/sh echo "buildconf: checking installation..." +res=0 # any python python=`build/PrintPath python` if test -z "$python"; then -echo "buildconf: python not found." -echo " You need python installed" -echo " to build APR from SVN." -exit 1 + echo "buildconf: python not found." + echo " You need python installed" + echo " to build APR from SVN." + res=1 else -py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'` -echo "buildconf: python version $py_version (ok)" + py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'` + echo "buildconf: python version $py_version (ok)" fi # autoconf 2.59 or newer ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'` if test -z "$ac_version"; then -echo "buildconf: autoconf not found." -echo " You need autoconf version 2.59 or newer installed" -echo " to build APR from SVN." -exit 1 -fi -IFS=.; set $ac_version; IFS=' ' -if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then -echo "buildconf: autoconf version $ac_version found." -echo " You need autoconf version 2.59 or newer installed" -echo " to build APR from SVN." -exit 1 + echo "buildconf: autoconf not found." + echo " You need autoconf version 2.59 or newer installed" + echo " to build APR from SVN." + res=1 else -echo "buildconf: autoconf version $ac_version (ok)" + IFS=.; set $ac_version; IFS=' ' + if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then + echo "buildconf: autoconf version $ac_version found." + echo " You need autoconf version 2.59 or newer installed" + echo " to build APR from SVN." + res=1 + else + echo "buildconf: autoconf version $ac_version (ok)" + fi fi # Sample libtool --version outputs: @@ -41,26 +43,28 @@ libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then -echo "buildconf: libtool not found." -echo " You need libtool version 1.4 or newer installed" -echo " to build APR from SVN." -exit 1 -fi -lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -IFS=.; set $lt_version; IFS=' ' -lt_status="good" -if test "$1" = "1"; then - if test "$2" -lt "4"; then + echo "buildconf: libtool not found." + echo " You need libtool version 1.4 or newer installed" + echo " to build APR from SVN." + res=1 +else + lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` + IFS=.; set $lt_version; IFS=' ' + lt_status="good" + if test "$1" = "1"; then + if test "$2" -lt "4"; then lt_status="bad" - fi -fi -if test $lt_status = "good"; then - echo "buildconf: libtool version $lt_pversion (ok)" - exit 0 + fi + fi + if test $lt_status = "good"; then + echo "buildconf: libtool version $lt_pversion (ok)" + else + echo "buildconf: libtool version $lt_pversion found." + echo " You need libtool version 1.4 or newer installed" + echo " to build APR from SVN." + res=1 + fi fi -echo "buildconf: libtool version $lt_pversion found." -echo " You need libtool version 1.4 or newer installed" -echo " to build APR from SVN." +exit $res -exit 1 diff -Nru apr-1.5.2/build/config.guess apr-1.6.5/build/config.guess --- apr-1.5.2/build/config.guess 2014-09-21 11:10:36.000000000 +0000 +++ apr-1.6.5/build/config.guess 2018-01-04 19:51:10.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2018-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,19 +168,29 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -197,6 +207,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +224,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +240,13 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; + *:MidnightBSD:*:*) + echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +259,15 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; + *:Redox:*:*) + echo ${UNAME_MACHINE}-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,55 +284,46 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; @@ -359,16 +383,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -393,7 +417,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -461,13 +485,13 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); @@ -579,8 +603,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -589,7 +614,7 @@ *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and @@ -610,20 +635,20 @@ 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -662,11 +687,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -679,12 +704,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -724,7 +749,7 @@ { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -733,7 +758,7 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -789,14 +814,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -812,10 +837,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -829,10 +855,6 @@ *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; @@ -848,27 +870,12 @@ echo ia64-unknown-interix${UNAME_RELEASE} exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -878,7 +885,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -901,7 +908,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -932,6 +939,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +954,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -969,6 +982,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1001,6 +1017,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1020,7 +1039,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1059,7 +1078,7 @@ i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + i*86:*:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} @@ -1099,7 +1118,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1248,6 +1267,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1261,16 +1283,23 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1285,7 +1314,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1294,15 +1323,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1316,7 +1348,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1358,7 +1390,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1369,23 +1401,37 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; +esac + +echo "$0: unable to guess system type" >&2 + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp @@ -1413,7 +1459,7 @@ exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru apr-1.5.2/build/config.sub apr-1.6.5/build/config.sub --- apr-1.5.2/build/config.sub 2014-09-21 11:10:36.000000000 +0000 +++ apr-1.6.5/build/config.sub 2018-01-04 19:51:10.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2014-09-11' +timestamp='2018-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,12 +53,11 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -230,9 +229,6 @@ -ptx*) basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; -psos*) os=-psos ;; @@ -255,15 +251,16 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -301,11 +298,12 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -313,7 +311,8 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ + | visium \ + | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -327,6 +326,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -372,17 +374,18 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -423,13 +426,15 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -437,6 +442,8 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -513,6 +520,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -629,10 +639,18 @@ basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -774,6 +792,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -880,7 +901,7 @@ basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -925,6 +946,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1009,7 +1033,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1019,7 +1043,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1220,6 +1244,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1228,6 +1255,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1335,8 +1365,8 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1356,27 +1386,27 @@ -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1385,7 +1415,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1460,7 +1491,7 @@ -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1515,8 +1546,23 @@ -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1612,6 +1658,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; @@ -1657,7 +1706,7 @@ m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1792,7 +1841,7 @@ exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru apr-1.5.2/build/cvtdsp.pl apr-1.6.5/build/cvtdsp.pl --- apr-1.5.2/build/cvtdsp.pl 2007-08-17 20:56:39.000000000 +0000 +++ apr-1.6.5/build/cvtdsp.pl 2017-04-26 14:52:51.000000000 +0000 @@ -34,6 +34,12 @@ $name = "apr"; onemake(); } +elsif ($ARGV[0] eq '-ossl11') { + find(\&toossl1, '.'); +} +elsif ($ARGV[0] eq '-apr16') { + find(\&toapr16, '.'); +} else { print "Specify -5 or -6 for Visual Studio 5 or 6 (98) .dsp format\n"; print "Specify -w3 or -w4 for .dsp build with warning level 3 or 4 (strict)\n\n"; @@ -223,7 +229,75 @@ } } -sub tow3 { +sub toossl1 { + + if (m|\.dsp$| || m|\.dsw$|) { + $oname = $_; + $tname = '.#' . $_; + $verchg = 0; + $srcfl = new IO::File $_, "r" || die; + $dstfl = new IO::File $tname, "w" || die; + while ($src = <$srcfl>) { + if ($src =~ s|inc32\"|include\" /I \"../../srclib/openssl/ms\"|) { + $verchg = -1; + } + if ($src =~ s|libeay32|libcrypto|) { + $verchg = -1; + } + if ($src =~ s|ssleay32|libssl|) { + $verchg = -1; + } + if ($src =~ s|(\\\|/)?out32dll||) { + $verchg = -1; + } + # we must have apr-1.6+ to build with OpenSSL 1.1.0 + # deal with the moving of xml.mak + if ($src =~ s|xml\\expat\\lib\\xml|xml\\xml|) { + $verchg = -1; + } + print $dstfl $src; + } + undef $srcfl; + undef $dstfl; + if ($verchg) { + unlink $oname || die; + rename $tname, $oname || die; + print "Converted project " . $oname . " to OpenSSL 1.1.0 in " . $File::Find::dir . "\n"; + } + else { + unlink $tname; + } + } +} + +sub toapr16 { + + if (m|\.dsw$|) { + $oname = $_; + $tname = '.#' . $_; + $verchg = 0; + $srcfl = new IO::File $_, "r" || die; + $dstfl = new IO::File $tname, "w" || die; + while ($src = <$srcfl>) { + if ($src =~ s|xml\\expat\\lib\\xml|xml\\xml|) { + $verchg = -1; + } + print $dstfl $src; + } + undef $srcfl; + undef $dstfl; + if ($verchg) { + unlink $oname || die; + rename $tname, $oname || die; + print "Converted project " . $oname . " to OpenSSL 1.1.0 in " . $File::Find::dir . "\n"; + } + else { + unlink $tname; + } + } +} + +sub tow3 { if (m|\.dsp$| || m|\.mak$|) { $oname = $_; diff -Nru apr-1.5.2/build/fixwin32mak.pl apr-1.6.5/build/fixwin32mak.pl --- apr-1.5.2/build/fixwin32mak.pl 2013-10-03 10:53:42.000000000 +0000 +++ apr-1.6.5/build/fixwin32mak.pl 2017-09-27 14:51:50.000000000 +0000 @@ -140,7 +140,7 @@ $dstfl = new IO::File $tname, "w" || die; while ($src = <$srcfl>) { if (($src =~ m/^\t"(\.\.\\)+(apr|apr-util|apr-iconv)\\.*"\\/) || - ($src =~ m/^\t{\$\(INCLUDE\)}".*"\\/)) { + ($src =~ m/^\t\{\$\(INCLUDE\)\}".*"\\/)) { $verchg = -1; } else { diff -Nru apr-1.5.2/build/libtool.m4 apr-1.6.5/build/libtool.m4 --- apr-1.5.2/build/libtool.m4 2015-04-25 12:04:17.000000000 +0000 +++ apr-1.6.5/build/libtool.m4 2018-09-10 21:14:52.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(apr_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,31 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,9 +1386,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1417,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1363,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1383,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1392,7 +1468,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1408,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1427,11 +1503,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1439,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1470,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1506,7 +1582,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1533,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1555,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1574,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1598,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1638,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1688,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1719,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1747,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1794,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1822,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1843,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1853,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1899,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1923,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1933,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2027,8 +2112,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2038,8 +2123,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2066,8 +2151,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2079,15 +2164,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2101,12 +2186,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2130,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2148,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2158,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2184,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2219,7 +2353,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2228,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2245,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2260,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2304,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2323,8 +2510,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2336,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2345,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2362,17 +2549,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2381,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2409,7 +2596,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2422,8 +2609,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2436,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2449,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2463,8 +2650,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2482,12 +2669,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2512,26 +2700,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2549,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2564,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2574,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2588,8 +2766,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2600,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2608,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2628,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2638,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2669,10 +2867,18 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2689,12 +2895,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2704,7 +2910,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2713,58 +2919,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2775,8 +2991,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2786,11 +3002,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2798,8 +3014,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2820,24 +3036,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2855,7 +3071,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2863,8 +3079,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2873,20 +3089,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2919,39 +3145,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2974,11 +3202,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -2996,7 +3224,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3023,16 +3251,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3046,7 +3274,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3057,37 +3285,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3173,13 +3438,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3206,8 +3471,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3243,10 +3507,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3285,7 +3545,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3307,8 +3567,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3361,6 +3621,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3401,33 +3664,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3438,21 +3706,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3460,8 +3728,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3507,8 +3775,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3520,7 +3788,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3547,13 +3815,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3565,11 +3848,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3588,7 +3871,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3640,7 +3923,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3673,14 +3956,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3698,21 +4011,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3752,11 +4068,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3782,7 +4098,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3802,9 +4118,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3825,7 +4141,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3852,12 +4168,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3873,17 +4193,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3894,8 +4215,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3911,6 +4232,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3960,7 +4286,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4001,14 +4327,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4037,7 +4363,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4045,7 +4371,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4190,17 +4516,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4211,8 +4538,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4229,6 +4556,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4299,7 +4631,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4307,11 +4639,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4327,7 +4678,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4336,9 +4687,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4363,6 +4714,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4460,7 +4817,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4489,7 +4846,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4555,17 +4912,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4611,9 +4972,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4629,7 +4990,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4637,7 +4998,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4647,7 +5008,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4669,24 +5030,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4699,7 +5060,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4718,7 +5079,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4734,7 +5095,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4744,7 +5105,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4752,61 +5113,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4817,42 +5206,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4866,8 +5260,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4885,8 +5279,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4898,7 +5292,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4913,9 +5307,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4932,15 +5326,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4956,7 +5350,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4964,34 +5358,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5010,13 +5427,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5035,61 +5460,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5098,7 +5542,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5128,16 +5572,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5146,18 +5591,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5166,7 +5611,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5216,33 +5661,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5250,25 +5695,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5276,14 +5721,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5294,7 +5739,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5305,16 +5750,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5327,21 +5772,31 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5356,7 +5811,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5364,27 +5819,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5395,33 +5842,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5432,24 +5899,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5459,11 +5926,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5473,10 +5940,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5525,43 +5992,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5576,17 +6043,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5603,7 +6070,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5683,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5729,10 +6196,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5772,18 +6239,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5791,8 +6258,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5800,13 +6271,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5814,14 +6285,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5863,7 +6334,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5905,35 +6376,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5969,18 +6440,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -5990,6 +6473,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6008,13 +6498,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6032,64 +6530,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6099,7 +6617,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6127,57 +6645,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6188,6 +6707,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6222,18 +6769,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6245,7 +6789,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6254,11 +6798,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6268,15 +6812,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6302,13 +6846,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6319,20 +6863,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6347,22 +6891,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6371,22 +6915,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6394,8 +6938,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6404,10 +6948,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6421,59 +6965,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6487,18 +7031,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6506,10 +7050,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6567,22 +7111,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6598,9 +7137,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6618,17 +7157,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6643,21 +7182,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6703,9 +7242,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6713,7 +7252,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6730,30 +7269,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6761,11 +7300,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6774,52 +7313,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6850,10 +7389,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6880,7 +7419,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6902,13 +7441,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6992,13 +7532,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7014,16 +7554,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7031,9 +7571,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7048,15 +7588,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7087,51 +7627,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7140,7 +7635,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7160,10 +7655,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7200,7 +7695,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7222,7 +7717,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7236,21 +7731,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7258,11 +7757,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7279,9 +7778,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7291,11 +7790,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7332,7 +7831,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7354,7 +7853,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7370,21 +7869,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7392,11 +7895,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7416,7 +7919,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7426,7 +7929,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7460,7 +7963,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7497,7 +8000,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7531,7 +8034,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7568,7 +8071,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7584,7 +8087,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7594,7 +8097,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7623,7 +8126,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7734,7 +8237,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7751,9 +8254,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7777,27 +8280,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7821,102 +8304,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru apr-1.5.2/build/ltmain.sh apr-1.6.5/build/ltmain.sh --- apr-1.5.2/build/ltmain.sh 2015-04-25 12:04:17.000000000 +0000 +++ apr-1.6.5/build/ltmain.sh 2018-09-10 21:14:51.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru apr-1.5.2/build/lt~obsolete.m4 apr-1.6.5/build/lt~obsolete.m4 --- apr-1.5.2/build/lt~obsolete.m4 2015-04-25 12:04:17.000000000 +0000 +++ apr-1.6.5/build/lt~obsolete.m4 2018-09-10 21:14:52.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru apr-1.5.2/build/ltoptions.m4 apr-1.6.5/build/ltoptions.m4 --- apr-1.5.2/build/ltoptions.m4 2015-04-25 12:04:17.000000000 +0000 +++ apr-1.6.5/build/ltoptions.m4 2018-09-10 21:14:52.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru apr-1.5.2/build/ltsugar.m4 apr-1.6.5/build/ltsugar.m4 --- apr-1.5.2/build/ltsugar.m4 2015-04-25 12:04:17.000000000 +0000 +++ apr-1.6.5/build/ltsugar.m4 2018-09-10 21:14:52.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru apr-1.5.2/build/ltversion.m4 apr-1.6.5/build/ltversion.m4 --- apr-1.5.2/build/ltversion.m4 2015-04-25 12:04:17.000000000 +0000 +++ apr-1.6.5/build/ltversion.m4 2018-09-10 21:14:52.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru apr-1.5.2/build/make_nw_export.awk apr-1.6.5/build/make_nw_export.awk --- apr-1.5.2/build/make_nw_export.awk 2011-04-01 00:29:34.000000000 +0000 +++ apr-1.6.5/build/make_nw_export.awk 2014-07-24 10:19:39.000000000 +0000 @@ -29,6 +29,8 @@ # List of functions that we don't support, yet?? #/apr_##name##_set_inherit/{next} #/apr_##name##_unset_inherit/{next} +#/apr_##name##_perms_set/{next} +/apr_socket_perms_set/{next} /^[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { sub("[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") diff -Nru apr-1.5.2/build/rpm/apr.spec.in apr-1.6.5/build/rpm/apr.spec.in --- apr-1.5.2/build/rpm/apr.spec.in 2015-03-04 17:13:12.000000000 +0000 +++ apr-1.6.5/build/rpm/apr.spec.in 2016-03-24 22:53:33.000000000 +0000 @@ -10,7 +10,7 @@ URL: http://apr.apache.org/ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: autoconf, libtool, doxygen, python +BuildRequires: autoconf, libtool, doxygen, libuuid-devel, python %description The mission of the Apache Portable Runtime (APR) is to provide a diff -Nru apr-1.5.2/build-outputs.mk apr-1.6.5/build-outputs.mk --- apr-1.5.2/build-outputs.mk 2015-04-25 12:04:18.000000000 +0000 +++ apr-1.6.5/build-outputs.mk 2018-09-10 21:14:53.000000000 +0000 @@ -3,53 +3,54 @@ encoding/apr_escape.lo: encoding/apr_escape.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_escape.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h passwd/apr_getpass.lo: passwd/apr_getpass.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h strings/apr_cpystrn.lo: strings/apr_cpystrn.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h +strings/apr_cstr.lo: strings/apr_cstr.c .make.dirs include/apr_allocator.h include/apr_cstr.h include/apr_errno.h include/apr_fnmatch.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_want.h strings/apr_fnmatch.lo: strings/apr_fnmatch.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_fnmatch.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -strings/apr_snprintf.lo: strings/apr_snprintf.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +strings/apr_snprintf.lo: strings/apr_snprintf.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h strings/apr_strings.lo: strings/apr_strings.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h strings/apr_strnatcmp.lo: strings/apr_strnatcmp.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h strings/apr_strtok.lo: strings/apr_strtok.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h tables/apr_hash.lo: tables/apr_hash.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h -tables/apr_skiplist.lo: tables/apr_skiplist.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_skiplist.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +tables/apr_skiplist.lo: tables/apr_skiplist.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_skiplist.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h tables/apr_tables.lo: tables/apr_tables.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_want.h -OBJECTS_all = encoding/apr_escape.lo passwd/apr_getpass.lo strings/apr_cpystrn.lo strings/apr_fnmatch.lo strings/apr_snprintf.lo strings/apr_strings.lo strings/apr_strnatcmp.lo strings/apr_strtok.lo tables/apr_hash.lo tables/apr_skiplist.lo tables/apr_tables.lo +OBJECTS_all = encoding/apr_escape.lo passwd/apr_getpass.lo strings/apr_cpystrn.lo strings/apr_cstr.lo strings/apr_fnmatch.lo strings/apr_snprintf.lo strings/apr_strings.lo strings/apr_strnatcmp.lo strings/apr_strtok.lo tables/apr_hash.lo tables/apr_skiplist.lo tables/apr_tables.lo -dso/unix/dso.lo: dso/unix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +dso/unix/dso.lo: dso/unix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_dso_unix = dso/unix/dso.lo file_io/unix/buffer.lo: file_io/unix/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h file_io/unix/copy.lo: file_io/unix/copy.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -file_io/unix/dir.lo: file_io/unix/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/unix/dir.lo: file_io/unix/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/unix/fileacc.lo: file_io/unix/fileacc.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h -file_io/unix/filedup.lo: file_io/unix/filedup.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/unix/filedup.lo: file_io/unix/filedup.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/unix/filepath.lo: file_io/unix/filepath.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/unix/filepath_util.lo: file_io/unix/filepath_util.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_want.h file_io/unix/filestat.lo: file_io/unix/filestat.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/unix/flock.lo: file_io/unix/flock.c .make.dirs file_io/unix/fullrw.lo: file_io/unix/fullrw.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -file_io/unix/mktemp.lo: file_io/unix/mktemp.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -file_io/unix/open.lo: file_io/unix/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -file_io/unix/pipe.lo: file_io/unix/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -file_io/unix/readwrite.lo: file_io/unix/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/unix/mktemp.lo: file_io/unix/mktemp.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/unix/open.lo: file_io/unix/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/unix/pipe.lo: file_io/unix/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/unix/readwrite.lo: file_io/unix/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/unix/seek.lo: file_io/unix/seek.c .make.dirs file_io/unix/tempdir.lo: file_io/unix/tempdir.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_file_io_unix = file_io/unix/buffer.lo file_io/unix/copy.lo file_io/unix/dir.lo file_io/unix/fileacc.lo file_io/unix/filedup.lo file_io/unix/filepath.lo file_io/unix/filepath_util.lo file_io/unix/filestat.lo file_io/unix/flock.lo file_io/unix/fullrw.lo file_io/unix/mktemp.lo file_io/unix/open.lo file_io/unix/pipe.lo file_io/unix/readwrite.lo file_io/unix/seek.lo file_io/unix/tempdir.lo -locks/unix/global_mutex.lo: locks/unix/global_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/unix/proc_mutex.lo: locks/unix/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h +locks/unix/global_mutex.lo: locks/unix/global_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/unix/proc_mutex.lo: locks/unix/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h locks/unix/thread_cond.lo: locks/unix/thread_cond.c .make.dirs locks/unix/thread_mutex.lo: locks/unix/thread_mutex.c .make.dirs include/apr_want.h locks/unix/thread_rwlock.lo: locks/unix/thread_rwlock.c .make.dirs OBJECTS_locks_unix = locks/unix/global_mutex.lo locks/unix/proc_mutex.lo locks/unix/thread_cond.lo locks/unix/thread_mutex.lo locks/unix/thread_rwlock.lo -memory/unix/apr_pools.lo: memory/unix/apr_pools.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_dso.h include/apr_env.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +memory/unix/apr_pools.lo: memory/unix/apr_pools.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_dso.h include/apr_env.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_memory_unix = memory/unix/apr_pools.lo -misc/unix/charset.lo: misc/unix/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +misc/unix/charset.lo: misc/unix/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h misc/unix/env.lo: misc/unix/env.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h misc/unix/errorcodes.lo: misc/unix/errorcodes.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h misc/unix/getopt.lo: misc/unix/getopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h @@ -61,35 +62,36 @@ OBJECTS_misc_unix = misc/unix/charset.lo misc/unix/env.lo misc/unix/errorcodes.lo misc/unix/getopt.lo misc/unix/otherchild.lo misc/unix/rand.lo misc/unix/start.lo misc/unix/version.lo mmap/unix/common.lo: mmap/unix/common.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_mmap.h include/apr_pools.h include/apr_ring.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -mmap/unix/mmap.lo: mmap/unix/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +mmap/unix/mmap.lo: mmap/unix/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_mmap_unix = mmap/unix/common.lo mmap/unix/mmap.lo network_io/unix/inet_ntop.lo: network_io/unix/inet_ntop.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h network_io/unix/inet_pton.lo: network_io/unix/inet_pton.c .make.dirs -network_io/unix/multicast.lo: network_io/unix/multicast.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -network_io/unix/sendrecv.lo: network_io/unix/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/unix/multicast.lo: network_io/unix/multicast.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/unix/sendrecv.lo: network_io/unix/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h network_io/unix/sockaddr.lo: network_io/unix/sockaddr.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h -network_io/unix/socket_util.lo: network_io/unix/socket_util.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -network_io/unix/sockets.lo: network_io/unix/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/unix/socket_util.lo: network_io/unix/socket_util.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/unix/sockets.lo: network_io/unix/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h network_io/unix/sockopt.lo: network_io/unix/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h OBJECTS_network_io_unix = network_io/unix/inet_ntop.lo network_io/unix/inet_pton.lo network_io/unix/multicast.lo network_io/unix/sendrecv.lo network_io/unix/sockaddr.lo network_io/unix/socket_util.lo network_io/unix/sockets.lo network_io/unix/sockopt.lo -poll/unix/epoll.lo: poll/unix/epoll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/unix/kqueue.lo: poll/unix/kqueue.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/unix/poll.lo: poll/unix/poll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/unix/pollcb.lo: poll/unix/pollcb.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/unix/pollset.lo: poll/unix/pollset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/unix/port.lo: poll/unix/port.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/unix/select.lo: poll/unix/select.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/unix/z_asio.lo: poll/unix/z_asio.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/epoll.lo: poll/unix/epoll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/kqueue.lo: poll/unix/kqueue.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/poll.lo: poll/unix/poll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/pollcb.lo: poll/unix/pollcb.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/pollset.lo: poll/unix/pollset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/port.lo: poll/unix/port.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/select.lo: poll/unix/select.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/wakeup.lo: poll/unix/wakeup.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/unix/z_asio.lo: poll/unix/z_asio.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -OBJECTS_poll_unix = poll/unix/epoll.lo poll/unix/kqueue.lo poll/unix/poll.lo poll/unix/pollcb.lo poll/unix/pollset.lo poll/unix/port.lo poll/unix/select.lo poll/unix/z_asio.lo +OBJECTS_poll_unix = poll/unix/epoll.lo poll/unix/kqueue.lo poll/unix/poll.lo poll/unix/pollcb.lo poll/unix/pollset.lo poll/unix/port.lo poll/unix/select.lo poll/unix/wakeup.lo poll/unix/z_asio.lo -random/unix/apr_random.lo: random/unix/apr_random.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +random/unix/apr_random.lo: random/unix/apr_random.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h random/unix/sha2.lo: random/unix/sha2.c .make.dirs -random/unix/sha2_glue.lo: random/unix/sha2_glue.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +random/unix/sha2_glue.lo: random/unix/sha2_glue.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_random_unix = random/unix/apr_random.lo random/unix/sha2.lo random/unix/sha2_glue.lo @@ -97,25 +99,25 @@ OBJECTS_shmem_unix = shmem/unix/shm.lo -support/unix/waitio.lo: support/unix/waitio.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +support/unix/waitio.lo: support/unix/waitio.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_support_unix = support/unix/waitio.lo -threadproc/unix/proc.lo: threadproc/unix/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_random.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/unix/proc.lo: threadproc/unix/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_random.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h threadproc/unix/procsup.lo: threadproc/unix/procsup.c .make.dirs threadproc/unix/signals.lo: threadproc/unix/signals.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h -threadproc/unix/thread.lo: threadproc/unix/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -threadproc/unix/threadpriv.lo: threadproc/unix/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/unix/thread.lo: threadproc/unix/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/unix/threadpriv.lo: threadproc/unix/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_threadproc_unix = threadproc/unix/proc.lo threadproc/unix/procsup.lo threadproc/unix/signals.lo threadproc/unix/thread.lo threadproc/unix/threadpriv.lo -time/unix/time.lo: time/unix/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -time/unix/timestr.lo: time/unix/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +time/unix/time.lo: time/unix/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +time/unix/timestr.lo: time/unix/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_time_unix = time/unix/time.lo time/unix/timestr.lo -user/unix/groupinfo.lo: user/unix/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -user/unix/userinfo.lo: user/unix/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +user/unix/groupinfo.lo: user/unix/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +user/unix/userinfo.lo: user/unix/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_user_unix = user/unix/groupinfo.lo user/unix/userinfo.lo @@ -130,20 +132,20 @@ OBJECTS_unix = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_unix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix) -dso/aix/dso.lo: dso/aix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +dso/aix/dso.lo: dso/aix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_dso_aix = dso/aix/dso.lo OBJECTS_aix = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_aix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix) -dso/beos/dso.lo: dso/beos/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +dso/beos/dso.lo: dso/beos/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_dso_beos = dso/beos/dso.lo -locks/beos/proc_mutex.lo: locks/beos/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/beos/thread_cond.lo: locks/beos/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/beos/thread_mutex.lo: locks/beos/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/beos/thread_rwlock.lo: locks/beos/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/beos/proc_mutex.lo: locks/beos/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/beos/thread_cond.lo: locks/beos/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/beos/thread_mutex.lo: locks/beos/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/beos/thread_rwlock.lo: locks/beos/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_locks_beos = locks/beos/proc_mutex.lo locks/beos/thread_cond.lo locks/beos/thread_mutex.lo locks/beos/thread_rwlock.lo @@ -152,13 +154,13 @@ OBJECTS_network_io_beos = network_io/beos/sendrecv.lo network_io/beos/socketcommon.lo -shmem/beos/shm.lo: shmem/beos/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +shmem/beos/shm.lo: shmem/beos/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_shmem_beos = shmem/beos/shm.lo threadproc/beos/apr_proc_stub.lo: threadproc/beos/apr_proc_stub.c .make.dirs threadproc/beos/proc.lo: threadproc/beos/proc.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h -threadproc/beos/thread.lo: threadproc/beos/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/beos/thread.lo: threadproc/beos/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h threadproc/beos/threadpriv.lo: threadproc/beos/threadpriv.c .make.dirs threadproc/beos/threadproc_common.lo: threadproc/beos/threadproc_common.c .make.dirs @@ -166,13 +168,13 @@ OBJECTS_beos = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_beos) $(OBJECTS_file_io_unix) $(OBJECTS_locks_beos) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_beos) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_beos) $(OBJECTS_support_unix) $(OBJECTS_threadproc_beos) $(OBJECTS_time_unix) $(OBJECTS_user_unix) -dso/os2/dso.lo: dso/os2/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +dso/os2/dso.lo: dso/os2/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_dso_os2 = dso/os2/dso.lo file_io/os2/buffer.lo: file_io/os2/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h file_io/os2/copy.lo: file_io/os2/copy.c .make.dirs -file_io/os2/dir.lo: file_io/os2/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/os2/dir.lo: file_io/os2/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/os2/dir_make_recurse.lo: file_io/os2/dir_make_recurse.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/os2/fileacc.lo: file_io/os2/fileacc.c .make.dirs file_io/os2/filedup.lo: file_io/os2/filedup.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h @@ -184,52 +186,52 @@ file_io/os2/fullrw.lo: file_io/os2/fullrw.c .make.dirs file_io/os2/maperrorcode.lo: file_io/os2/maperrorcode.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/os2/mktemp.lo: file_io/os2/mktemp.c .make.dirs -file_io/os2/open.lo: file_io/os2/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -file_io/os2/pipe.lo: file_io/os2/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/os2/open.lo: file_io/os2/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/os2/pipe.lo: file_io/os2/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/os2/readwrite.lo: file_io/os2/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/os2/seek.lo: file_io/os2/seek.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/os2/tempdir.lo: file_io/os2/tempdir.c .make.dirs OBJECTS_file_io_os2 = file_io/os2/buffer.lo file_io/os2/copy.lo file_io/os2/dir.lo file_io/os2/dir_make_recurse.lo file_io/os2/fileacc.lo file_io/os2/filedup.lo file_io/os2/filepath.lo file_io/os2/filepath_util.lo file_io/os2/filestat.lo file_io/os2/filesys.lo file_io/os2/flock.lo file_io/os2/fullrw.lo file_io/os2/maperrorcode.lo file_io/os2/mktemp.lo file_io/os2/open.lo file_io/os2/pipe.lo file_io/os2/readwrite.lo file_io/os2/seek.lo file_io/os2/tempdir.lo -locks/os2/proc_mutex.lo: locks/os2/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/os2/thread_cond.lo: locks/os2/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/os2/thread_mutex.lo: locks/os2/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/os2/thread_rwlock.lo: locks/os2/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/os2/proc_mutex.lo: locks/os2/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/os2/thread_cond.lo: locks/os2/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/os2/thread_mutex.lo: locks/os2/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/os2/thread_rwlock.lo: locks/os2/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_locks_os2 = locks/os2/proc_mutex.lo locks/os2/thread_cond.lo locks/os2/thread_mutex.lo locks/os2/thread_rwlock.lo network_io/os2/inet_ntop.lo: network_io/os2/inet_ntop.c .make.dirs network_io/os2/inet_pton.lo: network_io/os2/inet_pton.c .make.dirs -network_io/os2/os2calls.lo: network_io/os2/os2calls.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -network_io/os2/sendrecv.lo: network_io/os2/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -network_io/os2/sendrecv_udp.lo: network_io/os2/sendrecv_udp.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/os2/os2calls.lo: network_io/os2/os2calls.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/os2/sendrecv.lo: network_io/os2/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/os2/sendrecv_udp.lo: network_io/os2/sendrecv_udp.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h network_io/os2/sockaddr.lo: network_io/os2/sockaddr.c .make.dirs network_io/os2/socket_util.lo: network_io/os2/socket_util.c .make.dirs -network_io/os2/sockets.lo: network_io/os2/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -network_io/os2/sockopt.lo: network_io/os2/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/os2/sockets.lo: network_io/os2/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/os2/sockopt.lo: network_io/os2/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_network_io_os2 = network_io/os2/inet_ntop.lo network_io/os2/inet_pton.lo network_io/os2/os2calls.lo network_io/os2/sendrecv.lo network_io/os2/sendrecv_udp.lo network_io/os2/sockaddr.lo network_io/os2/socket_util.lo network_io/os2/sockets.lo network_io/os2/sockopt.lo -poll/os2/poll.lo: poll/os2/poll.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -poll/os2/pollset.lo: poll/os2/pollset.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/os2/poll.lo: poll/os2/poll.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +poll/os2/pollset.lo: poll/os2/pollset.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_poll_os2 = poll/os2/poll.lo poll/os2/pollset.lo -shmem/os2/shm.lo: shmem/os2/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +shmem/os2/shm.lo: shmem/os2/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_shmem_os2 = shmem/os2/shm.lo -threadproc/os2/proc.lo: threadproc/os2/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/os2/proc.lo: threadproc/os2/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h threadproc/os2/signals.lo: threadproc/os2/signals.c .make.dirs -threadproc/os2/thread.lo: threadproc/os2/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -threadproc/os2/threadpriv.lo: threadproc/os2/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/os2/thread.lo: threadproc/os2/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/os2/threadpriv.lo: threadproc/os2/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_threadproc_os2 = threadproc/os2/proc.lo threadproc/os2/signals.lo threadproc/os2/thread.lo threadproc/os2/threadpriv.lo OBJECTS_os2 = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_os2) $(OBJECTS_file_io_os2) $(OBJECTS_locks_os2) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_os2) $(OBJECTS_poll_os2) $(OBJECTS_random_unix) $(OBJECTS_shmem_os2) $(OBJECTS_support_unix) $(OBJECTS_threadproc_os2) $(OBJECTS_time_unix) $(OBJECTS_user_unix) -dso/os390/dso.lo: dso/os390/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +dso/os390/dso.lo: dso/os390/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_dso_os390 = dso/os390/dso.lo @@ -244,64 +246,64 @@ OBJECTS_dso_win32 = dso/win32/dso.lo file_io/win32/buffer.lo: file_io/win32/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h -file_io/win32/dir.lo: file_io/win32/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/win32/dir.lo: file_io/win32/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/win32/filedup.lo: file_io/win32/filedup.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/win32/filepath.lo: file_io/win32/filepath.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h file_io/win32/filestat.lo: file_io/win32/filestat.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/win32/filesys.lo: file_io/win32/filesys.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h file_io/win32/flock.lo: file_io/win32/flock.c .make.dirs -file_io/win32/open.lo: file_io/win32/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +file_io/win32/open.lo: file_io/win32/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/win32/pipe.lo: file_io/win32/pipe.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_escape.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/win32/readwrite.lo: file_io/win32/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h file_io/win32/seek.lo: file_io/win32/seek.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_file_io_win32 = file_io/unix/copy.lo file_io/unix/fileacc.lo file_io/unix/filepath_util.lo file_io/unix/fullrw.lo file_io/unix/mktemp.lo file_io/unix/tempdir.lo file_io/win32/buffer.lo file_io/win32/dir.lo file_io/win32/filedup.lo file_io/win32/filepath.lo file_io/win32/filestat.lo file_io/win32/filesys.lo file_io/win32/flock.lo file_io/win32/open.lo file_io/win32/pipe.lo file_io/win32/readwrite.lo file_io/win32/seek.lo -locks/win32/proc_mutex.lo: locks/win32/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/win32/thread_cond.lo: locks/win32/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/win32/thread_mutex.lo: locks/win32/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -locks/win32/thread_rwlock.lo: locks/win32/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/win32/proc_mutex.lo: locks/win32/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/win32/thread_cond.lo: locks/win32/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/win32/thread_mutex.lo: locks/win32/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +locks/win32/thread_rwlock.lo: locks/win32/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_locks_win32 = locks/win32/proc_mutex.lo locks/win32/thread_cond.lo locks/win32/thread_mutex.lo locks/win32/thread_rwlock.lo -misc/win32/charset.lo: misc/win32/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +misc/win32/charset.lo: misc/win32/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h misc/win32/env.lo: misc/win32/env.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h misc/win32/internal.lo: misc/win32/internal.c .make.dirs misc/win32/misc.lo: misc/win32/misc.c .make.dirs include/apr_errno.h include/apr_lib.h -misc/win32/rand.lo: misc/win32/rand.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +misc/win32/rand.lo: misc/win32/rand.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h misc/win32/start.lo: misc/win32/start.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_thread_mutex.h include/apr_want.h misc/win32/utf8.lo: misc/win32/utf8.c .make.dirs include/apr_errno.h OBJECTS_misc_win32 = misc/unix/errorcodes.lo misc/unix/getopt.lo misc/unix/otherchild.lo misc/unix/version.lo misc/win32/charset.lo misc/win32/env.lo misc/win32/internal.lo misc/win32/misc.lo misc/win32/rand.lo misc/win32/start.lo misc/win32/utf8.lo -mmap/win32/mmap.lo: mmap/win32/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +mmap/win32/mmap.lo: mmap/win32/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_mmap_win32 = mmap/unix/common.lo mmap/win32/mmap.lo -network_io/win32/sendrecv.lo: network_io/win32/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h -network_io/win32/sockets.lo: network_io/win32/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -network_io/win32/sockopt.lo: network_io/win32/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/win32/sendrecv.lo: network_io/win32/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/win32/sockets.lo: network_io/win32/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +network_io/win32/sockopt.lo: network_io/win32/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_network_io_win32 = network_io/unix/inet_ntop.lo network_io/unix/inet_pton.lo network_io/unix/multicast.lo network_io/unix/sockaddr.lo network_io/unix/socket_util.lo network_io/win32/sendrecv.lo network_io/win32/sockets.lo network_io/win32/sockopt.lo -shmem/win32/shm.lo: shmem/win32/shm.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h +shmem/win32/shm.lo: shmem/win32/shm.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_shmem_win32 = shmem/win32/shm.lo -threadproc/win32/proc.lo: threadproc/win32/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -threadproc/win32/signals.lo: threadproc/win32/signals.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_signal.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -threadproc/win32/thread.lo: threadproc/win32/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -threadproc/win32/threadpriv.lo: threadproc/win32/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/win32/proc.lo: threadproc/win32/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/win32/signals.lo: threadproc/win32/signals.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_signal.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/win32/thread.lo: threadproc/win32/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +threadproc/win32/threadpriv.lo: threadproc/win32/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_threadproc_win32 = threadproc/win32/proc.lo threadproc/win32/signals.lo threadproc/win32/thread.lo threadproc/win32/threadpriv.lo -time/win32/time.lo: time/win32/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -time/win32/timestr.lo: time/win32/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +time/win32/time.lo: time/win32/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +time/win32/timestr.lo: time/win32/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_time_win32 = time/win32/time.lo time/win32/timestr.lo -user/win32/groupinfo.lo: user/win32/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h -user/win32/userinfo.lo: user/win32/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +user/win32/groupinfo.lo: user/win32/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h +user/win32/userinfo.lo: user/win32/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h OBJECTS_user_win32 = user/win32/groupinfo.lo user/win32/userinfo.lo @@ -311,7 +313,7 @@ OBJECTS_win32 = $(OBJECTS_all) $(OBJECTS_atomic_win32) $(OBJECTS_dso_win32) $(OBJECTS_file_io_win32) $(OBJECTS_locks_win32) $(OBJECTS_memory_unix) $(OBJECTS_misc_win32) $(OBJECTS_mmap_win32) $(OBJECTS_network_io_win32) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_win32) $(OBJECTS_support_unix) $(OBJECTS_threadproc_win32) $(OBJECTS_time_win32) $(OBJECTS_user_win32) -HEADERS = $(top_srcdir)/include/apr_allocator.h $(top_srcdir)/include/apr_atomic.h $(top_srcdir)/include/apr_dso.h $(top_srcdir)/include/apr_env.h $(top_srcdir)/include/apr_errno.h $(top_srcdir)/include/apr_escape.h $(top_srcdir)/include/apr_file_info.h $(top_srcdir)/include/apr_file_io.h $(top_srcdir)/include/apr_fnmatch.h $(top_srcdir)/include/apr_general.h $(top_srcdir)/include/apr_getopt.h $(top_srcdir)/include/apr_global_mutex.h $(top_srcdir)/include/apr_hash.h $(top_srcdir)/include/apr_inherit.h $(top_srcdir)/include/apr_lib.h $(top_srcdir)/include/apr_mmap.h $(top_srcdir)/include/apr_network_io.h $(top_srcdir)/include/apr_poll.h $(top_srcdir)/include/apr_pools.h $(top_srcdir)/include/apr_portable.h $(top_srcdir)/include/apr_proc_mutex.h $(top_srcdir)/include/apr_random.h $(top_srcdir)/include/apr_ring.h $(top_srcdir)/include/apr_shm.h $(top_srcdir)/include/apr_signal.h $(top_srcdir)/include/apr_skiplist.h $(top_srcdir)/include/apr_strings.h $(top_srcdir)/include/apr_support.h $(top_srcdir)/include/apr_tables.h $(top_srcdir)/include/apr_thread_cond.h $(top_srcdir)/include/apr_thread_mutex.h $(top_srcdir)/include/apr_thread_proc.h $(top_srcdir)/include/apr_thread_rwlock.h $(top_srcdir)/include/apr_time.h $(top_srcdir)/include/apr_user.h $(top_srcdir)/include/apr_version.h $(top_srcdir)/include/apr_want.h +HEADERS = $(top_srcdir)/include/apr_allocator.h $(top_srcdir)/include/apr_atomic.h $(top_srcdir)/include/apr_cstr.h $(top_srcdir)/include/apr_dso.h $(top_srcdir)/include/apr_env.h $(top_srcdir)/include/apr_errno.h $(top_srcdir)/include/apr_escape.h $(top_srcdir)/include/apr_file_info.h $(top_srcdir)/include/apr_file_io.h $(top_srcdir)/include/apr_fnmatch.h $(top_srcdir)/include/apr_general.h $(top_srcdir)/include/apr_getopt.h $(top_srcdir)/include/apr_global_mutex.h $(top_srcdir)/include/apr_hash.h $(top_srcdir)/include/apr_inherit.h $(top_srcdir)/include/apr_lib.h $(top_srcdir)/include/apr_mmap.h $(top_srcdir)/include/apr_network_io.h $(top_srcdir)/include/apr_perms_set.h $(top_srcdir)/include/apr_poll.h $(top_srcdir)/include/apr_pools.h $(top_srcdir)/include/apr_portable.h $(top_srcdir)/include/apr_proc_mutex.h $(top_srcdir)/include/apr_random.h $(top_srcdir)/include/apr_ring.h $(top_srcdir)/include/apr_shm.h $(top_srcdir)/include/apr_signal.h $(top_srcdir)/include/apr_skiplist.h $(top_srcdir)/include/apr_strings.h $(top_srcdir)/include/apr_support.h $(top_srcdir)/include/apr_tables.h $(top_srcdir)/include/apr_thread_cond.h $(top_srcdir)/include/apr_thread_mutex.h $(top_srcdir)/include/apr_thread_proc.h $(top_srcdir)/include/apr_thread_rwlock.h $(top_srcdir)/include/apr_time.h $(top_srcdir)/include/apr_user.h $(top_srcdir)/include/apr_version.h $(top_srcdir)/include/apr_want.h SOURCE_DIRS = random/unix misc/win32 encoding dso/os2 time/unix network_io/win32 dso/win32 locks/unix user/unix time/win32 locks/beos tables support/unix file_io/unix mmap/unix atomic/unix threadproc/win32 poll/os2 atomic/win32 dso/os390 atomic/os390 dso/beos poll/unix passwd network_io/beos threadproc/os2 network_io/os2 shmem/win32 threadproc/beos shmem/unix network_io/unix file_io/os2 mmap/win32 dso/aix file_io/win32 threadproc/unix misc/unix locks/win32 shmem/beos dso/unix locks/os2 user/win32 shmem/os2 memory/unix strings $(EXTRA_SOURCE_DIRS) diff -Nru apr-1.5.2/CHANGES apr-1.6.5/CHANGES --- apr-1.5.2/CHANGES 2015-04-25 11:52:03.000000000 +0000 +++ apr-1.6.5/CHANGES 2018-09-10 13:55:52.000000000 +0000 @@ -1,179 +1,136 @@ -*- coding: utf-8 -*- -Changes for APR 1.5.2 +Changes for APR 1.6.5 - *) SECURITY: CVE-2015-1829 (cve.mitre.org) - APR applications using APR named pipe support on Windows can be - vulnerable to a pipe squatting attack from a local process; the extent - of the vulnerability, when present, depends on the application. - Initial analysis and report was provided by John Hernandez of Casaba - Security via HP SSRT Security Alert. [Yann Ylavic] + *) Fix Win32 build breakage in apr_os_exp_time_put() in 1.6.4. [Rainer Jung] + +Changes for APR 1.6.4 (not released) - *) apr_atomic: Fix errors when building on Visual Studio 2013 while - maintaining the ability to build on Visual Studio 6 with Windows - Server 2003 R2 SDK. PR 57191. [Gregg Smith] - - *) Switch to generic atomics for early/unpatched Solaris 10 not exporting - some atomic functions. PR 55418. [Yann Ylavic] - - *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files - per process. PR 57677. [Jeff Trawick] - - *) apr_escape: Correctly calculate the size of the returned string in - apr_escape_path and set the correct return value in case we actually - escape the string. [] PR 57230. - - *) pollcb on Windows: Handle calls with no file/socket descriptors. - Follow up to PR 49882. [Jeff Trawick, Yann Ylavic] - - *) apr_poll(cb): fix error paths returned values and leaks. [Yann Ylavic] - - *) apr_thread_cond_*wait() on BeOS: Fix broken logic. PR 45800. - [Jochen Voss (no e-mail)] + *) configure: Fix detection of on OpenBSD. + PR 61976. [David Carlier , Yann Ylavic] - *) apr_skiplist: Optimize the number of allocations by reusing pooled or - malloc()ed nodes for the lifetime of the skiplist. [Yann Ylavic] + *) Fix apr_parse_addr_port() regression in scope_id parsing introduced + in 1.6.3. [Rainer Jung] - *) apr_skiplist: Fix possible multiple-free() on the same value in - apr_skiplist_remove_all(). [Yann Ylavic] + *) Fix Win32 file buffer locking behavior for single threaded file streams. + [Evgeny Kotkov, Mladen Turk, Jean-Frederic Clere] - *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return - "EDC8102I Operation would block" under load. - [Pat Odonnell ] + *) Numerous corrections to APR poll behavior. [Yann Ylavic] - *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not - returning IPv4 addresses if any IPv6 addresses were returned. - [Eric Covener] +Changes for APR 1.6.3 - *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and - later. [Jeff Trawick] + *) apr_file_trunc: Truncating a buffered file could add unexpected + data after the truncate position. PR 51017. + [Evgeny Kotkov ] - *) apr_global_mutex/apr_proc_mutex: Resolve failures with the - POSIX sem implementation in environments which receive signals. - [Jeff Trawick] + *) apr_file_trunc: Fix an issue where reading from a buffered file + after truncate could return stale data from the buffer. + [Evgeny Kotkov ] - *) apr_skiplist: Fix potential corruption of skiplists leading to - results or crashes. [Takashi Sato , Eric Covener] - PR 56654. + *) apr_ipsubnet_create() now fails for an empty input string. + [Joe Orton] - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] +Changes for APR 1.6.2 -Changes for APR 1.5.1 + *) Corrected non-Unix builds for APR_LOCK_DEFAULT. - *) apr_os_proc_mutex_get() on Unix: Avoid segfault for cross- - process pthread mutexes. [Yann Ylavic ] +Changes for APR 1.6.1 - *) When using shmget-based shared memory, the ID used for ftok is - now an APR hash of the filename instead of the constant '1'. - We do this to help avoid collisions. PR 53996 [Jim Jagielski] + *) Defer timed locks API for later 1.7 release [Nick Kew, William Rowe] - *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski] + *) Export build files find_apr.m4 and apr_common.m4 [Jacob Champion] - *) Fix POSIX shared memory (shm_open) use for named shared memory. - Includes adding '--enable-posix-shm' to force POSIX shm if - available, and OS X compatibility. PR 55928. - [Jozef Hatala , Jim Jagielski] +Changes for APR 1.6.0 - *) Fix race condition when calling apr_dir_make_recursive from - multiple threads on Windows. - [Bert Huijben] + *) apr_allocator: Provide apr_allocator_align() to get the true size that + would be allocated for the given size (including the header and + alignment). [Yann Ylavic] - *) Fix apr_escape.c compilation errors on EBCDIC platforms. - [Eric Covener] + *) apr_os_proc_mutex_put_ex: Allow to specify whether the OS native + mutex should or not be cleaned up (destroyed) with the constructed + APR mutex (given pool), and default to not for the simple _put() + function. [Yann Ylavic] - *) FreeBSD 10: Correct a regression in 1.5.0 which affected non- - blocking sockets in some applications, including httpd. [Jeff - Trawick] + *) apr_proc/global_mutex: Fix API regarding the native OS mutexes + accessors from/to available APR mechanisms, adding the new functions + apr_os_proc_mutex_get_ex() and apr_os_proc_mutex_set_ex() which give + control to the user over the selected mechanisms, including the missing + POSIX semaphores (sem_t) on platforms supporting them. + [Yann Ylavic] - *) Windows cmake build: Fix incorrect installation of some .pdb - files. Fix incorrect use of some logic intended for Windows 9x, - including legacy filesystem interfaces and dynamic loading of - some Windows APIs. [Jeff Trawick] + *) apr_proc_mutex-pthread: Refcount shared mutexes usage to avoid + destruction while still is use by some process(es). PR 49504. + [Yann Ylavic] - *) apr_skiplist: Add compatibility with C++ applications. - [Jeff Trawick] + *) apr_file_io: Add apr_file_pipe_create_pools() allowing a pair of + pipes to be created, each in a different pool. [Graham Leggett] - *) Correct a regression in 1.5.0 which affected out-of-tree - builds on Unix. [Rainer Jung] + *) Add apr_pollcb_wakeup(), with similar behavior to + apr_pollset_wakeup(). Add apr_pollcb_method_name(), with similar + behavior to apr_pollset_method_name(). + [Neil Conway , Jeff Trawick] - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] + *) apr_table_overlap: Add APR_OVERLAP_TABLES_ADD to merge and set when + overlapping tables. [Graham Leggett] -Changes for APR 1.5.0 + *) locks: Introduce apr_{thread,proc,global}_mutex_timedlock(). + [Yann Ylavic] - *) Fix Linux kernel version check to recognize more versions, - including versions 3.10 and later. PR 55690. [Joe Orton, - Arfrever Frehtes Taifersar Arahesis ] + *) Introduce the apr_cstr_fn() family of functions, derived from + the svn_cstring_ functions of the Subversion project. - *) Add apr_sockaddr_is_wildcard() to check if a socket address - refers to the wildcard address for the protocol family (e.g., - 0.0.0.0/INADDR_ANY for IPv4). [Jeff Trawick] + *) Add APR_SO_FREEBIND option for apr_socket_opt_set. PR 58725. + [Ashley GC, Jan Kaluza, Joe Orton] - *) apr_file_dup2() on Windows: Fix debug RTL assertion when - attempting to _commit(stdout) or _commit(stderr). [Mike Rumph - ] + *) apr_filepath_merge: Fix truename length calculation on Windows + in cases where the "short" name variant is actually longer than + the "long" or "true" name. See: testnames.c:merge_shortname(). + [Bert Huijben ] - *) apr_socket_connect() on Windows: Handle WSAEISCONN. PR 48736. - [, Jeff Trawick] - - *) z/OS: threadsafe apr_pollset_poll support for sockets [Greg Ames] - - *) Windows: Don't obtain a mutex for buffered file I/O unless the - file was opened with the APR_FOPEN_XTHREAD flag. [Ivan Zhakov - ] - - *) Windows: Create named shared memory segments under the "Local" - namespace if the caller is unprivileged, fixing an inability of - unprivileged callers to use apr_shm_create() with named shared - memory segments under recent Windows. As before, shared memory - segments are created under the "Global" namespace for privileged - callers. Add apr_shm_create_ex() and apr_shm_attach_ex(), which - provide the ability to override the normal namespace selection. - [Jeff Trawick] - - *) Update compile settings for MINT OS. PR 47181. [Alan Hourihane - ] - - *) Files and pipes on Windows: Don't create an unused pollset when - files and pipes are opened. [Mladen Turk] + *) apr_atomic: Fix errors when building on Visual Studio 2013 while + maintaining the ability to build on Visual Studio 6 with Windows + Server 2003 R2 SDK. PR 57191. [Gregg Smith] - *) apr_socket_timeout_set() on Windows: If the socket was in a non- - blocking state before, disable that setting so that timeouts work. - [Jeff Trawick] + *) apr_skiplist: Add apr_skiplist_addne*() family to preserve existing + values (no duplicate), add apr_skiplist_size(), apr_skiplist_height() + and apr_skiplist_preheight() to get the corresponding current values, + and apr_skiplist_set_preheight() to modify it. [ Yann Ylavic ] - *) File info APIs: Fix calculation of atime and mtime on AIX. PR 51146. - [Ruediger Pluem] + *) Add new --enable-allocator-guard-pages which is like allocator-uses-mmap, + but will also add inaccessible guard pages before and after each memnode. + This will result in higher ressource usage but allow to find/protect + against certain buffer overflow/overread bugs. Under Linux, it may be + necessary to increase /proc/sys/vm/max_map_count . [Stefan Fritsch] - *) Add the apr_escape interface. [Graham Leggett] + *) apr_skiplist: Add apr_skiplist_add() to support multiple values. - *) Cygwin build fixes. PRs 51016 and 55586. [Carlo Bramini - ] + *) Add new --enable-pool-concurrency-check configure option to detect + thread-unsafe concurrent accesses to pools. Runtime costs should be + relatively low. [Stefan Fritsch] - *) Add apr_skiplist family. [Jim Jagielski] + *) Add support code to teach valgrind about APR pools and allocators. + [Stefan Fritsch] - *) Add experimental cmake-based build system for Windows. Refer to - README.cmake for more information. [Jeff Trawick, Tom Donovan] + *) Add apr_sockaddr_info_copy(), for making a deep copy of an + apr_sockaddr_t into a specified pool. [Yann Ylavic + ] - *) Add the apr_table_getm() call, which transparently handles the - merging of keys with multiple values. [Graham Leggett] + *) Added Unix domain socket support. + [Mladen Turk] - *) Add apr_hash_this_key(), apr_hash_this_key_len(), and - apr_hash_this_val() for easier access to those attributes from - a hash iterator. [Hyrum K. Wright ] + *) Add apr_shm_delete() to compliment apr_shm_remove(). + [Jim Jagielski] - *) MinGW/MSYS: Support shared builds of APR, other general improvements - to support of this toolchain. PR 46175. [Carlo Bramini - ] + *) Intruduce APR_PERMS_SET macros for setting the owner/group on + objects. Currently only implemented for shm, proc and global + mutexes on posix platforms. + [Mladen Turk] - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] + *) Add apr_escape_ldap() and apr_pescape_ldap(), escaping characters + as described by RFC4514 and RFC4515 respectively. [Graham Leggett] - *) apr_socket_opt_set: Add support for APR_SO_BROADCAST. PR 46389. - [Armin Müller ] +Changes for APR 1.5.x and later: - *) Enable platform specific support for the opening of a file or - pipe in non-blocking mode through the APR_FOPEN_NONBLOCK flag. - [Graham Leggett] + *) http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?view=markup Changes for APR 1.4.x and later: diff -Nru apr-1.5.2/CMakeLists.txt apr-1.6.5/CMakeLists.txt --- apr-1.5.2/CMakeLists.txt 2014-09-16 00:08:50.000000000 +0000 +++ apr-1.6.5/CMakeLists.txt 2016-12-03 16:26:53.000000000 +0000 @@ -87,6 +87,7 @@ SET(APR_PUBLIC_HEADERS_STATIC include/apr_allocator.h include/apr_atomic.h + include/apr_cstr.h include/apr_dso.h include/apr_env.h include/apr_errno.h @@ -102,6 +103,7 @@ include/apr_lib.h include/apr_mmap.h include/apr_network_io.h + include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h @@ -179,11 +181,13 @@ poll/unix/pollcb.c poll/unix/pollset.c poll/unix/select.c + poll/unix/wakeup.c random/unix/apr_random.c random/unix/sha2.c random/unix/sha2_glue.c shmem/win32/shm.c strings/apr_cpystrn.c + strings/apr_cstr.c strings/apr_fnmatch.c strings/apr_snprintf.c strings/apr_strings.c diff -Nru apr-1.5.2/config.layout apr-1.6.5/config.layout --- apr-1.5.2/config.layout 2004-11-24 22:51:51.000000000 +0000 +++ apr-1.6.5/config.layout 2018-08-25 14:56:57.000000000 +0000 @@ -223,6 +223,7 @@ libexecdir: ${exec_prefix}/lib/apr/modules mandir: ${exec_prefix}/share/man datadir: ${exec_prefix}/share/apr + installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION} includedir: ${exec_prefix}/include/apr-${APR_MAJOR_VERSION} localstatedir: ${prefix}/var/run runtimedir: ${prefix}/var/run diff -Nru apr-1.5.2/configure apr-1.6.5/configure --- apr-1.5.2/configure 2015-04-25 12:04:18.000000000 +0000 +++ apr-1.6.5/configure 2018-09-10 21:14:53.000000000 +0000 @@ -656,6 +656,7 @@ apr_has_xthread_files have_unicode_fs have_ipv6 +have_sockaddr_un have_sa_storage have_sctp acceptfilter @@ -800,6 +801,7 @@ link lt_compile installbuilddir +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -906,6 +908,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -920,9 +923,12 @@ enable_nonportable_atomics enable_threads with_efence +with_valgrind enable_posix_shm with_sendfile enable_allocator_uses_mmap +enable_allocator_guard_pages +enable_pool_concurrency_check enable_dso enable_other_child with_egd @@ -937,7 +943,8 @@ LDFLAGS LIBS CPPFLAGS -CPP' +CPP +LT_SYS_LIBRARY_PATH' # Initialize some variables set by options. @@ -1567,6 +1574,9 @@ --enable-threads Enable threading support in APR. --enable-posix-shm Use POSIX shared memory (shm_open) if available --enable-allocator-uses-mmap Use mmap in apr_allocator instead of malloc + --enable-allocator-guard-pages Use guard pages in apr_allocator + (implies --enable-allocator-uses-mmap) + --enable-pool-concurrency-check Check for concurrent usage of memory pools --disable-dso Disable DSO support --enable-other-child Enable reliable child processes --disable-ipv6 Disable IPv6 support in APR. @@ -1576,12 +1586,17 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). - --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build') + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). + --with-installbuilddir=DIR location to store APR build files --without-libtool avoid using libtool to link the library --with-efence[=DIR] path to Electric Fence installation + --with-valgrind[=DIR] Enable code to teach valgrind about apr pools + (optionally: set path to valgrind headers) --with-sendfile Override decision to use sendfile --with-egd[=DIR] use EGD-compatible socket --with-devrandom[=DEV] use /dev/random or compatible [searches by default] @@ -1595,6 +1610,8 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2901,11 +2918,11 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -2914,7 +2931,7 @@ -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -2974,16 +2991,23 @@ +# _LT_PREPARE_CC_BASENAME +# ----------------------- +# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. # _LT_FILEUTILS_DEFAULTS @@ -2999,9 +3023,9 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. # _LT_PROG_LTMAIN @@ -3012,7 +3036,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -3100,8 +3124,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. @@ -3136,7 +3160,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. @@ -3157,8 +3181,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. #_LT_CONFIG_COMMANDS @@ -3171,7 +3195,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -3374,8 +3398,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). # _LT_PROG_ECHO_BACKSLASH @@ -3546,6 +3570,12 @@ # _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -3554,7 +3584,7 @@ # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library # _LT_PATH_TOOL_PREFIX # Old name: @@ -3581,7 +3611,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library # _LT_PATH_MAGIC @@ -3643,6 +3673,18 @@ # _LT_CMD_RELOAD +# _LT_PATH_DD +# ----------- +# find a working dd +# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3709,6 +3751,13 @@ # _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3761,7 +3810,7 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. # _LT_LANG_C_CONFIG @@ -3769,7 +3818,7 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. # _LT_LANG_CXX_CONFIG @@ -3786,6 +3835,7 @@ # rather than the libtool script. # _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -3799,7 +3849,7 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. # _LT_LANG_F77_CONFIG @@ -3807,7 +3857,7 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. # _LT_LANG_FC_CONFIG @@ -3815,7 +3865,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. # _LT_LANG_GCJ_CONFIG @@ -3823,7 +3873,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. # _LT_LANG_GO_CONFIG @@ -3831,7 +3881,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. # _LT_LANG_RC_CONFIG @@ -3947,29 +3997,17 @@ # _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. - - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. - - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. # _LT_PATH_CONVERSION_FUNCTIONS # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -3997,7 +4035,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. @@ -4005,7 +4043,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different @@ -4060,15 +4098,15 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. @@ -4178,9 +4216,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. # _LT_ENABLE_SHARED @@ -4235,9 +4273,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. # _LT_ENABLE_STATIC @@ -4292,9 +4330,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. # _LT_ENABLE_FAST_INSTALL @@ -4343,11 +4381,23 @@ +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +# _LT_WITH_AIX_SONAME + + + + + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. # _LT_WITH_PIC @@ -4390,7 +4440,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -4399,7 +4449,7 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool @@ -4409,7 +4459,8 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -4420,7 +4471,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -10657,8 +10708,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -10672,7 +10723,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -10721,7 +10772,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -10914,19 +10965,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -10940,7 +10991,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -10951,7 +11002,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -10962,32 +11013,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -11030,33 +11081,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -11067,15 +11123,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -11181,9 +11237,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -11191,8 +11247,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -11232,7 +11288,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -11272,7 +11328,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -11322,22 +11378,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -11355,7 +11412,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -11373,30 +11430,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -11519,13 +11552,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -11650,13 +11683,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -11683,8 +11716,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -11720,10 +11752,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -11762,7 +11790,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -11784,8 +11812,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -11838,6 +11866,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -11992,8 +12023,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -12005,7 +12036,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -12159,7 +12190,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -12167,7 +12198,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -12180,7 +12211,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -12397,7 +12428,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -12487,7 +12518,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -12520,14 +12551,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -12545,21 +12606,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -12607,11 +12671,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -12637,7 +12701,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -12657,13 +12721,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -12684,7 +12748,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -12737,6 +12801,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -12749,9 +12823,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -12761,8 +12835,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -12774,18 +12848,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -12794,24 +12949,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -12840,9 +12996,50 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -12856,9 +13053,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -12877,7 +13084,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -12895,7 +13105,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -12935,13 +13145,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -12953,7 +13164,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -12962,7 +13173,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -12978,7 +13189,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -13089,7 +13300,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -13592,7 +13803,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -13610,7 +13821,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -13649,7 +13860,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -13678,7 +13889,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -13691,32 +13902,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -13724,6 +13935,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -13758,14 +14004,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -13789,14 +14035,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -13820,14 +14066,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -13835,8 +14081,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -13852,14 +14096,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -13873,11 +14117,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(apr_builddir)/libtool' @@ -13926,7 +14222,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -13965,7 +14261,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -13976,14 +14272,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -13992,15 +14288,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -14015,22 +14304,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -14053,13 +14342,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -14081,22 +14370,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -14119,13 +14408,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -14146,7 +14435,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -14208,7 +14497,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -14224,7 +14513,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -14254,7 +14543,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -14272,17 +14561,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -14293,8 +14583,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -14310,6 +14600,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -14380,7 +14675,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -14388,10 +14683,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -14407,7 +14721,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -14416,9 +14730,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -14443,6 +14757,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -14540,7 +14860,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -14569,7 +14889,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -14601,7 +14921,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -14631,7 +14951,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -14663,7 +14983,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -14682,13 +15002,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -14808,8 +15128,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -14821,9 +15141,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -14866,9 +15186,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -14883,7 +15203,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -14891,7 +15211,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -14901,7 +15221,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -14923,24 +15243,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -14953,7 +15273,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -14972,7 +15292,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -14988,7 +15308,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -14998,7 +15318,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -15006,61 +15326,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -15071,42 +15419,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -15120,8 +15473,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -15139,8 +15492,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -15152,7 +15505,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -15167,9 +15520,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -15186,15 +15539,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -15210,7 +15563,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -15218,34 +15571,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -15264,13 +15640,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -15289,35 +15673,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -15352,7 +15743,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -15360,17 +15751,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -15405,7 +15796,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -15413,21 +15804,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -15436,7 +15839,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -15466,16 +15869,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -15484,18 +15888,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -15504,7 +15908,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -15523,24 +15927,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -15582,33 +15986,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -15616,25 +16020,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -15646,7 +16050,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -15665,14 +16069,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -15680,8 +16084,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -15692,7 +16096,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -15703,8 +16107,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -15714,8 +16118,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -15727,24 +16131,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -15759,7 +16173,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -15767,27 +16181,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -15798,33 +16204,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -15835,24 +16261,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -15862,11 +16288,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -15876,10 +16302,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -15928,43 +16354,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -15979,10 +16405,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -15990,7 +16416,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -16016,7 +16442,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -16231,14 +16657,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -16254,28 +16680,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -16289,7 +16722,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -16298,7 +16731,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -16315,14 +16748,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -16330,41 +16765,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -16374,18 +16859,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -16393,8 +16878,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -16406,7 +16891,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -16415,8 +16900,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -16432,17 +16917,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -16451,8 +16936,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -16479,7 +16964,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -16492,8 +16977,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -16506,7 +16991,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -16519,8 +17004,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -16533,8 +17018,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -16552,12 +17037,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -16582,26 +17068,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -16619,14 +17094,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -16634,8 +17110,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -16644,8 +17120,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -16658,8 +17134,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -16670,7 +17146,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -16678,8 +17154,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -16698,8 +17174,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -16708,23 +17184,43 @@ dynamic_linker=no ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor +linux*android*) + version_type=none # Android doesn't support versioned libraries. need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no + shlibpath_overrides_runpath=yes - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" @@ -16758,10 +17254,18 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -16778,12 +17282,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -16793,7 +17297,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -16802,58 +17306,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -16864,8 +17378,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -16875,11 +17389,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -16887,8 +17401,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -16909,24 +17423,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -16944,7 +17458,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -16952,8 +17466,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -16963,20 +17477,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -17073,15 +17602,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -17096,12 +17625,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -17111,7 +17640,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -17121,23 +17650,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -17175,10 +17704,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -17186,10 +17715,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -17228,11 +17765,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -17271,7 +17808,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -17310,7 +17847,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -17349,7 +17886,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -17370,21 +17907,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -17392,7 +17929,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -17439,9 +17976,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -17471,7 +18008,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -17491,14 +18028,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -17545,9 +18082,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -17577,7 +18114,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -17598,9 +18135,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -17644,7 +18181,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -17672,7 +18209,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -17680,13 +18217,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -17694,8 +18231,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -17705,7 +18246,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -17719,7 +18260,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -17756,8 +18297,6 @@ # Check whether --with-installbuilddir was given. if test "${with_installbuilddir+set}" = set; then : withval=$with_installbuilddir; installbuilddir=$withval -else - installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" fi @@ -17955,6 +18494,31 @@ done fi + case `($CC --version) 2>/dev/null` in + *clang-900* | *"clang version 5.0.0"*) + + if test "x$CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wno-error=strict-prototypes\"" + CFLAGS="-Wno-error=strict-prototypes" + else + apr_addto_bugger="-Wno-error=strict-prototypes" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS" + CFLAGS="$CFLAGS $i" + fi + done + fi + + ;; + esac elif test "$AIX_XLC" = "yes"; then if test "x$CFLAGS" = "x"; then @@ -18651,6 +19215,11 @@ ;; esac ;; + *apple-darwin*) + ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync() + OSDIR="unix" + eolstr="\\n" + ;; *os390) OSDIR="os390" OBJECTS_PLATFORM='$(OBJECTS_os390)' @@ -18678,6 +19247,11 @@ OSDIR="unix" eolstr="\\n" ;; + *darwin* ) + ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync() + OSDIR="unix" + eolstr="\\n" + ;; *) OSDIR="unix" eolstr="\\n" @@ -20292,6 +20866,87 @@ fi + +# Check whether --with-valgrind was given. +if test "${with_valgrind+set}" = set; then : + withval=$with_valgrind; if test "$withval" != no; then + if test "$withval" = yes; then + withval=/usr/include/valgrind + fi + + if test "x$CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$withval\"" + CPPFLAGS="-I$withval" + else + apr_addto_bugger="-I$withval" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" + CPPFLAGS="$CPPFLAGS $i" + fi + done + fi + + for ac_header in valgrind.h memcheck.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + ac_rc=yes +for ac_spec in header:valgrind.h header:memcheck.h; do + ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` + ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` + case $ac_type in + header ) + ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` + ac_var="ac_cv_header_$ac_item" + ;; + file ) + ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` + ac_var="ac_cv_file_$ac_item" + ;; + func ) ac_var="ac_cv_func_$ac_item" ;; + struct ) ac_var="ac_cv_struct_$ac_item" ;; + define ) ac_var="ac_cv_define_$ac_item" ;; + custom ) ac_var="$ac_item" ;; + esac + eval "ac_val=\$$ac_var" + if test ".$ac_val" != .yes; then + ac_rc=no + break + fi +done +if test ".$ac_rc" = .yes; then + : + +$as_echo "#define HAVE_VALGRIND 1" >>confdefs.h + +else + : + as_fn_error $? "valgrind headers not found" "$LINENO" 5 + +fi + + fi + +fi + + for ac_func in sigsuspend do : ac_fn_c_check_func "$LINENO" "sigsuspend" "ac_cv_func_sigsuspend" @@ -20921,7 +21576,8 @@ #endif";; esac -for ac_header in sys/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h windows.h +for ac_header in sys/types.h sys/mman.h sys/ipc.h sys/mutex.h \ + sys/shm.h sys/file.h sys/socket.h kernel/OS.h os2.h windows.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -20934,8 +21590,26 @@ done +for ac_header in net/if.h +do : + ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#include + +" +if test "x$ac_cv_header_net_if_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NET_IF_H 1 +_ACEOF + +fi + +done + for ac_func in mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ - create_area + create_area mprotect do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -22911,6 +23585,61 @@ fi +# Check whether --enable-allocator-guard-pages was given. +if test "${enable_allocator_guard_pages+set}" = set; then : + enableval=$enable_allocator_guard_pages; if test "$enableval" = "yes"; then + ac_rc=yes +for ac_spec in header:sys/mman.h func:mmap func:munmap func:mprotect define:MAP_ANON; do + ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` + ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` + case $ac_type in + header ) + ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` + ac_var="ac_cv_header_$ac_item" + ;; + file ) + ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` + ac_var="ac_cv_file_$ac_item" + ;; + func ) ac_var="ac_cv_func_$ac_item" ;; + struct ) ac_var="ac_cv_struct_$ac_item" ;; + define ) ac_var="ac_cv_define_$ac_item" ;; + custom ) ac_var="$ac_item" ;; + esac + eval "ac_val=\$$ac_var" + if test ".$ac_val" != .yes; then + ac_rc=no + break + fi +done +if test ".$ac_rc" = .yes; then + : + +$as_echo "#define APR_ALLOCATOR_GUARD_PAGES 1" >>confdefs.h + +else + : + as_fn_error $? "mmap()/MAP_ANON/mprotect() not supported" "$LINENO" 5 + +fi + + fi + +fi + + + +# Check whether --enable-pool-concurrency-check was given. +if test "${enable_pool_concurrency_check+set}" = set; then : + enableval=$enable_pool_concurrency_check; if test "$enableval" = "yes"; then + +$as_echo "#define APR_POOL_CONCURRENCY_CHECK 1" >>confdefs.h + + fi + +fi + + ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" if test "x$ac_cv_type_off_t" = xyes; then : @@ -28253,6 +28982,58 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_un" >&5 +$as_echo_n "checking for sockaddr_un... " >&6; } +if ${ac_cv_define_sockaddr_un+:} false; then : + $as_echo_n "(cached) " >&6 +else + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_SYS_UN_H +#include +#endif + +int +main () +{ + +struct sockaddr_un sa; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_define_sockaddr_un=yes + +else + + ac_cv_define_sockaddr_un=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_define_sockaddr_un" >&5 +$as_echo "$ac_cv_define_sockaddr_un" >&6; } + +if test "$ac_cv_define_sockaddr_un" = "yes"; then + have_sockaddr_un=1 +else + have_sockaddr_un=0 +fi + + + have_ipv6="0" if test "$user_disabled_ipv6" = 1; then ipv6_result="no -- disabled by user" @@ -29346,6 +30127,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -29393,10 +30175,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -29461,7 +30246,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -29513,9 +30299,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -29550,7 +30339,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -29577,10 +30366,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -29589,19 +30379,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -30195,55 +30982,53 @@ case $ac_file$ac_mode in "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -30272,6 +31057,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -30383,18 +31171,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -30485,8 +31282,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -30579,13 +31379,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -30637,13 +31437,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -30652,7 +31511,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -30662,165 +31521,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff -Nru apr-1.5.2/configure.in apr-1.6.5/configure.in --- apr-1.5.2/configure.in 2015-04-23 16:06:12.000000000 +0000 +++ apr-1.6.5/configure.in 2018-08-25 14:56:57.000000000 +0000 @@ -272,8 +272,8 @@ ;; esac -AC_ARG_WITH(installbuilddir, [ --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')], - [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] ) +AC_ARG_WITH(installbuilddir, [ --with-installbuilddir=DIR location to store APR build files], + [ installbuilddir=$withval ] ) AC_SUBST(installbuilddir) AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the library], @@ -346,6 +346,11 @@ [APR_ADDTO(CFLAGS,-g) if test "$GCC" = "yes"; then APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations]) + case `($CC --version) 2>/dev/null` in + *clang-900* | *"clang version 5.0.0"*) + APR_ADDTO(CFLAGS,[-Wno-error=strict-prototypes]) + ;; + esac elif test "$AIX_XLC" = "yes"; then APR_ADDTO(CFLAGS,-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro) fi @@ -546,6 +551,11 @@ ;; esac ;; + *apple-darwin*) + ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync() + OSDIR="unix" + eolstr="\\n" + ;; *os390) OSDIR="os390" OBJECTS_PLATFORM='$(OBJECTS_os390)' @@ -573,6 +583,11 @@ OSDIR="unix" eolstr="\\n" ;; + *darwin* ) + ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync() + OSDIR="unix" + eolstr="\\n" + ;; *) OSDIR="unix" eolstr="\\n" @@ -846,6 +861,22 @@ [ AC_MSG_ERROR(Electric Fence requested but not detected) ]) ]) +AC_ARG_WITH(valgrind, + [ --with-valgrind[[=DIR]] Enable code to teach valgrind about apr pools + (optionally: set path to valgrind headers) ], + [ if test "$withval" != no; then + if test "$withval" = yes; then + withval=/usr/include/valgrind + fi + APR_ADDTO(CPPFLAGS, -I$withval) + AC_CHECK_HEADERS(valgrind.h memcheck.h) + APR_IFALLYES(header:valgrind.h header:memcheck.h, + [AC_DEFINE(HAVE_VALGRIND, 1, [Compile in valgrind support]) ], + [AC_MSG_ERROR(valgrind headers not found) ] + ) + fi ] +) + AC_CHECK_FUNCS(sigsuspend, [ have_sigsuspend="1" ], [ have_sigsuspend="0" ]) AC_CHECK_FUNCS(sigwait, [ have_sigwait="1" ], [ have_sigwait="0" ]) dnl AC_CHECK_FUNCS doesn't work for this on Tru64 since the function @@ -1131,9 +1162,17 @@ #endif";; esac -AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h windows.h]) +AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/ipc.h sys/mutex.h \ + sys/shm.h sys/file.h sys/socket.h kernel/OS.h os2.h windows.h]) +AC_CHECK_HEADERS([net/if.h],[],[], +[ +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#include +]) AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ - create_area]) + create_area mprotect]) APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) AC_CHECK_FILE(/dev/zero) @@ -1581,6 +1620,27 @@ fi ] ) +AC_ARG_ENABLE(allocator-guard-pages, + [ --enable-allocator-guard-pages Use guard pages in apr_allocator + (implies --enable-allocator-uses-mmap) ] , + [ if test "$enableval" = "yes"; then + APR_IFALLYES(header:sys/mman.h func:mmap func:munmap func:mprotect define:MAP_ANON, + [AC_DEFINE(APR_ALLOCATOR_GUARD_PAGES, 1, + [Define if apr_allocator should use guard pages]) ], + [AC_MSG_ERROR([mmap()/MAP_ANON/mprotect() not supported]) ] + ) + fi ] +) + + +AC_ARG_ENABLE(pool-concurrency-check, + [ --enable-pool-concurrency-check Check for concurrent usage of memory pools], + [ if test "$enableval" = "yes"; then + AC_DEFINE(APR_POOL_CONCURRENCY_CHECK, 1, + [Define if pool functions should abort if concurrent usage is detected]) + fi ] +) + dnl ----------------------------- Checks for standard typedefs AC_TYPE_OFF_T AC_TYPE_PID_T @@ -2695,6 +2755,7 @@ APR_CHECK_WORKING_GETNAMEINFO APR_CHECK_SOCKADDR_IN6 APR_CHECK_SOCKADDR_STORAGE +APR_CHECK_SOCKADDR_UN have_ipv6="0" if test "$user_disabled_ipv6" = 1; then diff -Nru apr-1.5.2/debian/changelog apr-1.6.5/debian/changelog --- apr-1.5.2/debian/changelog 2015-08-20 11:47:59.000000000 +0000 +++ apr-1.6.5/debian/changelog 2020-10-08 21:11:14.000000000 +0000 @@ -1,3 +1,75 @@ +apr (1.6.5-1~16.04.sav0) xenial; urgency=medium + + * Backport to Xenial + * debian/compat: Set compat level to 10 (Launchpad sbuild highest for Xenial) + + -- Rob Savoury Thu, 08 Oct 2020 14:11:14 -0700 + +apr (1.6.5-1) unstable; urgency=medium + + * New upstream release + * Bump Standards-Version (no changes). + + -- Stefan Fritsch Mon, 19 Nov 2018 13:28:03 +0100 + +apr (1.6.3-3) unstable; urgency=medium + + * Backport fix for undefined behavior in teststr from upstream 1.7. + Fixes FTBFS with gcc 8. Closes: #897705 + * Migrate from alioth to salsa + + -- Stefan Fritsch Tue, 17 Jul 2018 21:17:00 +0200 + +apr (1.6.3-2) unstable; urgency=medium + + * Avoid empty build target, fixes FTBFS. Thanks to Niels Thykier for the + patch. Closes: #888593 + * Drop deprecated autotools-dev sequence. Thanks to Niels Thykier for the + patch. + * Switch to debhelper compat level 11 and use dh_autoreconf. + * Include NOTICE file in packages, as required by license. + * Bump Standards-Version (no changes). + + -- Stefan Fritsch Sun, 25 Feb 2018 16:35:41 +0100 + +apr (1.6.3-1) unstable; urgency=medium + + * New upstream version + - Fixes CVE-2017-12613: Out-of-bounds array deref in apr_time_exp* + functions. Closes: #879708 + * Replace obsolete priority extra with optional. + + -- Stefan Fritsch Mon, 06 Nov 2017 20:07:42 +0100 + +apr (1.6.2-1) unstable; urgency=medium + + * New upstream version + * Remove Peter Samuelson from uploaders. Thanks for your work in the past. + Closes: #852222 + + -- Stefan Fritsch Fri, 04 Aug 2017 16:39:16 +0200 + +apr (1.5.2-5) unstable; urgency=medium + + [ Helmut Grohne ] + * Fix FTCBFS: (Closes: #840891) + + Annotate Build-Depends: python with :any + + cross.patch: Build gen_test_char with the build arch compiler + + -- Stefan Fritsch Sat, 10 Dec 2016 17:41:09 +0100 + +apr (1.5.2-4) unstable; urgency=medium + + [ Jean-Michel Vourgère ] + * Update Vcs-Browser: address. + * d/watch: Check gpg signature of upstream source. + + [ Stefan Fritsch ] + * Run buildconf with LC_ALL=C to fix some reproducible build issues. + * Bump Standards-Version (no changes) + + -- Stefan Fritsch Sun, 29 May 2016 15:44:28 +0200 + apr (1.5.2-3) unstable; urgency=medium * Use flock for apr_file_lock()/_unlock(). This has the advantage that diff -Nru apr-1.5.2/debian/compat apr-1.6.5/debian/compat --- apr-1.5.2/debian/compat 2015-08-15 11:09:19.000000000 +0000 +++ apr-1.6.5/debian/compat 2020-10-08 21:11:14.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru apr-1.5.2/debian/control apr-1.6.5/debian/control --- apr-1.5.2/debian/control 2015-08-15 11:39:06.000000000 +0000 +++ apr-1.6.5/debian/control 2018-11-19 12:27:03.000000000 +0000 @@ -2,11 +2,11 @@ Section: libs Priority: optional Maintainer: Debian Apache Maintainers -Uploaders: Peter Samuelson , Stefan Fritsch -Build-Depends: debhelper (>= 9), autoconf, autotools-dev, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python, libsctp-dev [linux-any] -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apr.git -Vcs-Git: git://anonscm.debian.org/pkg-apache/apr.git +Uploaders: Stefan Fritsch +Build-Depends: debhelper (>= 11), autoconf, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python:any, libsctp-dev [linux-any] +Standards-Version: 4.2.1 +Vcs-Browser: https://salsa.debian.org/apache-team/apr +Vcs-Git: https://salsa.debian.org/apache-team/apr.git Homepage: http://apr.apache.org/ Package: libapr1 @@ -36,7 +36,6 @@ Package: libapr1-dbg Architecture: any Section: debug -Priority: extra Multi-Arch: same Depends: libapr1 (= ${binary:Version}), ${misc:Depends} Description: Apache Portable Runtime Library - Debugging Symbols diff -Nru apr-1.5.2/debian/libapr1-dbg.docs apr-1.6.5/debian/libapr1-dbg.docs --- apr-1.5.2/debian/libapr1-dbg.docs 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/debian/libapr1-dbg.docs 2018-11-19 12:13:02.000000000 +0000 @@ -0,0 +1 @@ +NOTICE diff -Nru apr-1.5.2/debian/libapr1-dev.docs apr-1.6.5/debian/libapr1-dev.docs --- apr-1.5.2/debian/libapr1-dev.docs 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/debian/libapr1-dev.docs 2018-11-19 12:13:02.000000000 +0000 @@ -0,0 +1 @@ +NOTICE diff -Nru apr-1.5.2/debian/libapr1.docs apr-1.6.5/debian/libapr1.docs --- apr-1.5.2/debian/libapr1.docs 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/debian/libapr1.docs 2018-11-19 12:13:02.000000000 +0000 @@ -0,0 +1 @@ +NOTICE diff -Nru apr-1.5.2/debian/patches/apr_mcast_v6.patch apr-1.6.5/debian/patches/apr_mcast_v6.patch --- apr-1.5.2/debian/patches/apr_mcast_v6.patch 2015-08-16 14:24:26.000000000 +0000 +++ apr-1.6.5/debian/patches/apr_mcast_v6.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- apr.orig/network_io/unix/multicast.c -+++ apr/network_io/unix/multicast.c -@@ -62,7 +62,7 @@ static unsigned int find_if_index(const - for (ifp = ifs; ifp; ifp = ifp->ifa_next) { - if (ifp->ifa_addr != NULL && ifp->ifa_addr->sa_family == AF_INET6) { - if (memcmp(&iface->sa.sin6.sin6_addr, -- &ifp->ifa_addr->sa_data[0], -+ &((struct sockaddr_in6*)ifp->ifa_addr)->sin6_addr, - sizeof(iface->sa.sin6.sin6_addr)) == 0) { - index = if_nametoindex(ifp->ifa_name); - break; diff -Nru apr-1.5.2/debian/patches/cross.patch apr-1.6.5/debian/patches/cross.patch --- apr-1.5.2/debian/patches/cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/debian/patches/cross.patch 2018-11-19 12:14:48.000000000 +0000 @@ -0,0 +1,37 @@ +From: Helmut Grohne +Subject: compile gen_test_char with the build architecture compiler + +--- apr.orig/Makefile.in ++++ apr/Makefile.in +@@ -8,6 +8,7 @@ top_blddir=@apr_builddir@ + # APR (Apache Portable Runtime) library Makefile. + # + CPP = @CPP@ ++CC_FOR_BUILD ?= cc + + # get substituted into some targets + APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ +@@ -46,7 +47,6 @@ LT_VERSION = @LT_VERSION@ + + CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ + build/apr_rules.out tools/gen_test_char@EXEEXT@ \ +- tools/gen_test_char.o tools/gen_test_char.lo \ + include/private/apr_escape_test_char.h + DISTCLEAN_TARGETS = config.cache config.log config.status \ + include/apr.h include/arch/unix/apr_private.h \ +@@ -141,13 +141,9 @@ check: $(TARGET_LIB) + etags: + etags `find . -name '*.[ch]'` + +-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) +-tools/gen_test_char.lo: tools/gen_test_char.c ++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c + $(APR_MKDIR) tools +- $(LT_COMPILE) +- +-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) +- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $< + + include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ + $(APR_MKDIR) include/private diff -Nru apr-1.5.2/debian/patches/debug_testpoll_failure.patch apr-1.6.5/debian/patches/debug_testpoll_failure.patch --- apr-1.5.2/debian/patches/debug_testpoll_failure.patch 2015-08-20 07:10:32.000000000 +0000 +++ apr-1.6.5/debian/patches/debug_testpoll_failure.patch 2018-11-19 12:14:23.000000000 +0000 @@ -4,7 +4,7 @@ # add some debug output --- apr.orig/test/testpoll.c +++ apr/test/testpoll.c -@@ -871,6 +871,9 @@ static void justsleep(abts_case *tc, voi +@@ -908,6 +908,9 @@ static void justsleep(abts_case *tc, voi rv = apr_pollcb_poll(pollcb, apr_time_from_msec(200), NULL, NULL); t2 = apr_time_now(); ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv)); diff -Nru apr-1.5.2/debian/patches/fix_doxygen.patch apr-1.6.5/debian/patches/fix_doxygen.patch --- apr-1.5.2/debian/patches/fix_doxygen.patch 2015-08-15 11:13:24.000000000 +0000 +++ apr-1.6.5/debian/patches/fix_doxygen.patch 2018-11-19 12:13:02.000000000 +0000 @@ -18,7 +18,7 @@ FILE_PATTERNS=*.h --- apr.orig/include/apr.h.in +++ apr/include/apr.h.in -@@ -445,11 +445,11 @@ typedef apr_uint32_t apr_uin +@@ -446,11 +446,11 @@ typedef apr_uint32_t apr_uin /** * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, * so that they follow the platform's calling convention. @@ -34,7 +34,7 @@ */ #define APR_THREAD_FUNC @apr_thread_func@ -@@ -483,11 +483,11 @@ typedef apr_uint32_t apr_uin +@@ -484,11 +484,11 @@ typedef apr_uint32_t apr_uin * APR_DECLARE_NONSTD(), as they must follow the C language calling convention. * @see APR_DECLARE @see APR_DECLARE_DATA * @remark Both the declaration and implementations must use the same macro. @@ -50,7 +50,7 @@ */ #define APR_DECLARE_NONSTD(type) type -@@ -498,12 +498,12 @@ typedef apr_uint32_t apr_uin +@@ -499,12 +499,12 @@ typedef apr_uint32_t apr_uin * @remark Note that the declaration and implementations use different forms, * but both must include the macro. * diff -Nru apr-1.5.2/debian/patches/hurd_path_max.patch apr-1.6.5/debian/patches/hurd_path_max.patch --- apr-1.5.2/debian/patches/hurd_path_max.patch 2015-08-15 11:13:02.000000000 +0000 +++ apr-1.6.5/debian/patches/hurd_path_max.patch 2018-11-19 12:13:02.000000000 +0000 @@ -7,7 +7,7 @@ --- apr.orig/include/apr.h.in +++ apr/include/apr.h.in -@@ -610,7 +610,8 @@ typedef int apr_wait_t; +@@ -611,7 +611,8 @@ typedef int apr_wait_t; #elif defined(_POSIX_PATH_MAX) #define APR_PATH_MAX _POSIX_PATH_MAX #else diff -Nru apr-1.5.2/debian/patches/hurd_shm_flock.patch apr-1.6.5/debian/patches/hurd_shm_flock.patch --- apr-1.5.2/debian/patches/hurd_shm_flock.patch 2015-08-15 11:14:14.000000000 +0000 +++ apr-1.6.5/debian/patches/hurd_shm_flock.patch 2018-11-19 12:14:05.000000000 +0000 @@ -10,7 +10,7 @@ --- apr.orig/configure.in +++ apr/configure.in -@@ -1213,6 +1213,13 @@ case $host in +@@ -1252,6 +1252,13 @@ case $host in APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON) ;; esac @@ -24,7 +24,7 @@ APR_END_DECISION AC_DEFINE_UNQUOTED($ac_decision) -@@ -1286,6 +1293,13 @@ case $host in +@@ -1325,6 +1332,13 @@ case $host in fi ;; esac @@ -38,7 +38,7 @@ APR_END_DECISION AC_DEFINE_UNQUOTED($ac_decision) -@@ -2262,6 +2276,12 @@ APR_IFALLYES(header:OS.h func:create_sem +@@ -2322,6 +2336,12 @@ APR_IFALLYES(header:OS.h func:create_sem if test "x$apr_lock_method" != "x"; then APR_DECISION_FORCE($apr_lock_method) fi diff -Nru apr-1.5.2/debian/patches/libtoolize_check.patch apr-1.6.5/debian/patches/libtoolize_check.patch --- apr-1.5.2/debian/patches/libtoolize_check.patch 2015-08-15 11:09:19.000000000 +0000 +++ apr-1.6.5/debian/patches/libtoolize_check.patch 2018-11-19 12:13:02.000000000 +0000 @@ -4,11 +4,9 @@ libtool is now in package libtool-bin, but apr only needs libtoolize. -Index: apr-1.5.1/build/buildcheck.sh -=================================================================== ---- apr-1.5.1.orig/build/buildcheck.sh 2009-11-13 01:27:16.000000000 +0100 -+++ apr-1.5.1/build/buildcheck.sh 2014-09-19 12:33:14.000000000 +0200 -@@ -37,11 +37,11 @@ +--- apr.orig/build/buildcheck.sh ++++ apr/build/buildcheck.sh +@@ -39,11 +39,11 @@ fi # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a # output is multiline from 1.5 onwards @@ -19,8 +17,8 @@ +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` +lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then --echo "buildconf: libtool not found." -+echo "buildconf: libtoolize not found." - echo " You need libtool version 1.4 or newer installed" - echo " to build APR from SVN." - exit 1 +- echo "buildconf: libtool not found." ++ echo "buildconf: libtoolize not found." + echo " You need libtool version 1.4 or newer installed" + echo " to build APR from SVN." + res=1 diff -Nru apr-1.5.2/debian/patches/series apr-1.6.5/debian/patches/series --- apr-1.5.2/debian/patches/series 2015-08-20 11:37:49.000000000 +0000 +++ apr-1.6.5/debian/patches/series 2018-11-19 12:15:38.000000000 +0000 @@ -7,6 +7,6 @@ hurd_shm_flock.patch dont_override_external_buildflags libtoolize_check.patch -apr_mcast_v6.patch debug_testpoll_failure.patch use_fcntl_locking.patch +cross.patch diff -Nru apr-1.5.2/debian/patches/ship_find_apr.m4.patch apr-1.6.5/debian/patches/ship_find_apr.m4.patch --- apr-1.5.2/debian/patches/ship_find_apr.m4.patch 2015-08-15 11:12:40.000000000 +0000 +++ apr-1.6.5/debian/patches/ship_find_apr.m4.patch 2018-11-19 12:13:47.000000000 +0000 @@ -7,15 +7,15 @@ --- apr.orig/Makefile.in +++ apr/Makefile.in -@@ -92,6 +92,15 @@ install: $(TARGETS) - done - $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk +@@ -95,6 +95,15 @@ install: $(TARGETS) + $(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir) + $(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir) $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG) + + if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \ + $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \ + fi -+ for file in find_apr.m4 apr_common.m4 install.sh gen-build.py get-version.sh ; do \ ++ for file in install.sh gen-build.py get-version.sh ; do \ + $(LIBTOOL) --mode=install cp $(top_srcdir)/build/$$file \ + $(DESTDIR)$(installbuilddir)/$$file ; \ + done diff -Nru apr-1.5.2/debian/rules apr-1.6.5/debian/rules --- apr-1.5.2/debian/rules 2015-08-16 11:12:41.000000000 +0000 +++ apr-1.6.5/debian/rules 2018-11-19 12:13:02.000000000 +0000 @@ -14,8 +14,12 @@ # The 'build' target needs special handling because there there is a directory # named 'build'. .PHONY: build +# The build target must not be empty. Sadly because of how make +# works, we have do duplicate the target in this case. +build: + dh $@ -B$(BUILDDIR) %: - dh $@ -B$(BUILDDIR) --parallel --with autotools_dev + dh $@ -B$(BUILDDIR) # # configure @@ -69,13 +73,11 @@ endif endif -# files that are modified by buildconf and need to be restored during clean -SAVE_FILES := configure build/libtool.m4 build/ltmain.sh +override_dh_autoreconf: + LC_ALL=C dh_autoreconf ./buildconf override_dh_auto_configure: mkdir -p $(BUILDDIR)/docs - for f in $(SAVE_FILES) ; do [ -e $$f.dr-orig ] || cp -p $$f $$f.dr-orig ; done - ./buildconf # We need to force the use of bash here. Otherwise, if apr is built with # /bin/sh -> /bin/bash, the resulting libtool will not work on systems # where /bin/sh -> /bin/dash. @@ -154,4 +156,3 @@ override_dh_auto_clean: dh_auto_clean rm -rf $(BUILDDIR) - for f in $(SAVE_FILES) ; do [ ! -e $$f.dr-orig ] || mv $$f.dr-orig $$f ; done diff -Nru apr-1.5.2/debian/symbols.common apr-1.6.5/debian/symbols.common --- apr-1.5.2/debian/symbols.common 2015-08-15 11:09:19.000000000 +0000 +++ apr-1.6.5/debian/symbols.common 2018-11-19 12:13:02.000000000 +0000 @@ -5,6 +5,7 @@ apr__SHA256_Init@Base 1.2.7 apr__SHA256_Transform@Base 1.2.7 apr__SHA256_Update@Base 1.2.7 + apr_allocator_align@Base 1.6.2 apr_allocator_alloc@Base 1.2.7 apr_allocator_create@Base 1.2.7 apr_allocator_destroy@Base 1.2.7 @@ -39,6 +40,21 @@ apr_collapse_spaces@Base 1.2.7 apr_cpystrn@Base 1.2.7 apr_crypto_sha256_new@Base 1.2.7 + apr_cstr_atoi64@Base 1.6.2 + apr_cstr_atoi@Base 1.6.2 + apr_cstr_atoui64@Base 1.6.2 + apr_cstr_atoui@Base 1.6.2 + apr_cstr_casecmp@Base 1.6.2 + apr_cstr_casecmpn@Base 1.6.2 + apr_cstr_count_newlines@Base 1.6.2 + apr_cstr_match_glob_list@Base 1.6.2 + apr_cstr_match_list@Base 1.6.2 + apr_cstr_skip_prefix@Base 1.6.2 + apr_cstr_split@Base 1.6.2 + apr_cstr_split_append@Base 1.6.2 + apr_cstr_strtoi64@Base 1.6.2 + apr_cstr_strtoui64@Base 1.6.2 + apr_cstr_tokenize@Base 1.6.2 apr_ctime@Base 1.2.7 apr_day_snames@Base 1.2.7 apr_dir_close@Base 1.2.7 @@ -58,6 +74,7 @@ apr_escape_echo@Base 1.5.0 apr_escape_entity@Base 1.5.0 apr_escape_hex@Base 1.5.0 + apr_escape_ldap@Base 1.6.2 apr_escape_path@Base 1.5.0 apr_escape_path_segment@Base 1.5.0 apr_escape_shell@Base 1.5.0 @@ -99,6 +116,7 @@ apr_file_perms_set@Base 1.2.7 apr_file_pipe_create@Base 1.2.7 apr_file_pipe_create_ex@Base 1.3.2 + apr_file_pipe_create_pools@Base 1.6.2 apr_file_pipe_timeout_get@Base 1.2.7 apr_file_pipe_timeout_set@Base 1.2.7 apr_file_pool_get@Base 1.2.7 @@ -145,7 +163,9 @@ apr_global_mutex_destroy@Base 1.2.7 apr_global_mutex_lock@Base 1.2.7 apr_global_mutex_lockfile@Base 1.4.2 + apr_global_mutex_mech@Base 1.6.2 apr_global_mutex_name@Base 1.4.2 + apr_global_mutex_perms_set@Base 1.6.2 apr_global_mutex_pool_get@Base 1.2.7 apr_global_mutex_trylock@Base 1.2.7 apr_global_mutex_unlock@Base 1.2.7 @@ -204,7 +224,9 @@ apr_os_pipe_put@Base 1.2.7 apr_os_pipe_put_ex@Base 1.2.7 apr_os_proc_mutex_get@Base 1.2.7 + apr_os_proc_mutex_get_ex@Base 1.6.2 apr_os_proc_mutex_put@Base 1.2.7 + apr_os_proc_mutex_put_ex@Base 1.6.2 apr_os_shm_get@Base 1.2.7 apr_os_shm_put@Base 1.2.7 apr_os_sock_get@Base 1.2.7 @@ -226,24 +248,29 @@ apr_pescape_echo@Base 1.5.0 apr_pescape_entity@Base 1.5.0 apr_pescape_hex@Base 1.5.0 + apr_pescape_ldap@Base 1.6.2 apr_pescape_path@Base 1.5.0 apr_pescape_path_segment@Base 1.5.0 apr_pescape_shell@Base 1.5.0 apr_pescape_urlencoded@Base 1.5.0 apr_pmemdup@Base 1.2.7 apr_poll@Base 1.2.7 + apr_poll_close_wakeup_pipe@Base 1.6.2 + apr_poll_create_wakeup_pipe@Base 1.6.2 + apr_poll_drain_wakeup_pipe@Base 1.6.2 apr_poll_method_defname@Base 1.4.2 apr_pollcb_add@Base 1.3.2 apr_pollcb_create@Base 1.3.2 apr_pollcb_create_ex@Base 1.4.2 + apr_pollcb_method_name@Base 1.6.2 apr_pollcb_poll@Base 1.3.2 apr_pollcb_provider_poll@Base 1.4.2 apr_pollcb_remove@Base 1.3.2 + apr_pollcb_wakeup@Base 1.6.2 apr_pollset_add@Base 1.2.7 apr_pollset_create@Base 1.2.7 apr_pollset_create_ex@Base 1.4.2 apr_pollset_destroy@Base 1.2.7 - apr_pollset_drain_wakeup_pipe@Base 1.4.2 apr_pollset_method_name@Base 1.4.2 apr_pollset_poll@Base 1.2.7 apr_pollset_provider_poll@Base 1.4.2 @@ -290,7 +317,9 @@ apr_proc_mutex_destroy@Base 1.2.7 apr_proc_mutex_lock@Base 1.2.7 apr_proc_mutex_lockfile@Base 1.2.7 + apr_proc_mutex_mech@Base 1.6.2 apr_proc_mutex_name@Base 1.2.7 + apr_proc_mutex_perms_set@Base 1.6.2 apr_proc_mutex_pool_get@Base 1.2.7 apr_proc_mutex_trylock@Base 1.2.7 apr_proc_mutex_unix_setup_lock@Base 1.2.7 @@ -315,6 +344,7 @@ apr_procattr_group_set@Base 1.2.7 apr_procattr_io_set@Base 1.2.7 apr_procattr_limit_set@Base 1.2.7 + apr_procattr_perms_set_register@Base 1.6.2 apr_procattr_user_set@Base 1.2.7 apr_psprintf@Base 1.2.7 apr_pstrcat@Base 1.2.7 @@ -342,8 +372,10 @@ apr_shm_baseaddr_get@Base 1.2.7 apr_shm_create@Base 1.2.7 apr_shm_create_ex@Base 1.5.0 + apr_shm_delete@Base 1.6.2 apr_shm_destroy@Base 1.2.7 apr_shm_detach@Base 1.2.7 + apr_shm_perms_set@Base 1.6.2 apr_shm_pool_get@Base 1.2.7 apr_shm_remove@Base 1.2.7 apr_shm_size_get@Base 1.2.7 @@ -353,28 +385,41 @@ apr_signal_init@Base 1.2.7 apr_signal_thread@Base 1.2.7 apr_signal_unblock@Base 1.2.7 + apr_skiplist_add@Base 1.6.2 + apr_skiplist_add_compare@Base 1.6.2 apr_skiplist_add_index@Base 1.5.0 apr_skiplist_alloc@Base 1.5.0 apr_skiplist_destroy@Base 1.5.0 + apr_skiplist_element@Base 1.6.2 apr_skiplist_find@Base 1.5.0 apr_skiplist_find_compare@Base 1.5.0 apr_skiplist_free@Base 1.5.0 apr_skiplist_getlist@Base 1.5.0 + apr_skiplist_height@Base 1.6.2 apr_skiplist_init@Base 1.5.0 apr_skiplist_insert@Base 1.5.0 apr_skiplist_insert_compare@Base 1.5.0 + apr_skiplist_last@Base 1.6.2 + apr_skiplist_last_compare@Base 1.6.2 apr_skiplist_merge@Base 1.5.0 apr_skiplist_next@Base 1.5.0 apr_skiplist_peek@Base 1.5.0 apr_skiplist_pop@Base 1.5.0 + apr_skiplist_preheight@Base 1.6.2 apr_skiplist_previous@Base 1.5.0 apr_skiplist_remove@Base 1.5.0 apr_skiplist_remove_all@Base 1.5.0 apr_skiplist_remove_compare@Base 1.5.0 + apr_skiplist_remove_node@Base 1.6.2 + apr_skiplist_replace@Base 1.6.2 + apr_skiplist_replace_compare@Base 1.6.2 apr_skiplist_set_compare@Base 1.5.0 + apr_skiplist_set_preheight@Base 1.6.2 + apr_skiplist_size@Base 1.6.2 apr_sleep@Base 1.2.7 apr_snprintf@Base 1.2.7 apr_sockaddr_equal@Base 1.2.7 + apr_sockaddr_info_copy@Base 1.6.2 apr_sockaddr_info_get@Base 1.2.7 apr_sockaddr_ip_get@Base 1.2.7 apr_sockaddr_ip_getbuf@Base 1.3.2 @@ -395,6 +440,7 @@ apr_socket_listen@Base 1.2.7 apr_socket_opt_get@Base 1.2.7 apr_socket_opt_set@Base 1.2.7 + apr_socket_perms_set@Base 1.6.2 apr_socket_pool_get@Base 1.2.7 apr_socket_protocol_get@Base 1.2.7 apr_socket_recv@Base 1.2.7 diff -Nru apr-1.5.2/debian/upstream/signing-key.asc apr-1.6.5/debian/upstream/signing-key.asc --- apr-1.5.2/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/debian/upstream/signing-key.asc 2018-11-19 12:13:02.000000000 +0000 @@ -0,0 +1,4295 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +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 +giHHgts/tXLZ+M90qjdUuWL4yPHQ13S1vr0qbVTzsI9s7d15bEhqsaLEqq/v6/rG +frxb+qDXLojqNls3u5+l1X192moMjuWe7Druc6rWTN4+io3Re9pcp9zmczPYKYl2 +OAu1h+wVspV7empMniO1MiEy2ByhDldxU6wLKACEfTzyB464o9gbvTaidfPmWcSs +bUog0QpYoLoFF0aLQPLCF7AnSFJHCkMQi+RXiswFABEBAAGJASUEGAECAA8FAkis +AiQCGwwFCRLMAwAACgkQ6OfgC02qGYi7Dwf+NAXykTPj0/TCfMxLcos6Rdwz3itB +NPJfQovCu7ExrlKTYhOv4IaBI2kRs6bLY1Ra76ib80gD6I6WgzRttYBkENQ5tDQQ +xsIjw//rTC9Qusk6PzQzBYhOoFXiHkcHar+BL7VzEjD36iPoLAYuLUaoV4hUpF4s +T1pIrAueNWJYySi9z7PH1M3lmn1nkrWcYMsNc5xyiv1jMuCPHqV9hoReenSseOgb +j0k8PPaIDmXgpfWPggzUS6iLz+j5XQbjprPlSoUMTt7nviTKBj/1ep8sFYQkqeL5 ++ec4iuXwAgzbuHeTXBS0WAmivM2zYYYSmP6RTYDbvOYtaovl+oPNjjlJspkBogQ3 +FJfUEQQA5ebRfJDg9LnXZZ5farGhu9P4cLoxk7ElwE56qC7Hk7FjkaFV36AZJaJB +ABpk9vgpfFyF2d9Vofhmidwk2xL/DpNb2qTrfpbT4Dis2RAeLj9uRG4Qti1n/pVK +Gn3Hdl4tCgVeH6l6hBLgxj9UwHWepOzVaoKY72yeU3ai9C61jjsAoP9G+Pv6f2r0 +K/rmUVNq3ZmLv2/9A/9i543BKlI7LJYdnvZtDoALvoJ2AJkB+g256foipY331jwo +cCDBWXf+xZxjs2A86Kp80xcgOFROTx1i+tVdpaRyVgdtSvQ+q2xHMdImAQBx8WUB +JsUgVOj5hp2xftj+7wtCc/YGeXQm47Rm6GMXdNP10JWcArPIx7nk6Un8fZ+3WAQA +haVvr9qUpRtEXokulJbd4GhlosPNQ9JxVbwqeQZcYEA8pshdTEuhWwo/4BRiC6LD +IZbCB0xWgtAw9C0l8jda5tMpD74vr1CyJSjScFu3wovt949QM8fs3zDXjk+b6gHx +enL7Geqj2/QnGL1OIxCr5KLwNVN4zBXoanBpE1ebH720HkppbSBKYWdpZWxza2kg +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 +xcyYOIfwG0w8bdHwvbXHzQoXOc2IRgQQEQIABgUCR/29kwAKCRBz3YwWAVMCNZkG +AJ9mvCQOsqdwdziaqTEuT4OK1mbmhwCgkNV9ZRLDLIkEAftsdO3HdYUhFiyIRgQQ +EQIABgUCR/3EbAAKCRAYOB/XSxvmmLKsAJ4zjwyIJhl5EDhiO6ClIoq8Ds85qACg +v+L8tAoLyEuRe2gv6UTToMlOPjSIRgQSEQIABgUCR/0qYAAKCRCLlilD/CQ/PGTN +AJ0ZevgZ2NN4XEjxNjmDlSVZSq/kxgCdG/lcFEkoseJ1903jY+tY/U16SgWIRgQT +EQIABgUCR/4LYwAKCRCBLyCFwtUL+0AgAJ9pQJnn/B9q3HO3cHb7YlMbhccf8QCe +KyVlbzC+xZUKXbluId+S7wmX/ceIRgQTEQIABgUCR/+ioQAKCRBMBCgYMRo95T02 +AJsGhnYDZXT1Gf3gkLvXWVJh713FuQCeMKE6JRZBeVFHnqa0OwJ5CTnbKN2IawQT +EQIAKwUCR/0mESQaaHR0cHM6Ly93d3cuY2FjZXJ0Lm9yZy9jcHMucGhwI3A1LjIA +CgkQf1hPnk3Z0cSyxACgwQnZBuqT+ID5bpu9sBX8NzMj7mEAoJDlJuZ7CIRy5fh5 +SG4/u3L4ZPGiiMYEEBECAIYFAkf+RdsxHERyLiBUaG9tYXMgVmFuZGFobCA8dGhv +bWFzLnZhbmRhaGxAY29udGVjLWR0LmRlPiQcVGhvbWFzIFZhbmRhaGwgPHRob21h +c0B2YW5kYWhsLm9yZz4oHFRob21hcyBWYW5kYWhsIChBcGFjaGUpIDx0dkBhcGFj +aGUub3JnPgAKCRAuuUaCiIF0Ah78AJ9aW6m9j6+xpwfi16tu6l9BWzkr3ACePpx2 +hzIXzJ8nTaRJx7Pd8FPN9b6IRgQQEQIABgUCSAU+4AAKCRCOo7BoTHZX8eZLAJ4j +l50lRmUxktLkxhpDwl5O0yq2rQCg06xPgXRMoS+Zhe+HTbOwDgfjd4CIRgQTEQIA +BgUCSAPV/AAKCRAsgtvmx4Dir6TKAJsHjUCop7ww9LkUlmh1cZkjlpkVNQCdHpl+ +AGSiourW/6/aNRlevkpbtPyIRgQQEQIABgUCR/9L0AAKCRA8mkIEDAiFtMPdAJ0S +A2RjOJJ9zlNYv7NJ/echLSKDOgCeMPTHhQ7tTMe92++jttHSIezIYTOIRgQQEQIA +BgUCSA9GDwAKCRAYYcMixWAUsoaoAJ44w/5Dexrska4AJD3S2lW9crCuYACffHQi +HmrHMCngaO0BiIdvj7bcNIuIRgQQEQIABgUCSCIVgAAKCRAPRQomYhC/wKt4AJ90 +yZLHPc3KU2Iup3AZ+tU0shSOCgCeK2P2lBuSwY0lHeLDnWOjZvdAz4mIRgQTEQIA +BgUCSAnvLwAKCRDegOZWGfkpGD7YAJ0btk0kqsZhnspzywknvx0Cr++spQCggfqx +B1bJhcuYkR0NVzj4UVOER3WIcgQQEQIAMgUCSAtk1yscQmVybmQgRm9uZGVybWFu +biAoQVNGKSA8YmVybmRmQGFwYWNoZS5vcmc+AAoJELOX3RpTbavtXesAn3CgllZ1 +zrLPoPioj8cPGCEVD5SBAJ4+/Obot45VrS0D5L5x3xt3B18kVYkCHAQQAQIABgUC +SEQD9QAKCRAZPxgKtV2Zdx+3D/9v2E4sNuBlJkzguiXBDVkQ5HHDNK2jyqaYvR4M +fNQjfkb4LyktpOtIcaneVUrz+IqCrvNQRMA7wD671OToUDKEeOhXNoS/U7JZRg8F +6l2Anr6jwpgGT55Mo1fUanj7GjoFKiZYWU8vItfMWlMCLWUJWJ5roDZez7qDJCT2 +5FYW/wxKN95xG3XzvjPxG+2cPwphQRTEyqN78cipjyOPGWUKL0d/dU+IcDfo3bdB ++2/423lPNBLTJ707WCBAJQVl/1kQTGj8BS9UQvovmlEyYyEpdEPJMIq8JVPdtD5t +ZzwszUXkzvaq/Klz7VVOizNLrf2uC23xHzclOfRtF/S33dTqdqARP9LIE9OQYPWK +LGoPjLhlGiNrqFlXqAP4UwN2OfLajFlINS3R0BSgg+kLX00Xq0o7yIxIr622lS0W ++BflNSsQY8KCw/5KPj3fCXIvEYpXiF04U4kJ1OeQwljk1K0BKAco4SwWB+QhW2zd +nD+OYRdxRDqFnZbrsiUvn+acA4DTG9OBia415tNGgDEsWAmrXpHJKZBIOoUUI3F4 +A9KNZQmKKVmsKjvDoP7c6XfWV6YGuMJyV6/JuuLhZcgO00+yhSb0kacC1ltQIW4F +dLwmH6AY3qH5ZviYRwrbcJWXy4koAS0IFxYgNhORncj8Glc3oPdUtFDoCz4gCfAt +rP1FLohGBBARAgAGBQJIWTynAAoJENUzTnWxMT3iP8oAn2KjBQayyERPPCxi/Jgv +vOJKYC44AJ9LOLeLXA0AS8KB9oKmqVLmC8A2cLQfSmltIEphZ2llbHNraSA8amlt +QGphZ3VORVQuY29tPohTBBARAgALBQI6yh1qBAsDAgEAEgkQizpgHwjJdeUHZUdQ +RwABAWo5AKC9sDSrBKK8S4WUAD0TWvJHL+bmggCgnCr1geUyID713PSiMru2MH2I +i4OIRgQQEQIABgUCPd09pQAKCRAhRUrwzIsPfjVHAJ9CvUPXj5J1jR7kG+J5E73u +5G2H9gCfSUeeUKEFywAu8uI2/YMWqjnSzMGIRgQQEQIABgUCPZnFawAKCRBENFay +p7vgnM50AKCJHJqzPhwAM8xGuzbdFhaNHy13OgCfT/I2r6lFcYFq8dac2IjsSPeM +YS+IRgQQEQIABgUCPdxJ3AAKCRBVkeLAZmTAeEzfAJ0Td2jB8Ck7Q1iT0Vh3DUHx +YKORjwCeOXjFrT8sztg8l/1uC1Ku0iEJMvWIRgQQEQIABgUCPZzxggAKCRBzuRv/ +obHYCsaFAJ4yrKdlfYp9H6KfVANlW3pvuHFWBACfWwZxZJpG1CMy4aAuURnuEVV4 +VmyIRgQTEQIABgUCPaRB4gAKCRCL2C5vMLlLXMaJAJ4jW0k0y/5RDFrTDfAHTj7H +ox5uXQCgnvTheMDyPIEGveSLjApM2igaztOJAJUDBRA93ER5ms08wKmfdd0BASc+ +A/0SQ5SOI4t9jA6nAmmh9USEska71lEvfSwvezoHAf7W5xAPmJfwLdCMKWJian39 +bUrAxwotEEG1LVgD4cKCdIJKsn1hTJI3e0MIrvZjwlmHBqVETp3uMutPbgZBv9IO +rfVgfxWfND5lE3K4NUgW8eh1aqjoPPZHlgqN4dmrDpkWDIg/AwUQPdxEsN26ZLos +MS0vEQIjogCg8lfdeNxqmrKXJ79y26gXZe5e4kYAoPoJpU3D1/fx6MSYGQCLcLHm +VH19iQIcBBABAgAGBQI+pFiHAAoJEM1j0d2E+SZPSVMP/3zAbsV/7/fjWyWaVLYW +4z/UZ/ZRBCEUCIg5gtc5lJeO2kZV+hM1I/RZauxCbQ4gB7+/IET0z57igclweS8W +JabwSGtqj/tRax37wN0eB8M9YWzIY5j13fGG54RSQdFsbFS3J8dGuvL0U/a8r0/0 +k+WjHKCWrzfccwuJtUfHBT7XtFDZNMitOjon58HZqNm7kGzrRn9sUoMuWlybVspi +P0cIEUGGWEqJLbGnuJq44H6PrHHFyc1andkLkRGnWOLlka9afpv/+LKGouQRkVA+ +n+A/iNopjgqk0ZcN1PgglvSCnoJvdL4aLG2s5pXd29L2aGO7B2ZF3vR7MERuxAm6 +m0NMdZzNjWnQXR4l0EAhdma8Rm++PvhL5AR0+j0Vk5UsrQuh3LMhYOLnAsMjNmQm +YkbK8VOEvL0h4kW4ogsXeX8XrDzuaPvRt8TFNTde5yLo4wH/qQmgl0eM2s7D7843 +L9xsECM4KNfYaa2XAuWhJ3XdjsBlx6DTxEdLLlbxiCf5o2BbqyJROJBEK8bpBlO0 +Cxb06rzlSsnBRZPT5EBOTWnZz+84Jgz89Leyu0O8XrdRdr6sC3GLbq93EysNIVHs +qTMNXXxFPRIEwr3RwZsX1XdAT7xkJwxDYqySRuXG/jUcD6oB1fbCUxsKoqpTgOv8 +L6W0g7/29LKcZ5+3/pe5U/VBiEYEEBECAAYFAj6kVw4ACgkQMYbNBE8J8FXKcwCc +Chv1iLA1D4rL3kycpeR2cmGFFjIAoLJbtQMjQSD1UEcizcNqVGMZ3Ru3iEYEEREC +AAYFAj2qiaMACgkQ06HFHc1N8gX6CwCglV8+2bVWjdHZgx3lyuqvpVv+0NsAn3tH +mlrqpJQkzah914RCYPcyHesCiEYEEhECAAYFAj+Kq8kACgkQ5OVNEZoM2pmojgCf +YzKttjpDy77bslMV36m5iCsmESIAnjdwofFTjH17XIAtWgObSc50wcb0iEYEEhEC +AAYFAkAZaV8ACgkQyIHdR0rnq0dy/wCePhJZzS4balhA4PpHRefJF0NRFiEAniIo +STbu703vbffCtl6k/ApgL4KSiEYEEhECAAYFAkF38RwACgkQtGGqbMwazQX9CgCg +gEbSGKs3iW/EoeobckRGSQX2SNwAoJPL22DG02/S+Bu4gaNlt4DARdOZiJwEEwEC +AAYFAkGXshoACgkQZLDNBRh71o0SYgP+J5yAyeY3lqtg5dFXtc4xNnCUYvhQVYh7 +PBjQ15HUhRmk0FjGyz4AnqQLorfvBsAF1NhIGg7Ds3G0RkJBA5JcDeEiCzdLBKqB +qPoDl5umEM/mY/TJSzwcoXnH67zvRIvxdAkpk5Rp9j3m0XnVEGCC7fDYsiNpT/aW +jjgr3HgEs4+InAQTAQIABgUCQZfOiAAKCRAxpj2W7BQLgbPbBACCgva5JjwzOQBE +Af3lUjYK/lYee8uXYfcfhpSetiA5t9g/4b77mfx8iYDrXF2ziJt43jjSQIvaYY7y +KF1f8DPwq7ZF9VwmfobIMiUorjrdCxygNkFMq3smORbV6SPcCEPzTqbJG388Aakt +YwINtpyWnhUEFoo0dscK4iN1XmCNc4hGBBMRAgAGBQI/fY6NAAoJEIjXzb30PC+S +xdEAoL1h4xZghrE0Uy9NXznoaCg/cc19AJ94TZ0Bk840iIUVa8khq9GuGceFa4hG +BBMRAgAGBQJBl6/eAAoJEL66K4f1/EtCF3QAn2eoSXhBKAHxvVus3XYB4DzJqpn+ +AKDrF/nl+Xnn1zW/K6gzg34/8hGInohJBDARAgAJBQI+DTPcAh0AAAoJEIvYLm8w +uUtc3ekAn0guOtA3fmddXcq1zOExc7N8bxtXAJ0U1a7qQb9JlM7D1fcysZu3PPqW +0IhGBBMRAgAGBQJBmoh7AAoJEDCReXIpi8fQRccAnRMIlsiie2A+mYOMvUgBrlAN +8tC1AKCShab2Lh/Nl4RL/JaqBvf86XbMsYhGBBIRAgAGBQJBoG6oAAoJEAdhc7GS +hMRSH5kAniQDuggIetyEbeXTQE26weywN+AjAJsE4SVdLGn2rfn+AEGJIAXwOX09 +EIhGBBMRAgAGBQJBoi/XAAoJEMu5UGPg1Hdt4RIAoIfJTHqOMmsq8eEK6BC/o8ae +megdAJ9gfnRl4DWbk3ybclqIdU8Cr+pdA4hGBBMRAgAGBQJBmnlDAAoJEASX1ZES +v+eavScAnApzsuSvGxPyFoaZKD4igSCRJPc+AJ9P3J+4pAYBcfF+ItzhZZcsxauW +uohGBBMRAgAGBQJBpDKJAAoJEBdq2cjRqolisW8An0VmQYQM8d+bmqBm38Wp1771 +z6X4AJ0WKEjsKDd4nmavP/Qr9XHBoUYj6ohFBBMRAgAGBQJBqqehAAoJEFuWgBDg +T5qJGk4AmOnPKmaSwFinSEolRvSCXJvX5tMAmwUR/00hrJTF+NLNOAVQewOjjAcI +iEYEExECAAYFAkGrfy8ACgkQzgGkfhxD2FB5yACgzGxPazO+Qf80dq1e0tTlvRXL +ARwAoM7w/rVGeEHZT2mRicuTOKSIAx3biJwEEAECAAYFAkG9jHkACgkQGwgMRScZ +rzXU9AP/f1qoP5NsfgC956v+OKaB45vA3Cok2AHKnPGFZgQ9UpVldgj0X24QWERm +QUU4EaOGjmky9F/WqRnpg+/1EB5/GJHp2pvbeQ2yas3hczKvFU9YQD+vp8T1qcSM +SrrdqxdMKu75tasXBBO/FUv8wl4SVxRyROAo7GGJ58BVYt3Xt/uIRgQSEQIABgUC +Qbo6GQAKCRABBWa85BNjkgK2AJ940BUe1tOK/9p3XhVDXkfcwbaylwCbBsjDdnZm +q4ix3qq1lRbFTh3MXD+IRgQTEQIABgUCQa6aKwAKCRD8D4WJ+JS+Em6PAJ93EaXo +8iSI+MdH4nlSzUHXtQqpAQCbBcn0te7lVkttU9dJadIPkJUBzWeIRgQTEQIABgUC +Qb474wAKCRDoMBhIFqjTq2wCAJ9u/PSoHNib7ZXcuD7g4Ff61AlpWwCfUBCIjx+F +P3qBGD5y7f1sOA3OmH6IRgQTEQIABgUCQc9ZdAAKCRDBOfFTI8t6KhJbAJ9iWIga +9USvsjtpMKl3U/n3k7neHwCdHWIgRvz/GxBjYMKDWTsM3x78qg6JAhwEEAECAAYF +AkGXsWoACgkQJPjfwmx8T13Gpw//Sq9v+YKBIVt1nGlaFUUh3XE1UOVtZ3tZe/vx +eiE+aWX74kJYcxa4oAExONvfgIXa1144h7p+PDUE7E2YHelazlhUCRqP5WpgLnVU +sHFmKljo469PvSXO2TIvxgTuoYz2tnAm30zMLkkMHPex4P1R+fKFsSFJnPB08HkO +H34z48GB65pcpp0azsPAgaXiLoeXYp+yYmnNaBiCbPvnFJaJeXxtrb6mv0DXtfgT +k4wJN9K4dpFGSpvbFw7dLw5AXAY7fFb1SPIY2S5STmDDtLnmufAltoKtUNZqIyx3 +kMcaO9gq0jxVTEc2dXAuRdTpgWNOujOoTytkDbelAkvLt++pYtnP43Q/dOo1d/Mj +HxYwpmuQGvfrqJwBwtDLJlE/FDJtoJTuX/vfRZl0r6u3dTOvBhs1fjFSU1kMBck5 +5svRStRyd9uK5oAu36dXlVb7etzu3JC90+FB2VGwmkVDOe/fFXtlaPn/ALG4tpwq +8tmEjx9Y8m0m8NUEUbUzJ2/qRpqdalpdBp0xATh5HGKHPplHa/2fuHzm5D0sW2yl ++FL4WKmH3nlCRGIU27DqUW7Y4qeZE/DzfXqdVmpHTq9wnDsSy+FnKBiXi188GvIy +c8zS+IEWtJp30XkHZFePEFEtpRVrvXwGFbEc+Po6Glv1WFaPzzdkmA0mLIARvplo +Y3CNGfaIRgQQEQIABgUCQ55zxQAKCRBB6gmgV5NJj0G/AJ9xhRJgkfGLSQ5Jkmxh +SpyeuF+H9QCfRnN1rhaL8YB0gIW1VmPRij4f5cuIRgQTEQIABgUCQ55ZqwAKCRD9 +b4jGIdCnG9KyAJwODN6DOLsH1XyXDzWp3scmDzMVZQCgvaRb9g1h6MCT4yQmgSXq +/zBAThmIRgQTEQIABgUCQ591bAAKCRDvmqRZu51woX78AJ9WSEpvuKUJffhgMSw4 +FWpUpmyzUwCeNiyYB6pZY3K3IFZNUqiDckzAvzyIRgQTEQIABgUCQ5/BSwAKCRCU +UEP1NcEA8B/4AKDKRkAe0TPP1eXLyL23pVMk+V4EjQCfZgnLrB+uOePwZC5AXdgf +nD3JPX+IRgQQEQIABgUCQ6HIywAKCRAtIatlZUYbeWMvAJ0SgnUIR8wUEyFMRrb9 +HyRokH+54gCfYri1WzhX0DzgsnG2t5y3Nh9Za/mIRgQQEQIABgUCQ6HcdAAKCRB+ +q7taMDoHui+MAJ95tlhf4So+4AmrsdoXlA9BuyLWpACdEfHEUPD3i2L2s9E6KBBU +7IBHYhyIRQQQEQIABgUCQ6IBawAKCRAN8HRdq4IfvCR5AJ4lsEibrWLSb1XPjjP9 +SNLcoqpBqgCYh6Q45bjq/YHELjh4Tjg9hpGn9ohGBBARAgAGBQJDtZJdAAoJEEz0 +5/WE5w7mdsQAn3yQcg9y8bVjlB35SCZzHUp+kJ35AKCLH0CsSXO+rPieQ9ouzrup +gSPqSYhGBBARAgAGBQJDpXxyAAoJELlbvT+kPESSbnQAnjRi8gADL5iFUwP3+qe5 +6SOz4+ZuAJ44OWJSwL2Nk6NfINe9s4G8hbdE5ohGBBARAgAGBQJDqDTWAAoJEIzj +drgc1IYfjUkAn0zt8Sj1fW5e/00XIwubkyHHfLweAJ9281kgvLxmmxzeRr/M/6p3 ++uRPKYhGBBARAgAGBQJDqWeQAAoJEASRNELqG6ONWikAn2BmgX+h2e+zn11y7irO +ypDWGTgBAJ9+8TBgFek2iLmGGtCc5b7etIIZUohGBBARAgAGBQJDq8lLAAoJEIzh +nFzQ8dAgik4AnRnZVtHVCD1vIhHlwT7ap7ODSxZEAJ9zgMc/ORAV0vuNiy3LQPYC +F2eo7IhGBBARAgAGBQJDsojnAAoJEDm+UaEITJETvZ8AoKPxg1bA5PE7NwQnKeze +OoMAc7eGAJ44E51a3brm2OPrlhFanrVhIu/jR4hGBBIRAgAGBQJDpF76AAoJEBuJ +JvrkuIDi6xQAn3n3qgt/I0dI/1p3jXVG6f2vjNTaAKClisqRh293o/TtIMg8ylIt +wK2piYhGBBMRAgAGBQJDqRDxAAoJEGJpJWy7lusGkJ8An2uRYireFBIOgEhJIevS +DaV3IpSaAJ95qgfVvO/yjY6mwK5alYvt4im6WohGBBMRAgAGBQJDuLZWAAoJEALj +kFHlgLNjc44AoJJB6uy8KMhlAvUosAXIYqpwE8ltAJ4nhLccMuIpqKZZSNf6mjlQ +8L9U94hGBBARAgAGBQJDzWDFAAoJEIDYOnlhA79Zk0EAnRrvE5O8ER5XQDTuXuFl +UxnzLWgbAJ4yP0yVChxpWuq8SyDEXftMtZ/9F4hGBBARAgAGBQJDzWDOAAoJEA0M +pcYoKE+Z+YcAn0CbRkbjwJVBFjH671I8AzYKSQlIAJ4yCzoNafT5ofX5ArzgM1/8 +9FPoq4hGBBMRAgAGBQJD+mMMAAoJEBU/oM11pnaSZ7YAniapWyYA2YyeNz/hI/nF +GapSTxKTAJ9J8o4PydNwe3G9xogGaOoQ4XQC/YicBBABAgAGBQJEqo6GAAoJEN/E +lhY0O90m1E8EAMH3ioHVg47y4jgAvjM4syWpwni4WDNNw7B9X2GoxXtkLoLdFTh7 +FJPh7RZ55wttY8smtfzJF6Y8KXsMUS1PMXRQkPN/pRyZBmkImN9wDspmEuScvZfL +o8xEbPh5+f1E8RIoNbova6a2DGEBGN+SFZg2d9PB5VxL2RMVsvvxMkTuiEYEEBEC +AAYFAkU0IMEACgkQXkUmzpmSrfzyMwCgr1CJmJlXKamA681rq8BJ9GlqgtsAn24/ +pJ4HJ4sv1C5E3uHCJYt7GLkGiEYEEBECAAYFAkU0MGMACgkQmSxD/V94mKkRsgCf +ZlU6iDQN4Ll0X3zNU9bWMvo2L7MAniLENlp7aOd+j7SM8ltF8CFEBD/0iEYEEBEC +AAYFAkU1WjwACgkQBGM6V3wgCUFPzgCfcv9WHOrQH0T9oNaU7c5dXhIGDi8An12p +/48DluR2Ln9vh5JAIN347IeCiEYEExECAAYFAkU0EewACgkQeL6F2WacSrVMswCf +ednJ1m2cxe6DjnkDWzLDhYGAlgQAnRgJ+rJg41/LlrfnpzegmYxE7/cziEYEEBEC +AAYFAkU5HeYACgkQvhbJXS4RQyIMkwCaAzX2nb/vyyWZOKoJ7OOIJbch/JYAn0zC +57e/mlTcTWMy2vSzaWHhfMabiEYEEBECAAYFAkU+GakACgkQyR242pvPzi91DgCg +kxRPuVyrj7zQeCwp7Ew0CAkHwcEAnjkIaYyaj6lSlh6bLlFaxgT3u9kFiEYEEBEC +AAYFAkU+tqwACgkQa+KOrr/QMHzGBwCfa96vG7qXlkAGSqZtGLawUhPcNdQAniAH +drFG5MyQ8X/wXWR8WTrDVXTFiEYEEBECAAYFAkVCqgkACgkQEkG8hyxeTsB5EACf +WaK6+1+DUezy5Dme8M+/du+JvQUAoKNZwwrTBWtTPEahJkWbNhuzELKciEYEEBEC +AAYFAkVtJAgACgkQyOP6NjZqN1tG1wCaAkXX+FNCPLtgWrhESgdv4G+IPnQAn1RT +CnFSuXSzv7wpoOFwtfwkv4RTiEYEEBECAAYFAkWEF/YACgkQ/Hd0ETKdgNLLqwCf +QQB46gSdeqZGVVIAJ1vS44DHTTQAn2LltBVAAbjDt4kA9jJD4D3exY6siEYEEBEC +AAYFAkWFjvQACgkQEy5J1OQe3H65OQCgiH4gMHkyegaYBV5iPQT8cL7uIqAAoI+B +7sOEdqB5NRGJV2IMgTdhCBRniQEcBBABAgAGBQJHPLsoAAoJEBllhVDDEQYRR+8I +AN9An9ctlzBMeThCTJxIcBhffu07QQMb2bB9qAjTO5nFRmnxQwyg5GwjvClCixpq +Kp48bMR8wiY8s1KrIQjOBtLFZ8+AUicDLojiIrXnOKyZSoe0yKY0cX0wwlEkjUzL +gNgClOJ34UnZ+GwLIu3rXBjy9dK5EiIk3iI6W2uDi+lRiHdULXzJB2+/OT42fHaQ +T5QZRnbjy2l5rMkRRO558+tWwNX/y/jeX/QrsCiPhBPDd7zrlFVA5fhJXX6W0Rc7 +6UReIJ6pgK+8ryuMnUrVcm5um9j7HPfQio4c5G3eSRpWsPe+AhEgXrj3WCAzoF/W +iISq0TKI+Z3Wi+MsLVtsZyCIRgQQEQIABgUCRTgoxAAKCRBgKNb8nTr9T7FxAJ9+ +JRtyoo9Yp2agL/f2gGOwn5n8kwCfUgeLtAHVd7I0SMv2BrZIG4kKSI2IRgQQEQIA +BgUCRUPdYgAKCRCyvrxAFSkkrzpTAJ9DkBp3fcw2zjDEvbfCSLyYDShiHwCeNg7r +sPIOikAKtTOtkZbIX6Aq0kmIRgQQEQIABgUCRYKNBQAKCRBK4siHZl4HYMWoAKCU +YRnF+t8zuTxGm96MueGhK6WY/gCfSgHgCS033PtV+MLW9Pv6DTYWO2iIRgQQEQIA +BgUCR/05BQAKCRD1wmAWTO7XX3hZAKCCgy8/eCi6DQF4f9WPhSLlmSpbyACfeY50 +G/sRzhodIr1ZUH4gUHTY+qeIRgQQEQIABgUCR/1FFQAKCRCQOE2aNcfpQpiJAJ9E +OwfF9teeIx00f0ZCtTbLmG1xiQCgjOoJyU2RMbSPUf1mPPWRqHyy4teIRgQQEQIA +BgUCR/29ngAKCRBz3YwWAVMCNUItAKCFGlQrebQaIFFTtyrsjxL/+3rHigCgqU2N +SXXgLoDwj5XwAUfdvl+9QeqIRgQQEQIABgUCR/3EcAAKCRAYOB/XSxvmmOb9AJ40 +0/H35ftwANsaUh631xCTC/fwsgCg2rpMnFvErJMrbGgM8WZkC12f8wCIRgQSEQIA +BgUCR/0qZAAKCRCLlilD/CQ/PAycAKCDMCcpKn9igtj4jtcuX+qxd5Mt+gCcCNu6 +p4paHxP76Gs/OQ6kM7LRC5KIRgQTEQIABgUCR/4LZQAKCRCBLyCFwtUL+/WoAJ0Y +I0JpOO7OsBJ8PTS5fs9XVXFuXwCeN63Rsyet/eHhXbti2DpWU7bYoBuIRgQTEQIA +BgUCR/+ioQAKCRBMBCgYMRo95XoZAJ9HpNrtPH9xZ5lWZEdkLVGVTgzyxACfXWFC +dBy5Z926Zib0f+LGCqnkkguIawQTEQIAKwUCR/0mFCQaaHR0cHM6Ly93d3cuY2Fj +ZXJ0Lm9yZy9jcHMucGhwI3A1LjIACgkQf1hPnk3Z0cR9/QCcCCojaodRn23+iGrM +RLhay9FagIAAoK69CZ3vALMVlsn8Md2lyKwC28cRiMYEEBECAIYFAkf+RdsxHERy +LiBUaG9tYXMgVmFuZGFobCA8dGhvbWFzLnZhbmRhaGxAY29udGVjLWR0LmRlPiQc +VGhvbWFzIFZhbmRhaGwgPHRob21hc0B2YW5kYWhsLm9yZz4oHFRob21hcyBWYW5k +YWhsIChBcGFjaGUpIDx0dkBhcGFjaGUub3JnPgAKCRAuuUaCiIF0Ah78AJ9aW6m9 +j6+xpwfi16tu6l9BWzkr3ACePpx2hzIXzJ8nTaRJx7Pd8FPN9b6IRgQQEQIABgUC +SAU+4AAKCRCOo7BoTHZX8b2pAJsGCTv4k3/ZGLEbg2TMD0275R4EuACdHRDHP93p +jtdNPUInaH6njGjClo6IRgQTEQIABgUCSAPV/AAKCRAsgtvmx4Dir4hfAJ47HfMT +w9sbC8Op7qnaaOCIngN6FgCgkzNoxc0nddK11B7J6NPZqQKmghiIRgQQEQIABgUC +R/9L0AAKCRA8mkIEDAiFtIpBAJ9m7LdO5fL/iEjYMVZp+YWc3EbJdgCfWH/eslT8 +CJnMyuZsS5Usl7XTqS6IRgQQEQIABgUCSA9HVAAKCRAYYcMixWAUsqgXAJ98q2e7 +IaVPuhqAOTHLKcHeNIwLPgCfenQAGdYUQZPkuHeMC0BWTc4P1qKIRgQQEQIABgUC +SCIVgAAKCRAPRQomYhC/wDZfAKCqEzgY51NkuuL8e78QI3ylDDyaKgCgvA4GrEG/ +ls8VCo8HGbE+Xwv7Fp6IRgQTEQIABgUCSAnvMQAKCRDegOZWGfkpGKulAKCWhGkO +s6WLwcBIjvWoc4s7KtirOwCgrKRjTfNo6xV3Ip9gvjVTBnPMmfKIcgQQEQIAMgUC +SAtk1yscQmVybmQgRm9uZGVybWFubiAoQVNGKSA8YmVybmRmQGFwYWNoZS5vcmc+ +AAoJELOX3RpTbavtXesAn3CgllZ1zrLPoPioj8cPGCEVD5SBAJ4+/Obot45VrS0D +5L5x3xt3B18kVYkCHAQQAQIABgUCSEQD9QAKCRAZPxgKtV2ZdwlDD/9RsYCvp/Im +LyRGp7DvbH+BXFH0EgfqR/EBiokwOZNqmxfI3Oxmzh9V3e0JBS6XTa6laqX7oR0q +qkc8pPjBubVRnrKPgSWpbI6heKJDAvftkr1hJeL3QK2nhjpZFFgtkdXa/pPGNKJq +yUBlh4FTnmzthK7amzz/pTVei7Gqo8A6Zjt64aVuqKp5YCMSjnov8M3E91GYA2fW +G8FwEX2v3vNpbZH1vY7CJCYT1xocG4xSxC1XO2jlM4s6cVLEUhuZFAC8Yh0IbBYg +JuXnMquIWW+JAacKCFPVxOddOjLDqlL1EOE7aOA48IX15gUAWErqjev57dMvyC8y +JJxFn/K/XqYT0CWSZm/zpa1leMokEczJfF/0hTIuv/WdMJOcjoRkgjxPTPxo6K8k +sBsjDzav6yhbuCvRNrC1NUbIYnfDC3ETeBZ2Fkvd7zdxYYP/RBpZtO7NsEZ3ufdH +RhT6fd5XRBI4RdLU5KmdVMsXmuqW65SE8Dg0prb86Y4d44vxK2U2JvldsVfNeOUA +WMCluzuiCbSHIZxkpUelHgfI4xnF8VeokA/h+P+gZWt62Mo4lTFWEPDNiOfHiUjS +mv7bQyGtuGZ3DKnkBM2u1JZWZZ6116y0qAXDTjzSInIJ/Nsqo+ilI5MWo5+A5o5v +/5UyBLBc+c3Rn2Cb1YrXcpnrxS8FWek644hFBBARAgAGBQJIWTyrAAoJENUzTnWx +MT3iEIEAmO/QlDj4Oq/2KDCc+P9RiTZT7c8Anj02FyVuCLvz+qiXA7UpAfScxhZR +tB5KaW0gSmFnaWVsc2tpIDxqaW1AamltamFnLmNvbT6IXAQTEQIAHAUCPc/4swIb +AwQLBwMCAxUCAwMWAgECHgECF4AACgkQizpgHwjJdeVvcACg45TWz8Xw8kDFhDAB +CaUrFhSdkd0An24hZjbDZRQylPDjm2QnfGmVrBdjiEYEEBECAAYFAj3cSdQACgkQ +VZHiwGZkwHjs7ACg6mJJAcMZp37R0F8f/1XKWmqizc0Anjg6AN08fUg7yLoAXeJW +YjK7oYH7iQCVAwUQPdxEhZrNPMCpn3XdAQGa8QQAnRuzhxi8u57+w+SNPTXP3YUW +WOB0ZD2tCdfZ02FE9DOLxrB+pnQXOPUv7A35mD7fuHeZ/CxkG9Q0OFnQkqt6S/mb +jTyrNo/OrYpU+DUycLYw51hAdsNVGdS7KF1jpB40m3+RFil4AyS1GXScY3hJlLIV +frsPFLbrY0141mJ7I5GIPwMFED3cRLndumS6LDEtLxECLuMAmgOPOiMMXNFiLXlq +Nf/N4/d1yGb6AKCF9QfonwHfgH+eiDWt/cpkNHkfb4kCHAQQAQIABgUCPqRYhwAK +CRDNY9HdhPkmT/JND/9XYlxS5b71aG9Bqab7vjmnvYlduI9aVqTUfwTunFhWd36C +ges9K/LQjtwpEL9H0FsEWFOwlc5UMFOS53wWJ0xdszHxtcur9GZ16mgEBd0w8XaC +GPkBszJ9+w0LnsA00NJfuY8G5XLDwUQeBB6t/V7bT5B7KCTVjAkRM9Zqj8gVdSqf +g6zYCFlrCNJOYHU2UuhkyAFT+sSYsa9/OWsEISYL2pqMqqzfFY+6EfYFbMUtOI0J +Xb/RVtC9ZfokcTEIWeQLodxjRDLZEkzNg7R6n1IzB4xSbc5VOztaX733TBfubBH8 +pVpsxA+pNym3KHMC0FfnsYN4a36uKDSSWGTgtw9D0WAJoPkS6700Z/BAn2VoNmtP +gr9TCk7BrFuYPr+Xpw75ZrGoPcQFbbaOXqVxlZAbDIbGflZ5wXA62siqXqWPBYOF +2EgnExUOUoV3+SWFJqkgDAAslFcJKMA9pKSzh1qnGu68kDb42TWIKL3fE7ZhJdah +7Co160rjXzpuwa7xVDCfnC5YVTx6cn+SYnlEh2F1jj2KOnOMKi8qPUpYXlevFRsm +M3NZOKMUdfiAC3Tc3JpEiON4i0D/dzb6fzrdJmAKCmsJcq4Ckqa3xVhvO9fJ0SlT +sAgrSn2GfEfm4EwPpj9+SuCNR02Hxv+tx1sFC/U7PFoRAJt1LxiC7fERbb/T3IhG +BBARAgAGBQI+pFcOAAoJEDGGzQRPCfBVvD8AoPGLjHO4eP/f1pRjY86+Dalo/WMD +AKDF78AaOhnkymTUecH7Yghff3KM64hGBBIRAgAGBQI/iqvJAAoJEOTlTRGaDNqZ +mm4AnjCLGIQRExTQzCDtBsaKr1uN79oMAKCY4ftnQtZw5eMTXSNePbXBvxxs4IhF +BBIRAgAGBQJAGWlfAAoJEMiB3UdK56tHS6gAmJieL0dFzgj6jc/Bk0hBZLzuhbgA +nRMP0e0ZBzsQ/YTCfp086Pb6UAG1iEYEEhECAAYFAkF38RwACgkQtGGqbMwazQWP +hwCeK5Sh18tMA/MgKc4laDOVLNuHcLMAoKouMYq6ZFuUM5rFGywsyyFpxdYyiJwE +EwECAAYFAkGXshoACgkQZLDNBRh71o2JHwP/WC6hcQvUol73Ts3i0o2P+HexqXbu +6PmRjZBoKT8scd4bqBlimrV+I5k8FSNs/8NgIh80lKvOliX0JNWiskUwk7u2KCCZ +lVre7uFPJCU6WMd48hQm/uw+/R1K9AUcE0uOAB51P3yDe5DLBKU7LymBiajwdMSp +ehLzqRR4JaFzRxeInAQTAQIABgUCQZfOiAAKCRAxpj2W7BQLgYnNA/9eVKdgfR6g +3ixMcV7Lm/pwJ+J/iZT8BKNBwRm2tQwknTx22teWiNRXkyZefrMKHk6TgHftpBSF +fyCkzadH9B7F20Kliwi0sj3ZFt1HszM6k0Q2hOf6aomWxH4+FUQE8LpjIO7yEvf3 +dv5q2+Qd2WeMTrEzV4EQhsKBlUdgbAdu1ohGBBMRAgAGBQI/fY6NAAoJEIjXzb30 +PC+SQBIAnAhSe4zgwg9o4qmA1ef2x2Ygmtw1AKCGye4r92M0Rs1CgR0/99IVR4MQ +tIhGBBMRAgAGBQJBl6/eAAoJEL66K4f1/EtCTz4AoNBVr2eepKZPqIHaX8Pz5Twc +SERSAJ0dMQlAI4q6fUgsVaepUmeQE4f69IhGBBMRAgAGBQJBmoh7AAoJEDCReXIp +i8fQGFgAnjQMpryzCD6rJIcIfTa4uMSbBsB2AJ0avROZHdZdYpk7ZxpQdJauAmt4 +V4hGBBIRAgAGBQJBoG6oAAoJEAdhc7GShMRSqCMAniWw+Ihohic7XDJCQWXZ1dda +HhhtAKCUYr7jF7RBnrOCIQNWNFy6kWPcgYhGBBMRAgAGBQJBoi/XAAoJEMu5UGPg +1HdtJLQAnRRFyD6oglI9IlAzfhdhXtPM7DsyAKCMm3neYAEGSWHaPkonQ1scJgYB +WYhGBBMRAgAGBQJBmnlDAAoJEASX1ZESv+easEMAoLtKCvsdUbr9W9n5RLtGpVG9 +iq8kAKCzmNm32lFeeIR59cPAFfPArfinXohGBBMRAgAGBQJBpDKJAAoJEBdq2cjR +qoliX60An22gzGPQyS7lLxhEbJH2X0V70/dtAJ9i66y3e19SSNlglP5eA9DSKjip ++IhGBBMRAgAGBQJBqqehAAoJEFuWgBDgT5qJVZoAn1REvkzKodUv0YPIIQT+glg/ +7oRJAJ0Tgot3aYaozdeyvIu/CLRRsMMAcYhGBBMRAgAGBQJBq38vAAoJEM4BpH4c +Q9hQMZwAn0ZTxWneiSXn63yLcW0m+1Lpom+iAKCvp3cIOvulr0t1cCna0leAZLJx +foicBBABAgAGBQJBvYx5AAoJEBsIDEUnGa81rPID+QH53BS+yZ7w1P6Z0shoHvs3 +SrHrBeBiRcPWTOFTYH9Dzir/gAsnQCjDtcM4ee0KpjSKHzKoZagErNDvVodw7lp5 +NxtbfQA+Nz/ygJ7t4pFz9fPjlBZuPDEtV1mtsJE73VX345rMyxdDR/fLXftmbMnQ +lEcEFyzcpeeQG+2X2dZ2iEYEEhECAAYFAkG6OhkACgkQAQVmvOQTY5IlAQCfatIg +AtcVMZLwc7V1V5d2Ph7NppEAnjO1OmGU0pIYf4fPfQwH85kSONAHiEYEExECAAYF +AkGumisACgkQ/A+FifiUvhJMywCfcVhDOflMNhzJ5JQwBgOrBRla+M8An0zyNH2L +/WmxZ9Dw5DuuzKUZryWQiEYEExECAAYFAkG+O+MACgkQ6DAYSBao06uxewCfd+1p +eElK+wfqsxuCR/qFzOW1YkMAoMnOZTsSW2zgDw9G9ebibdpcwbJEiEYEExECAAYF +AkHPWXQACgkQwTnxUyPLeirpbwCdHb7P90gWJqHrMI4+CyXiJfWHqhsAniy0eJKi +A4ifR4HWTw3igPoErU5hiQIcBBABAgAGBQJBl7FrAAoJECT438JsfE9dsXEP/ite +LB7zeg0QFb3rToT5LnfGoAxpOWXIYCsZ+FeqvI1Pm+1juvzH/BlHjeVvews2qS5d +ubZZgTI4VEIxTYB567TnjmezlR3MGscd0qbOwHcxzjdbQm/iN5D+abawO1LoyzL5 +F7mALuoM9R8SJSmam9It3GFvjDUQRc7cO7yyeJdPNLenGuoFfym2+MeXU/x2lm7O +lbkFD0eH0jpEEdsssr4Zbpt7tdv0JPoQq1/xzOpQpitIWgbEHUS/J7HtaBQ69Bc9 +VAY542r5d7YYLatIanjOI8r5N0SB4rWenj/zveJJpnYiLlK2NoWrWIE0iXeE2SUE ++Hpz96NVJn/oBAKnsW4lU7laC9M/uCSh1nfQEOuli2dSaSTlZRgqvZYhnSinm3Zh +1HAWZ7Q9B7vDpz2wBnjB7n/oBNhMp2dkLZRxiCV0TFbBxqIr4uPX/kuc+QtAzz3y +Lf45MooJ2AHYadwvHJlgfinck2T60uTqsniK9b4qKwvjtTPNsDDNPC5NjZ8DjVfn +h182OpKfHI/Kq5xqvcXu4AHe4ofQA1rUgvfFe6rkojX/TkHyai0TF0JY1Hb+yiRn +jM/RfnVfXCxJxlXZeBZcNKvThVLPzFyMROyyz4AsJMwX/uw6c4ayQ3lL2fKTbNJY +XQ6IhELuBJ23sgtSLLET/XgY6G0MQM50jD6qotPviEYEEBECAAYFAkOec8UACgkQ +QeoJoFeTSY9rxQCfcy5/4+fVmXFUaoP/jAAvNseEBacAoLTcMAqHVzbl1BEgrfVy +saafig8viEYEExECAAYFAkOeWawACgkQ/W+IxiHQpxvCZQCcD6CtCcfOsRCwtFyM +r5/utK2aG6sAni/kZdP0l8itBpt3qGU5i5g+Ys94iEYEExECAAYFAkOfdWwACgkQ +75qkWbudcKH9pgCgqQ3k0VdKYBI42OGDQGHHvPVvL5oAn2IOYzZz119iE6fFLv9R +7pCywfUiiEYEExECAAYFAkOfwUsACgkQlFBD9TXBAPCaCgCfZ1ZDpxHg1UyYN0q2 +AI3kQ1Kjiq8AoMC9g+VfDEnMBfIKSWe0NpATn9eFiEYEEBECAAYFAkOhyMoACgkQ +LSGrZWVGG3kcxwCfUdPbaBe5g6IJswLFABlGWvjJINcAn1Ev/fHgEfJ5zjwd2RCQ +FdspT5IOiEYEEBECAAYFAkOh3HQACgkQfqu7WjA6B7pbHwCfcMvyafwhJZXF3yLg +PVZAWlGn4R8AoIU1ugAtodiOVuzgHoSzt+eijRy0iEYEEBECAAYFAkOiAWsACgkQ +DfB0XauCH7yHUwCfcjiI6xRwsgtFxKRfwM48N2rsDgcAnRXpzlzkiUYxsIoVt53W +05flsw6siEYEEBECAAYFAkO1kl0ACgkQTPTn9YTnDuZAqwCgqaxVHsvfdeHBstAd +d80J10c680IAn3vt+sTrhZVlol9YQpPA+fe6OJ5+iEYEEBECAAYFAkOlfHIACgkQ +uVu9P6Q8RJL7wACfaTxBBjzUCQW+jeCmd8DJ1iTF6VwAn30omtRwjxnAyhDd1KMw +lj5LbBXViEYEEBECAAYFAkOoNNYACgkQjON2uBzUhh9xQQCgi3ueW23lP3w7jykA +fIXipzPVAvoAn26bGLtiu/B+KV0tnV5XY4mHQaE/iEYEEBECAAYFAkOpZ5AACgkQ +BJE0Quobo43v+ACgobLUOobiRTEf1Q1ffbcmHtw1jVcAoKd/6yd1I02D85SpnKN9 +sVQ6DXn/iEYEEBECAAYFAkOryUsACgkQjOGcXNDx0CB5MgCeMsKMtAwzD0q+IQeS +7EEgP4eS3EgAoOvknJexZO/Hm7x6/XSQvr0k8ArYiEYEEBECAAYFAkOyiOcACgkQ +Ob5RoQhMkROUdQCeIWItzyNWEn+bm0u+KwBEokgIg9QAoIq2VBWUNEmV7P1RRMsF +RGkXLA0+iEYEEhECAAYFAkOkXvoACgkQG4km+uS4gOLxPgCfZaPf9fVgnctTfX1Y +RJCxNnP+ZpIAn02t3tV5Fthl4wMKKUM1nCPXXFr3iEYEExECAAYFAkOpEPEACgkQ +YmklbLuW6wbtFwCfX7W+Tn96LYrQH6ZPRob5MVx/9aMAn1esol4R9UibwmQhzZYa +1yLZEbK5iEYEExECAAYFAkO4tlQACgkQAuOQUeWAs2OmSQCeMM4dT6RMHQ33ieGc +kl/3Pv8fjS4AniiI/IEvKu+7KU7OLMF84VQTEa0qiEYEEBECAAYFAkPNYMUACgkQ +gNg6eWEDv1kFWgCeNnvzFqYpiKAXOlxYVJOQxZ5XGvgAnj1jY2lp9iggNld5pf2t +u7dEYGoTiEYEEBECAAYFAkPNYM4ACgkQDQylxigoT5m1JwCfemKSJx2MfjlMjyqJ +tz+mC/afDiEAmwatNsF8hi7EvBfw2/qj/97czHCIiEYEExECAAYFAkP6YwwACgkQ +FT+gzXWmdpLi4QCeOlZiPSSenCaL8pr9Ks2DDnP7W5cAoJoCt75BVrDvw7twKt9Y +4HIdr3S9iJwEEAECAAYFAkSqjoYACgkQ38SWFjQ73SaVQQP/RUII493VA3Z5HHhX +ACrryX5uMNFJSr0jJ9gZ2fQKOY50/HENIra5IDNd5FRCrDfR3d4JlSCPCS89QX10 +Uq1lMzR1Hta2a9B3IMKOaIeeCxne5TGDHXqmbb0hMXuEAubfKzBVqKqqcU6PX5R8 +YlzdOBe8SfcEid+I5P2qb0lePoqIRgQQEQIABgUCRTQgwQAKCRBeRSbOmZKt/P2i +AKDMQzCE+r3CzbNL8Gec0JudObYwowCfeX14bCYBboe84ISNttvDtKhNMdSIRgQQ +EQIABgUCRTQwYwAKCRCZLEP9X3iYqTmRAJ9J10a3JnYrH2X2GJ2Ib1XySMNjiwCf +dZrQYnMGofxMuGO1TUxJ3HlQVhSIRgQQEQIABgUCRTVaPAAKCRAEYzpXfCAJQQAx +AJsGjkGgBeuZMNW+HFU5AS28MZS4aACgmSbvGPF4PyKsWblrjewcxccewxaIRgQT +EQIABgUCRTQR7AAKCRB4voXZZpxKtd5YAKCjCcr2pz8Zixtg1Bs7gxT0I2XL2QCg +neHbUkSLnkV0ETAt1WtJEGvKPjqIRgQQEQIABgUCRTkd5gAKCRC+FsldLhFDIkDX +AKCVzlTLw+BgxZz0jAGkvqVukLjukACbBOxypc1daez1a6Z20djTg7vTsdGIRgQQ +EQIABgUCRT4ZqQAKCRDJHbjam8/OL0aZAKDfwrj1nTkmRPe/vsj82TigofXi7wCf +YFrE03x6I58XFr7mPbxcG8z4/xWIRgQQEQIABgUCRT62rAAKCRBr4o6uv9AwfCem +AJ939W3s0fkp5x7AtcXBNaIGnHbtOgCgg9ghispD5vsl5PZefb4D37Ua/P6IRgQQ +EQIABgUCRUKqCQAKCRASQbyHLF5OwFxfAKCcKvMLy5+RqxJjHf7srjfbWiCetQCf +RkiD9W4Rw78TXnD5fBeyHyvR//SIRgQQEQIABgUCRW0kCAAKCRDI4/o2Nmo3W8hs +AJ9lBRgrL+6b0sKmx+GoXhyn7UBu0ACglZtBWl4eaGqKFx0DrSnzaf86xPCIRgQQ +EQIABgUCRYQX9gAKCRD8d3QRMp2A0qhlAJ0VbXsaL0IYeWp+a86lONk8qY8emQCf +cmVevpy0Nbvjdm0pKmqSG8e+SniIRgQQEQIABgUCRYWO9AAKCRATLknU5B7cfpnF +AJ43IQV+FVWDH798pSAgVg0WbqEApgCfVSjgfiGoNmVUCYdTWJotUyBypJKJARwE +EAECAAYFAkc8uygACgkQGWWFUMMRBhFG4wgAlUFKa+znF71xBqGls9HJXiws5+gn +rHceS7ZCkQ4lvJh5xUqD0SCkfwX0GV7ZTSMiaWeStRbzwDURtBggkfibvv2psov2 +oiUfNWkhl/lbI3yY771vPk3xEzQtdq/48Kkf53281M2IyCsAY6XgpdZsAu+KwGSs +0quXzM1iqh/qskRvXdHciE7wl4fSdPr8bV8u5jg4bYRAVUEthN61SQLiF2N5SLXb +4mHaMoUDmj7NfyIWPl+ZocUXqPf+SZtSBA91P3tA1J9rYScqNjoUhKNOIBvNABAK +XyJ1OsIOErG6l6JirRuBdxEdUsZfcdywspI4wUdbmvCx34shpQQoZp8wCohGBBAR +AgAGBQJFOCjEAAoJEGAo1vydOv1PdvEAn0PpIxIXIwfK3DZ52C169NF3xA8+AJ0X +eaeGEX2nHwHqvhGsr6DH6mWI2ohGBBARAgAGBQJFQ91iAAoJELK+vEAVKSSvgogA +oJ4PdfO8FrcSAPly07h1dUOmHqbiAJ9hp4bMCBRgGnE87/pQjQnoMOSJnYhGBBAR +AgAGBQJFgo0FAAoJEEriyIdmXgdgIwcAnihMjPd06FCe7+1qu7+pFgzphauqAJ9G +5slFDp8+htYwLhuU3yqNkMKupYhGBBARAgAGBQJH/TkFAAoJEPXCYBZM7tdf7V8A +oKPgIRt9nE3lNIRU2JOfUhg8ztXQAJ9Xl7eEhn34U1ChoumCtYsl016E8ohGBBAR +AgAGBQJH/UUVAAoJEJA4TZo1x+lCkXsAn0U11325aHMKjnV49L6B1sLkdcSLAJsG +cCrJ7GKJUXSZXVYMx7qxvvjm74hGBBARAgAGBQJH/b2eAAoJEHPdjBYBUwI1MG4A +njiwK19Gw1aL0DP1BGu55BanKwmaAKCCYKH3E66LYpd6jK9+tcATYzrxoohGBBAR +AgAGBQJH/cRwAAoJEBg4H9dLG+aYq7IAnRkGPcAc+1fXA7HxaBjygpYiy+B+AKCM +KuNBHNc0dW4LRqQYepb/3Y24Y4hGBBIRAgAGBQJH/SpkAAoJEIuWKUP8JD88gVcA +n28L5qjFalcsMeKphG2U2VlQ+vySAJ43y+gO0BrjTow926LE/lR5042pbYhGBBMR +AgAGBQJH/gtlAAoJEIEvIIXC1Qv7ipMAni5sF5QZL/JtkGV6AciUfITkZDeUAKCG +T0r8dwZ42QxrMHXFvx4P9A777ohGBBMRAgAGBQJH/6KhAAoJEEwEKBgxGj3lyWsA +oLrr9L3ccujW5hQaZMtwi5NNDLdyAJ4oLOXirNh7A9jDQ78HZX5ky1ZErIhrBBMR +AgArBQJH/SYUJBpodHRwczovL3d3dy5jYWNlcnQub3JnL2Nwcy5waHAjcDUuMgAK +CRB/WE+eTdnRxF2fAKCtmYnzyw97aB0FRd8R8LC90y4wtACeI0j4/a7LdLMBNxpJ +nVWVxy8Al0GIxgQQEQIAhgUCR/5F2zEcRHIuIFRob21hcyBWYW5kYWhsIDx0aG9t +YXMudmFuZGFobEBjb250ZWMtZHQuZGU+JBxUaG9tYXMgVmFuZGFobCA8dGhvbWFz +QHZhbmRhaGwub3JnPigcVGhvbWFzIFZhbmRhaGwgKEFwYWNoZSkgPHR2QGFwYWNo +ZS5vcmc+AAoJEC65RoKIgXQCHvwAn1pbqb2Pr7GnB+LXq27qX0FbOSvcAJ4+nHaH +MhfMnydNpEnHs93wU831vohGBBARAgAGBQJIBT7gAAoJEI6jsGhMdlfxqpwAn2gN +WGn65YNuDGndC2jkn5tsRRfUAJ9wS8b9Fh6A2vVfru94YboJo8IzFYhGBBMRAgAG +BQJIA9X8AAoJECyC2+bHgOKvICUAn1fbfD2S1EKYqD+iPqqzPnJj0MjhAJ9U+B/i +pbss6yqpSMlD1CPQuWBmuohGBBARAgAGBQJH/0vQAAoJEDyaQgQMCIW0yC8An1aZ +GM2xytCjefIef27/F2nLD47bAKCLD3COfIj8Po1vI7FB+rzcoI7cSohGBBARAgAG +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 +BgUCR/+ioQAKCRBMBCgYMRo95fSJAJ96+nklYbVPeB2ZVF/Yu+o0ULcxDACeLKmM +2PkmN/8rC4EbyIQm2NotUReIawQTEQIAKwUCR/0mFCQaaHR0cHM6Ly93d3cuY2Fj +ZXJ0Lm9yZy9jcHMucGhwI3A1LjIACgkQf1hPnk3Z0cQWRgCgkR6KONosPj2fGSHF +LoU58+LPkgQAoLw1KcsM6iJk9Xa9HbDQ5paCcRzhiMYEEBECAIYFAkf+RdsxHERy +LiBUaG9tYXMgVmFuZGFobCA8dGhvbWFzLnZhbmRhaGxAY29udGVjLWR0LmRlPiQc +VGhvbWFzIFZhbmRhaGwgPHRob21hc0B2YW5kYWhsLm9yZz4oHFRob21hcyBWYW5k +YWhsIChBcGFjaGUpIDx0dkBhcGFjaGUub3JnPgAKCRAuuUaCiIF0Ah78AJ9aW6m9 +j6+xpwfi16tu6l9BWzkr3ACePpx2hzIXzJ8nTaRJx7Pd8FPN9b6IRgQQEQIABgUC +SAU+4AAKCRCOo7BoTHZX8Rg2AKDRA0ZBY1fkUNv9/EF6HzI5aLQ24gCgj6EdyN+Y +w1lAFzO9fHihcfxAOEuIRgQTEQIABgUCSAPV/AAKCRAsgtvmx4Dir/i0AJ4yx2lr +qce6+LUbVhrbi0DtBAnuewCeJ0C4r0zLFNpswOE+0GWbosIUOkOIRgQQEQIABgUC +R/9L0AAKCRA8mkIEDAiFtKAkAJ9rKXG6+U+FX1RtU0s+8egwTYLeuACgoazfXZgq +ahAaEfiue/NeSIcG9JCIRgQQEQIABgUCSA+H1gAKCRAYYcMixWAUsheoAKDiQJ1K +qrcQ5QfTcbflIGejRxNMIACfbdBQ6Af0olboBrsd+LhFoBo8aHaIRgQQEQIABgUC +SCIVgAAKCRAPRQomYhC/wG/4AJ48LxKCtVNw9Dxyvj0FVWIrLN82DgCghG0oUq1D +KKCGmtxf0ANrukzXFxmIRgQTEQIABgUCSAnvMQAKCRDegOZWGfkpGCyuAJ0YXATm +9BrcFQ8HNBSdfI9dXhz3MgCfZIg7kn2gXKmrK3RJVMHjA6g3CWqIcgQQEQIAMgUC +SAtk1yscQmVybmQgRm9uZGVybWFubiAoQVNGKSA8YmVybmRmQGFwYWNoZS5vcmc+ +AAoJELOX3RpTbavtXesAn3CgllZ1zrLPoPioj8cPGCEVD5SBAJ4+/Obot45VrS0D +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 +Lsk+SbZIXl7VSdcxzAV/+COs0xZkDDAoQPSHkXtXspUn+l9j+i+6GlF7kzvqyItj +quWeYFr5p4UNX8lgpOfOClk00LX+4MxkbWINHzj+GmffdjxP14hGBBMRAgAGBQJB +pC8qAAoJEBdq2cjRqoliHSYAoIbBry+jkdCFMc7vVH4e/WJOgGvbAKCKL+m/rece +HPU/Af0HaKdLRb3AlIkCHAQQAQIABgUCPqRYigAKCRDNY9HdhPkmT9lZEACPSFHM +DJcHucuzkvKEsnArAsKkvBSRYxzahjxLjHkwcJ4J+UwEw3NdtDPx0xo3Gt7ds20k +xvtggYCrzqY7//////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +/////////////////////////////////////4kBIgQQAQIADAUCQmIN5AUDABJ1 +AAAKCRCXELibyletfGwKB/9796/R5i2IbjMzEG0D/fMTWQPFecb+xxs79bSoPMgZ +rOkOk/aXxLF9EGlmznam12O8XT8waysGwfELQCu05sYmWZwraluHFA9azByDlGPa +ICvcLviErkS68MqRrzEX3X67S3fw+ZGl+24x3ZQvRWpsBQhrhpKoUJHn4tvTrMIH +axo/x0Kn8lzc+hZKJY4bp4gsqhlpTA30CJV28QxcYXyiuOC39SXGvE9T86yMErv3 +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 +=sBNm +-----END PGP PUBLIC KEY BLOCK----- diff -Nru apr-1.5.2/debian/watch apr-1.6.5/debian/watch --- apr-1.5.2/debian/watch 2015-08-15 11:09:19.000000000 +0000 +++ apr-1.6.5/debian/watch 2018-11-19 12:13:02.000000000 +0000 @@ -1,2 +1,3 @@ version=3 +opts=pgpsigurlmangle=s/$/.asc/ \ http://www.apache.org/dist/apr/apr-(1\..*)\.tar\.gz diff -Nru apr-1.5.2/docs/APRDesign.html apr-1.6.5/docs/APRDesign.html --- apr-1.5.2/docs/APRDesign.html 2004-11-24 22:51:51.000000000 +0000 +++ apr-1.6.5/docs/APRDesign.html 2018-08-30 02:49:36.000000000 +0000 @@ -152,7 +152,7 @@

The current design of APR requires that most APR types be incomplete. It is not possible to write flexible portable code if programs can access the internals of APR types. This is because different platforms are -likely to define different native types. There are only two execptions to +likely to define different native types. There are only two exceptions to this rule:

    @@ -227,7 +227,7 @@

    For an actual example, look at any file in the include directory. The reason the docs are in the header files is to ensure that the docs always -reflect the current code. If you change paramters or return values for a +reflect the current code. If you change parameters or return values for a function, please be sure to update the documentation.

    APR Error reporting

    @@ -246,7 +246,7 @@

    All platforms return errno values unchanged. Each platform can also have one system error type, which can be returned after an offset is added. -There are five types of error values in APR, each with it's own offset.

    +There are five types of error values in APR, each with its own offset.

    @@ -277,7 +277,7 @@
 
 The difference in naming between APR_OS_START_ERROR and 
 APR_OS_START_STATUS mentioned above allows programmers to easily determine if
-the error code indicates an error condition or a status codition.
+the error code indicates an error condition or a status condition.
 
 
    If your function has multiple return codes that all indicate success, but
 with different results, or if your function can only return PASS/FAIL, you 
@@ -345,7 +345,7 @@
 an error string.  If we convert all errors to a common subset, we have four 
 steps to output an error string:
    
 
-
    The seocnd problem with option 1, is that it is a lossy conversion.  For
+
    The second problem with option 1, is that it is a lossy conversion.  For
 example, Windows and OS/2 have a couple hundred error codes, but POSIX errno
 only defines about 50 errno values.  This means that if we convert to a
 canonical error value immediately, there is no way for the programmer to
diff -Nru apr-1.5.2/docs/canonical_filenames.html apr-1.6.5/docs/canonical_filenames.html
--- apr-1.5.2/docs/canonical_filenames.html	2013-12-14 09:22:34.000000000 +0000
+++ apr-1.6.5/docs/canonical_filenames.html	2018-08-30 02:49:36.000000000 +0000
@@ -8,10 +8,10 @@
 
    APR porters need to address the underlying discrepancies between
 file systems.  To achieve a reasonable degree of security, the
 program depending upon APR needs to know that two paths may be
-compared, and that a mismatch is guarenteed to reflect that the
+compared, and that a mismatch is guaranteed to reflect that the
 two paths do not return the same resource
    .
 
-
    The first discrepancy is in volume roots.  Unix and pure deriviates
+
    The first discrepancy is in volume roots.  Unix and pure derivatives
 have only one root path, "/".  Win32 and OS2 share root paths of
 the form "D:/", D: is the volume designation.  However, this can
 be specified as "//./D:/" as well, indicating D: volume of the 
@@ -21,7 +21,7 @@
 form "server/volume:/", or the simpler "volume:/" syntax for 'this'
 machine.  All these non-Unix file systems accept volume:path,
 without a slash following the colon, as a path relative to the
-current working directory, which APR will treat as ambigious, that
+current working directory, which APR will treat as ambiguous, that
 is, neither an absolute nor a relative path per se.
    
 
 
    The second discrepancy is in the meaning of the 'this' directory.
@@ -39,35 +39,35 @@
 since the parent of the root is root.  This gets tricky on the
 Win32 and OS2 platforms, since the ".." element is invalid before
 the "//server/share/" is complete, and the "//server/share/../"
-seqence is the complete UNC root "//server/share/".  In relative
+sequence is the complete UNC root "//server/share/".  In relative
 paths, leading ".." elements are significant, until they are merged
 with an absolute path.  The relative form must only retain the ".."
 segments as leading segments, to be resolved once merged to another
 relative or an absolute path.
    
 
 
    The fourth discrepancy occurs with acceptance of alternate character
-codes for the same element.  Path seperators are not retained within
+codes for the same element.  Path separators are not retained within
 the APR canonical forms.  The OS filesystem and APR (slashed) forms
 can both be returned as strings, to be used in the proper context.
 Unix, Win32 and Netware all accept slashes and backslashes as the
-same path seperator symbol, although unix strictly accepts slashes.
+same path separator symbol, although unix strictly accepts slashes.
 While the APR form of the name strictly uses slashes, always consider
 that there could be a platform that actually accepts slashes as a
 character within a segment name.
    
 
-
    The fifth and worst discrepancy plauges Win32, OS2, Netware, and some
+
    The fifth and worst discrepancy plagues Win32, OS2, Netware, and some
 filesystems mounted in Unix.  Case insensitivity can permit the same
 file to slip through in both it's proper case and alternate cases.
 Simply changing the case is insufficient for any character set beyond
-ASCII, since various dilectic forms of characters suffer from one to
+ASCII, since various dialectic forms of characters suffer from one to
 many or many to one translations.  An example would be u-umlaut, which
 might be accepted as a single character u-umlaut, a two character
 sequence u and the zero-width umlaut, the upper case form of the same,
-or perhaps even a captial U alone.  This can be handled in different
+or perhaps even a capital U alone.  This can be handled in different
 ways depending on the purposes of the APR based program, but the one
 requirement is that the path must be absolute in order to resolve these
 ambiguities.  Methods employed include comparison of device and inode
-file uniqifiers, which is a fairly fast operation, or quering the OS
+file uniqifiers, which is a fairly fast operation, or querying the OS
 for the true form of the name, which can be much slower.  Only the
 acknowledgement of the file names by the OS can validate the equality
 of two different cases of the same filename.
    
@@ -76,7 +76,7 @@
 significant in non-unix file systems.  Trailing periods are accepted
 but never stored, therefore trailing periods must be ignored for any
 form of comparison.  And all OS's have certain expectations of what
-characters are illegal (or undesireable due to confusion.)
    
+characters are illegal (or undesirable due to confusion.)
    
 
 
    A final warning, canonical functions don't transform or resolve case
 or character ambiguity issues until they are resolved into an absolute
@@ -111,10 +111,10 @@
 
 
    In any case, returning the char* path, with a flag to request the proper
 case, forces the OS calls to resolve the true names of each segment.  Where
-there is a penality for this operation and the stat device and inode test
+there is a penalty for this operation and the stat device and inode test
 is faster, case correction is postponed until the char* result is requested.
 On platforms that identify the inode, device, or proper name interchangably
-with no penalities, this may occur when the name is initially processed.
    
+with no penalties, this may occur when the name is initially processed.
    
 
 
    
 
diff -Nru apr-1.5.2/docs/incomplete_types apr-1.6.5/docs/incomplete_types
--- apr-1.5.2/docs/incomplete_types	2004-11-24 22:51:51.000000000 +0000
+++ apr-1.6.5/docs/incomplete_types	2018-08-30 02:49:36.000000000 +0000
@@ -38,7 +38,7 @@
 #endif
 } ap_file_t;
 
-This captures the essense of what is currently being defined for ap_file_t
+This captures the essence of what is currently being defined for ap_file_t
 using incomplete types.  However, using this structure leads developers to
 believe that they are safe accessing any of the fields in this structure.
 This is not true.  On some platforms, such as Windows, about half of the
@@ -53,7 +53,7 @@
 #define filetype int
 #endif
 
-And then in the defintion for ap_file_t, we could say:
+And then in the definition for ap_file_t, we could say:
     filetype filedes;
 
 This gets rid of some of the complexity, by moving it off to the side, but
@@ -73,7 +73,7 @@
 For example, the first implementation of time functions used incomplete types,
 which added a layer of complexity that turned out to be unnecessary.  If
 a platform cannot provide a simple number that represents the number of seconds
-elapsed since a specifed date and time, then APR doesn't really want to 
+elapsed since a specified date and time, then APR doesn't really want to
 provide support for that platform.
 
 APR is trying hard to provide a balance of incomplete and complete types, 
diff -Nru apr-1.5.2/docs/pool-design.html apr-1.6.5/docs/pool-design.html
--- apr-1.5.2/docs/pool-design.html	2004-11-24 22:51:51.000000000 +0000
+++ apr-1.6.5/docs/pool-design.html	2017-09-27 14:44:56.000000000 +0000
@@ -3,10 +3,6 @@
     Using APR Pools
   
   
-    
    
-      Last modified at [$Date: 2004-11-24 17:51:51 -0500 (Wed, 24 Nov 2004) $]
-    
    
-
     
    Using APR Pools
    
 
     
    
diff -Nru apr-1.5.2/encoding/apr_escape.c apr-1.6.5/encoding/apr_escape.c
--- apr-1.5.2/encoding/apr_escape.c	2015-04-04 18:45:44.000000000 +0000
+++ apr-1.6.5/encoding/apr_escape.c	2015-04-04 18:40:35.000000000 +0000
@@ -1181,3 +1181,74 @@
 
     return NULL;
 }
+
+APR_DECLARE(apr_status_t) apr_escape_ldap(char *escaped, const void *str,
+        apr_ssize_t slen, int flags, apr_size_t *len)
+{
+    apr_size_t size = 1;
+    int found = 0;
+    const unsigned char *s = (const unsigned char *) str;
+    unsigned char *d = (unsigned char *) escaped;
+    unsigned c;
+
+    if (s) {
+        if (d) {
+            while (((c = *s) && slen) || (slen > 0)) {
+                if (((flags & APR_ESCAPE_LDAP_DN) && TEST_CHAR(c, T_ESCAPE_LDAP_DN))
+                     || ((flags & APR_ESCAPE_LDAP_FILTER) && TEST_CHAR(c, T_ESCAPE_LDAP_FILTER))) {
+                    d = c2x(c, '\\', d);
+                    size += 2;
+                    found = 1;
+                }
+                else {
+                    *d++ = c;
+                }
+                ++s;
+                size++;
+                slen--;
+            }
+            *d = '\0';
+        }
+        else {
+            while (((c = *s) && slen) || (slen > 0)) {
+                if (((flags & APR_ESCAPE_LDAP_DN) && TEST_CHAR(c, T_ESCAPE_LDAP_DN)) 
+                     || ((flags & APR_ESCAPE_LDAP_FILTER) && TEST_CHAR(c, T_ESCAPE_LDAP_FILTER))) {
+                    size += 2;
+                    found = 1;
+                }
+                ++s;
+                size++;
+                slen--;
+            }
+        }
+    }
+
+    if (len) {
+        *len = size;
+    }
+    if (!found) {
+        return APR_NOTFOUND;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(const char *) apr_pescape_ldap(apr_pool_t *p, const void *src,
+        apr_ssize_t srclen, int flags)
+{
+    apr_size_t len;
+
+    switch (apr_escape_ldap(NULL, src, srclen, flags, &len)) {
+    case APR_SUCCESS: {
+        char *encoded = apr_palloc(p, len);
+        apr_escape_ldap(encoded, src, srclen, flags, NULL);
+        return encoded;
+    }
+    case APR_NOTFOUND: {
+        break;
+    }
+    }
+
+    return src;
+}
+
diff -Nru apr-1.5.2/file_io/netware/pipe.c apr-1.6.5/file_io/netware/pipe.c
--- apr-1.5.2/file_io/netware/pipe.c	2011-10-15 21:26:14.000000000 +0000
+++ apr-1.6.5/file_io/netware/pipe.c	2016-03-25 01:28:13.000000000 +0000
@@ -133,7 +133,8 @@
     return apr_os_pipe_put_ex(file, thefile, 0, pool);
 }
 
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *pool)
+static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
+        apr_pool_t *pool_in, apr_pool_t *pool_out)
 {
 	int     	filedes[2];
 
@@ -141,11 +142,11 @@
         return errno;
     }
 
-    (*in) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*out) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
+    (*in) = (apr_file_t *)apr_pcalloc(pool_in, sizeof(apr_file_t));
+    (*out) = (apr_file_t *)apr_pcalloc(pool_out, sizeof(apr_file_t));
 
-    (*in)->pool     =
-    (*out)->pool    = pool;
+    (*in)->pool     = pool_in;
+    (*out)->pool    = pool_out;
     (*in)->filedes   = filedes[0];
     (*out)->filedes  = filedes[1];
     (*in)->flags     = APR_INHERIT;
@@ -163,8 +164,8 @@
     (*in)->ungetchar = -1;
     (*in)->thlock    =
     (*out)->thlock   = NULL;
-    (void) apr_pollset_create(&(*in)->pollset, 1, pool, 0);
-    (void) apr_pollset_create(&(*out)->pollset, 1, pool, 0);
+    (void) apr_pollset_create(&(*in)->pollset, 1, pool_in, 0);
+    (void) apr_pollset_create(&(*out)->pollset, 1, pool_out, 0);
 
     apr_pool_cleanup_register((*in)->pool, (void *)(*in), apr_unix_file_cleanup,
                          apr_pool_cleanup_null);
@@ -174,6 +175,30 @@
     return APR_SUCCESS;
 }
 
+static void file_pipe_block(apr_file_t **in, apr_file_t **out,
+        apr_int32_t blocking)
+{
+    switch (blocking) {
+    case APR_FULL_BLOCK:
+        break;
+    case APR_READ_BLOCK:
+        apr_file_pipe_timeout_set(*out, 0);
+        break;
+    case APR_WRITE_BLOCK:
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    default:
+        apr_file_pipe_timeout_set(*out, 0);
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    }
+}
+
+APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *pool)
+{
+    return file_pipe_create(in, out, pool, pool);
+}
+
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
                                                   apr_file_t **out, 
                                                   apr_int32_t blocking,
@@ -181,23 +206,26 @@
 {
     apr_status_t status;
 
-    if ((status = apr_file_pipe_create(in, out, pool)) != APR_SUCCESS)
+    if ((status = file_pipe_create(in, out, pool, pool)) != APR_SUCCESS) {
         return status;
+    }
 
-    switch (blocking) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_READ_BLOCK:
-            apr_file_pipe_timeout_set(*out, 0);
-            break;
-        case APR_WRITE_BLOCK:
-            apr_file_pipe_timeout_set(*in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(*out, 0);
-            apr_file_pipe_timeout_set(*in, 0);
+    file_pipe_block(in, out, blocking);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
+        apr_file_t **out, apr_int32_t blocking, apr_pool_t *pool_in, apr_pool_t *pool_out)
+{
+    apr_status_t status;
+
+    if ((status = file_pipe_create(in, out, pool_in, pool_out)) != APR_SUCCESS) {
+        return status;
     }
 
+    file_pipe_block(in, out, blocking);
+
     return APR_SUCCESS;
 }
 
diff -Nru apr-1.5.2/file_io/os2/pipe.c apr-1.6.5/file_io/os2/pipe.c
--- apr-1.5.2/file_io/os2/pipe.c	2007-10-14 13:34:42.000000000 +0000
+++ apr-1.6.5/file_io/os2/pipe.c	2016-03-25 01:28:13.000000000 +0000
@@ -24,7 +24,8 @@
 #include 
 #include 
 
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *pool)
+static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
+        apr_pool_t *pool_in, apr_pool_t *pool_out)
 {
     ULONG filedes[2];
     ULONG rc, action;
@@ -54,7 +55,7 @@
         return APR_FROM_OS_ERROR(rc);
     }
 
-    (*in) = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
+    (*in) = (apr_file_t *)apr_palloc(pool_in, sizeof(apr_file_t));
     rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, FALSE);
 
     if (rc) {
@@ -76,33 +77,59 @@
         return APR_FROM_OS_ERROR(rc);
     }
 
-    (*in)->pool = pool;
+    (*in)->pool = pool_in;
     (*in)->filedes = filedes[0];
-    (*in)->fname = apr_pstrdup(pool, pipename);
+    (*in)->fname = apr_pstrdup(pool_in, pipename);
     (*in)->isopen = TRUE;
     (*in)->buffered = FALSE;
     (*in)->flags = 0;
     (*in)->pipe = 1;
     (*in)->timeout = -1;
     (*in)->blocking = BLK_ON;
-    apr_pool_cleanup_register(pool, *in, apr_file_cleanup, apr_pool_cleanup_null);
+    apr_pool_cleanup_register(pool_in, *in, apr_file_cleanup,
+            apr_pool_cleanup_null);
 
-    (*out) = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
-    (*out)->pool = pool;
+    (*out) = (apr_file_t *)apr_palloc(pool_out, sizeof(apr_file_t));
+    (*out)->pool = pool_out;
     (*out)->filedes = filedes[1];
-    (*out)->fname = apr_pstrdup(pool, pipename);
+    (*out)->fname = apr_pstrdup(pool_out, pipename);
     (*out)->isopen = TRUE;
     (*out)->buffered = FALSE;
     (*out)->flags = 0;
     (*out)->pipe = 1;
     (*out)->timeout = -1;
     (*out)->blocking = BLK_ON;
-    apr_pool_cleanup_register(pool, *out, apr_file_cleanup, apr_pool_cleanup_null);
+    apr_pool_cleanup_register(pool_out, *out, apr_file_cleanup,
+            apr_pool_cleanup_null);
 
     return APR_SUCCESS;
 }
 
+static void file_pipe_block(apr_file_t **in, apr_file_t **out,
+        apr_int32_t blocking)
+{
+    switch (blocking) {
+    case APR_FULL_BLOCK:
+        break;
+    case APR_READ_BLOCK:
+        apr_file_pipe_timeout_set(*out, 0);
+        break;
+    case APR_WRITE_BLOCK:
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    default:
+        apr_file_pipe_timeout_set(*out, 0);
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    }
+}
 
+APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in,
+                                               apr_file_t **out,
+                                               apr_pool_t *pool)
+{
+    return file_pipe_create(in, out, pool, pool);
+}
 
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
                                                   apr_file_t **out, 
@@ -111,26 +138,29 @@
 {
     apr_status_t status;
 
-    if ((status = apr_file_pipe_create(in, out, pool)) != APR_SUCCESS)
+    if ((status = file_pipe_create(in, out, pool, pool)) != APR_SUCCESS)
         return status;
 
-    switch (blocking) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_READ_BLOCK:
-            apr_file_pipe_timeout_set(*out, 0);
-            break;
-        case APR_WRITE_BLOCK:
-            apr_file_pipe_timeout_set(*in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(*out, 0);
-            apr_file_pipe_timeout_set(*in, 0);
-    }
+    file_pipe_block(in, out, blocking);
 
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
+                                                     apr_file_t **out,
+                                                     apr_int32_t blocking,
+                                                     apr_pool_t *pool_in,
+                                                     apr_pool_t *pool_out)
+{
+    apr_status_t status;
+
+    if ((status = file_pipe_create(in, out, pool_in, pool_out)) != APR_SUCCESS)
+        return status;
+
+    file_pipe_block(in, out, blocking);
+
+    return APR_SUCCESS;
+}
     
     
 APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, apr_fileperms_t perm, apr_pool_t *pool)
diff -Nru apr-1.5.2/file_io/unix/copy.c apr-1.6.5/file_io/unix/copy.c
--- apr-1.5.2/file_io/unix/copy.c	2010-03-02 00:06:59.000000000 +0000
+++ apr-1.6.5/file_io/unix/copy.c	2017-04-11 21:20:34.000000000 +0000
@@ -41,6 +41,7 @@
             return status;
         }
         perms = finfo.protection;
+        apr_file_perms_set(to_path, perms); /* ignore any failure */
     }
     else
         perms = to_perms;
diff -Nru apr-1.5.2/file_io/unix/flock.c apr-1.6.5/file_io/unix/flock.c
--- apr-1.5.2/file_io/unix/flock.c	2006-08-03 10:55:31.000000000 +0000
+++ apr-1.6.5/file_io/unix/flock.c	2015-08-20 11:32:19.000000000 +0000
@@ -32,8 +32,8 @@
         struct flock l = { 0 };
         int fc;
 
-        l.l_whence = SEEK_SET;  /* lock from current point */
-        l.l_start = 0;          /* begin lock at this offset */
+        l.l_whence = SEEK_SET;  /* count l_start from start of file */
+        l.l_start = 0;          /* lock from start of file */
         l.l_len = 0;            /* lock to end of file */
         if ((type & APR_FLOCK_TYPEMASK) == APR_FLOCK_SHARED)
             l.l_type = F_RDLCK;
@@ -90,8 +90,8 @@
     {
         struct flock l = { 0 };
 
-        l.l_whence = SEEK_SET;  /* lock from current point */
-        l.l_start = 0;          /* begin lock at this offset */
+        l.l_whence = SEEK_SET;  /* count l_start from start of file */
+        l.l_start = 0;          /* lock from start of file */
         l.l_len = 0;            /* lock to end of file */
         l.l_type = F_UNLCK;
 
diff -Nru apr-1.5.2/file_io/unix/pipe.c apr-1.6.5/file_io/unix/pipe.c
--- apr-1.5.2/file_io/unix/pipe.c	2013-10-03 14:30:17.000000000 +0000
+++ apr-1.6.5/file_io/unix/pipe.c	2016-03-25 01:28:13.000000000 +0000
@@ -176,7 +176,8 @@
     return apr_os_pipe_put_ex(file, thefile, 0, pool);
 }
 
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *pool)
+static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
+        apr_pool_t *pool_in, apr_pool_t *pool_out)
 {
     int filedes[2];
 
@@ -184,8 +185,8 @@
         return errno;
     }
     
-    (*in) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*in)->pool = pool;
+    (*in) = (apr_file_t *)apr_pcalloc(pool_in, sizeof(apr_file_t));
+    (*in)->pool = pool_in;
     (*in)->filedes = filedes[0];
     (*in)->is_pipe = 1;
     (*in)->fname = NULL;
@@ -200,8 +201,8 @@
 #ifndef WAITIO_USES_POLL
     (*in)->pollset = NULL;
 #endif
-    (*out) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*out)->pool = pool;
+    (*out) = (apr_file_t *)apr_pcalloc(pool_out, sizeof(apr_file_t));
+    (*out)->pool = pool_out;
     (*out)->filedes = filedes[1];
     (*out)->is_pipe = 1;
     (*out)->fname = NULL;
@@ -222,6 +223,30 @@
     return APR_SUCCESS;
 }
 
+static void file_pipe_block(apr_file_t **in, apr_file_t **out, apr_int32_t blocking)
+{
+    switch (blocking) {
+    case APR_FULL_BLOCK:
+        break;
+    case APR_READ_BLOCK:
+        apr_file_pipe_timeout_set(*out, 0);
+        break;
+    case APR_WRITE_BLOCK:
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    default:
+        apr_file_pipe_timeout_set(*out, 0);
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    }
+}
+
+APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in,
+        apr_file_t **out, apr_pool_t *pool)
+{
+    return file_pipe_create(in, out, pool, pool);
+}
+
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
                                                   apr_file_t **out, 
                                                   apr_int32_t blocking,
@@ -229,23 +254,26 @@
 {
     apr_status_t status;
 
-    if ((status = apr_file_pipe_create(in, out, pool)) != APR_SUCCESS)
+    if ((status = file_pipe_create(in, out, pool, pool)) != APR_SUCCESS) {
         return status;
+    }
 
-    switch (blocking) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_READ_BLOCK:
-            apr_file_pipe_timeout_set(*out, 0);
-            break;
-        case APR_WRITE_BLOCK:
-            apr_file_pipe_timeout_set(*in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(*out, 0);
-            apr_file_pipe_timeout_set(*in, 0);
+    file_pipe_block(in, out, blocking);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
+        apr_file_t **out, apr_int32_t blocking, apr_pool_t *pool_in, apr_pool_t *pool_out)
+{
+    apr_status_t status;
+
+    if ((status = file_pipe_create(in, out, pool_in, pool_out)) != APR_SUCCESS) {
+        return status;
     }
 
+    file_pipe_block(in, out, blocking);
+
     return APR_SUCCESS;
 }
 
diff -Nru apr-1.5.2/file_io/unix/readwrite.c apr-1.6.5/file_io/unix/readwrite.c
--- apr-1.5.2/file_io/unix/readwrite.c	2013-10-03 14:30:17.000000000 +0000
+++ apr-1.6.5/file_io/unix/readwrite.c	2017-04-05 10:44:07.000000000 +0000
@@ -387,6 +387,8 @@
 
 #ifdef HAVE_FDATASYNC
     if (fdatasync(thefile->filedes)) {
+#elif defined(F_FULLFSYNC)
+    if (fcntl(thefile->filedes, F_FULLFSYNC)) {
 #else
     if (fsync(thefile->filedes)) {
 #endif
diff -Nru apr-1.5.2/file_io/unix/seek.c apr-1.6.5/file_io/unix/seek.c
--- apr-1.5.2/file_io/unix/seek.c	2012-05-06 18:02:06.000000000 +0000
+++ apr-1.6.5/file_io/unix/seek.c	2017-06-30 20:44:56.000000000 +0000
@@ -117,6 +117,13 @@
             /* Reset buffer positions for write mode */
             fp->bufpos = fp->direction = fp->dataRead = 0;
         }
+        else if (fp->direction == 0) {
+            /* Discard the read buffer, as we are about to reposition
+             * ourselves to the end of file.
+             */
+            fp->bufpos = 0;
+            fp->dataRead = 0;
+        }
         file_unlock(fp);
         if (rc) {
             return rc;
diff -Nru apr-1.5.2/file_io/win32/buffer.c apr-1.6.5/file_io/win32/buffer.c
--- apr-1.5.2/file_io/win32/buffer.c	2006-08-03 10:55:31.000000000 +0000
+++ apr-1.6.5/file_io/win32/buffer.c	2018-09-05 17:01:01.000000000 +0000
@@ -23,13 +23,17 @@
 {
     apr_status_t rv;
 
-    apr_thread_mutex_lock(file->mutex);
+    if (file->flags & APR_FOPEN_XTHREAD) {
+        apr_thread_mutex_lock(file->mutex);
+    }
  
     if(file->buffered) {
         /* Flush the existing buffer */
         rv = apr_file_flush(file);
         if (rv != APR_SUCCESS) {
-            apr_thread_mutex_unlock(file->mutex);
+            if (file->flags & APR_FOPEN_XTHREAD) {
+                apr_thread_mutex_unlock(file->mutex);
+            }
             return rv;
         }
     }
@@ -48,7 +52,9 @@
             file->buffered = 0;
     }
     
-    apr_thread_mutex_unlock(file->mutex);
+    if (file->flags & APR_FOPEN_XTHREAD) {
+        apr_thread_mutex_unlock(file->mutex);
+    }
 
     return APR_SUCCESS;
 }
diff -Nru apr-1.5.2/file_io/win32/filepath.c apr-1.6.5/file_io/win32/filepath.c
--- apr-1.5.2/file_io/win32/filepath.c	2013-10-03 10:33:51.000000000 +0000
+++ apr-1.6.5/file_io/win32/filepath.c	2015-06-18 08:42:20.000000000 +0000
@@ -890,9 +890,9 @@
                             memmove(path + keptlen + namelen + 1,
                                    path + keptlen + seglen + 1,
                                    pathlen - keptlen - seglen);
-                            pathlen += namelen - seglen;
-                            seglen = namelen;
                         }
+                        pathlen += namelen - seglen;
+                        seglen = namelen;
                     }
                     else { /* namelen > seglen */
                         if (pathlen + namelen - seglen >= sizeof(path))
diff -Nru apr-1.5.2/file_io/win32/filestat.c apr-1.6.5/file_io/win32/filestat.c
--- apr-1.5.2/file_io/win32/filestat.c	2011-03-21 16:55:11.000000000 +0000
+++ apr-1.6.5/file_io/win32/filestat.c	2016-12-19 18:29:34.000000000 +0000
@@ -427,6 +427,24 @@
             return rv;
     }
 
+    /* GetFileInformationByHandle() is implemented via two syscalls:
+     * QueryInformationVolume and QueryAllInformationFile. Use cheaper
+     * GetFileSizeEx() API if we only need to get the file size. */
+    if (wanted == APR_FINFO_SIZE) {
+       LARGE_INTEGER size;
+
+       if (!GetFileSizeEx(thefile->filehand, &size)) {
+          return apr_get_os_error();
+       }
+
+       finfo->pool = thefile->pool;
+       finfo->fname = thefile->fname;
+       finfo->size = size.QuadPart;
+       finfo->valid = APR_FINFO_SIZE;
+
+       return APR_SUCCESS;
+    }
+
     if (!GetFileInformationByHandle(thefile->filehand, &FileInfo)) {
         return apr_get_os_error();
     }
diff -Nru apr-1.5.2/file_io/win32/pipe.c apr-1.6.5/file_io/win32/pipe.c
--- apr-1.5.2/file_io/win32/pipe.c	2015-04-25 11:51:04.000000000 +0000
+++ apr-1.6.5/file_io/win32/pipe.c	2017-09-26 15:29:52.000000000 +0000
@@ -68,7 +68,7 @@
                                                apr_pool_t *p)
 {
     /* Unix creates full blocking pipes. */
-    return apr_file_pipe_create_ex(in, out, APR_FULL_BLOCK, p);
+    return apr_file_pipe_create_pools(in, out, APR_FULL_BLOCK, p, p);
 }
 
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in,
@@ -76,6 +76,15 @@
                                                   apr_int32_t blocking,
                                                   apr_pool_t *p)
 {
+    return apr_file_pipe_create_pools(in, out, blocking, p, p);
+}
+
+APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
+                                                     apr_file_t **out,
+                                                     apr_int32_t blocking,
+                                                     apr_pool_t *pool_in,
+                                                     apr_pool_t *pool_out)
+{
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
 #else
@@ -96,8 +105,8 @@
 #endif
     sa.lpSecurityDescriptor = NULL;
 
-    (*in) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
-    (*in)->pool = p;
+    (*in) = (apr_file_t *)apr_pcalloc(pool_in, sizeof(apr_file_t));
+    (*in)->pool = pool_in;
     (*in)->fname = NULL;
     (*in)->pipe = 1;
     (*in)->timeout = -1;
@@ -111,8 +120,8 @@
 #if APR_FILES_AS_SOCKETS
     (void) apr_pollset_create(&(*in)->pollset, 1, p, 0);
 #endif
-    (*out) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
-    (*out)->pool = p;
+    (*out) = (apr_file_t *)apr_pcalloc(pool_out, sizeof(apr_file_t));
+    (*out)->pool = pool_out;
     (*out)->fname = NULL;
     (*out)->pipe = 1;
     (*out)->timeout = -1;
@@ -150,7 +159,8 @@
         if (blocking == APR_WRITE_BLOCK /* READ_NONBLOCK */
                || blocking == APR_FULL_NONBLOCK) {
             dwOpenMode |= FILE_FLAG_OVERLAPPED;
-            (*in)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
+            (*in)->pOverlapped =
+                    (OVERLAPPED*) apr_pcalloc((*in)->pool, sizeof(OVERLAPPED));
             (*in)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
             (*in)->timeout = 0;
         }
@@ -179,7 +189,8 @@
         if (blocking == APR_READ_BLOCK /* WRITE_NONBLOCK */
                 || blocking == APR_FULL_NONBLOCK) {
             dwOpenMode |= FILE_FLAG_OVERLAPPED;
-            (*out)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
+            (*out)->pOverlapped =
+                    (OVERLAPPED*) apr_pcalloc((*out)->pool, sizeof(OVERLAPPED));
             (*out)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
             (*out)->timeout = 0;
         }
diff -Nru apr-1.5.2/file_io/win32/seek.c apr-1.6.5/file_io/win32/seek.c
--- apr-1.5.2/file_io/win32/seek.c	2011-03-21 14:47:28.000000000 +0000
+++ apr-1.6.5/file_io/win32/seek.c	2017-06-30 20:44:56.000000000 +0000
@@ -161,17 +161,43 @@
     LONG  offhi = (LONG)(offset >> 32);
     DWORD rc;
 
+    if (thefile->buffered) {
+        if (thefile->direction == 1) {
+            /* Figure out what needs to be flushed.  Don't flush the part
+             * of the write buffer that will get truncated anyway.
+             */
+            if (offset < thefile->filePtr) {
+                thefile->bufpos = 0;
+            }
+            else if (offset < thefile->filePtr + (apr_off_t)thefile->bufpos) {
+                thefile->bufpos = offset - thefile->filePtr;
+            }
+
+            if (thefile->bufpos != 0) {
+                rv = apr_file_flush(thefile);
+                if (rv != APR_SUCCESS)
+                    return rv;
+            }
+        }
+        else if (thefile->direction == 0) {
+            /* Discard the read buffer, as we are about to reposition
+             * ourselves to the end of file.
+             */
+            thefile->bufpos = 0;
+            thefile->dataRead = 0;
+        }
+    }
+
     rc = SetFilePointer(thefile->filehand, offlo, &offhi, FILE_BEGIN);
     if (rc == 0xFFFFFFFF)
         if ((rv = apr_get_os_error()) != APR_SUCCESS)
             return rv;
+    thefile->filePtr = offset;
+    /* Don't report EOF until the next read. */
+    thefile->eof_hit = 0;
 
     if (!SetEndOfFile(thefile->filehand))
         return apr_get_os_error();
 
-    if (thefile->buffered) {
-        return setptr(thefile, offset);
-    }
-
     return APR_SUCCESS;
 }
diff -Nru apr-1.5.2/include/apr_allocator.h apr-1.6.5/include/apr_allocator.h
--- apr-1.5.2/include/apr_allocator.h	2013-10-03 13:29:03.000000000 +0000
+++ apr-1.6.5/include/apr_allocator.h	2018-08-25 13:50:04.000000000 +0000
@@ -103,6 +103,16 @@
 APR_DECLARE(void) apr_allocator_free(apr_allocator_t *allocator,
                                      apr_memnode_t *memnode)
                   __attribute__((nonnull(1,2)));
+ 
+/**
+ * Get the true size that would be allocated for the given size (including
+ * the header and alignment).
+ * @param allocator The allocator from which to the memory would be allocated
+ * @param size The size to align
+ * @return The aligned size (or zero on apr_size_t overflow)
+ */
+APR_DECLARE(apr_size_t) apr_allocator_align(apr_allocator_t *allocator,
+                                            apr_size_t size);
 
 #include "apr_pools.h"
 
diff -Nru apr-1.5.2/include/apr_atomic.h apr-1.6.5/include/apr_atomic.h
--- apr-1.5.2/include/apr_atomic.h	2007-07-10 16:35:45.000000000 +0000
+++ apr-1.6.5/include/apr_atomic.h	2018-08-26 10:05:37.000000000 +0000
@@ -41,7 +41,7 @@
  * @param p pool
  * @return APR_SUCCESS on successful completion
  * @remark Programs do NOT need to call this directly. APR will call this
- *         automatically from apr_initialize.
+ *         automatically from apr_initialize().
  * @internal
  */
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p);
diff -Nru apr-1.5.2/include/apr_cstr.h apr-1.6.5/include/apr_cstr.h
--- apr-1.5.2/include/apr_cstr.h	1970-01-01 00:00:00.000000000 +0000
+++ apr-1.6.5/include/apr_cstr.h	2016-12-03 20:49:29.000000000 +0000
@@ -0,0 +1,292 @@
+/* ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ */
+
+/**
+ * @file apr_cstr.h
+ * @brief C string goodies.
+ */
+
+#ifndef APR_CSTR_H
+#define APR_CSTR_H
+
+#include           /* for apr_size_t */
+#include     /* for apr_pool_t */
+#include    /* for apr_array_header_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @defgroup apr_cstr C (POSIX) locale string functions
+ * @ingroup apr_strings
+ *
+ * The apr_cstr_* functions provide traditional C char * string text handling,
+ * and notabilty they treat all text in the C (a.k.a. POSIX) locale using the
+ * minimal POSIX character set, represented in either ASCII or a corresponding
+ * EBCDIC subset.
+ *
+ * Character values outside of that set are treated as opaque bytes, and all
+ * multi-byte character sequences are handled as individual distinct octets.
+ *
+ * Multi-byte characters sequences whose octets fall in the ASCII range cause
+ * unexpected results, such as in the ISO-2022-JP code page where ASCII octets
+ * occur within both shift-state and multibyte sequences.
+ *
+ * In the case of the UTF-8 encoding, all multibyte characters all fall outside
+ * of the C/POSIX range of characters, so these functions are generally safe
+ * to use on UTF-8 strings. The programmer must be aware that each octet may
+ * not represent a distinct printable character in such encodings.
+ *
+ * The standard C99/POSIX string functions, rather than apr_cstr, should be
+ * used in all cases where the current locale and encoding of the text is
+ * significant.
+ * @{
+ */
+
+
+/** Divide @a input into substrings, interpreting any char from @a sep
+ * as a token separator.
+ *
+ * Return an array of copies of those substrings (plain const char*),
+ * allocating both the array and the copies in @a pool.
+ *
+ * None of the elements added to the array contain any of the
+ * characters in @a sep_chars, and none of the new elements are empty
+ * (thus, it is possible that the returned array will have length
+ * zero).
+ *
+ * If @a chop_whitespace is TRUE, then remove leading and trailing
+ * whitespace from the returned strings.
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(apr_array_header_t *) apr_cstr_split(const char *input,
+                                                 const char *sep_chars,
+                                                 int chop_whitespace,
+                                                 apr_pool_t *pool);
+
+/** Like apr_cstr_split(), but append to existing @a array instead of
+ * creating a new one.  Allocate the copied substrings in @a pool
+ * (i.e., caller decides whether or not to pass @a array->pool as @a pool).
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(void) apr_cstr_split_append(apr_array_header_t *array,
+                                        const char *input,
+                                        const char *sep_chars,
+                                        int chop_whitespace,
+                                        apr_pool_t *pool);
+
+
+/** Return @c TRUE iff @a str matches any of the elements of @a list, a list
+ * of zero or more glob patterns.
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(int) apr_cstr_match_glob_list(const char *str,
+                                          const apr_array_header_t *list);
+
+/** Return @c TRUE iff @a str exactly matches any of the elements of @a list.
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(int) apr_cstr_match_list(const char *str,
+                                     const apr_array_header_t *list);
+
+/**
+ * Get the next token from @a *str interpreting any char from @a sep as a
+ * token separator.  Separators at the beginning of @a str will be skipped.
+ * Returns a pointer to the beginning of the first token in @a *str or NULL
+ * if no token is left.  Modifies @a str such that the next call will return
+ * the next token.
+ *
+ * @note The content of @a *str may be modified by this function.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(char *) apr_cstr_tokenize(const char *sep, char **str);
+
+/**
+ * Return the number of line breaks in @a msg, allowing any kind of newline
+ * termination (CR, LF, CRLF, or LFCR), even inconsistent.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(int) apr_cstr_count_newlines(const char *msg);
+
+#if 0 /* XXX: stringbuf logic is not present in APR */
+/**
+ * Return a cstring which is the concatenation of @a strings (an array
+ * of char *) each followed by @a separator (that is, @a separator
+ * will also end the resulting string).  Allocate the result in @a pool.
+ * If @a strings is empty, then return the empty string.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(char *) apr_cstr_join(const apr_array_header_t *strings,
+                                  const char *separator,
+                                  apr_pool_t *pool);
+#endif
+
+/**
+ * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
+ * treating upper and lower case values of the 26 standard C/POSIX alphabetic
+ * characters as equivalent. Extended latin characters outside of this set
+ * are treated as unique octets, irrespective of the current locale.
+ *
+ * Returns in integer greater than, equal to, or less than 0,
+ * according to whether @a str1 is considered greater than, equal to,
+ * or less than @a str2.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(int) apr_cstr_casecmp(const char *str1, const char *str2);
+
+/**
+ * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
+ * treating upper and lower case values of the 26 standard C/POSIX alphabetic
+ * characters as equivalent. Extended latin characters outside of this set
+ * are treated as unique octets, irrespective of the current locale.
+ *
+ * Returns in integer greater than, equal to, or less than 0,
+ * according to whether @a str1 is considered greater than, equal to,
+ * or less than @a str2.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(int) apr_cstr_casecmpn(const char *str1,
+                                   const char *str2,
+                                   apr_size_t n);
+
+/**
+ * Parse the C string @a str into a 64 bit number, and return it in @a *n.
+ * Assume that the number is represented in base @a base.
+ * Raise an error if conversion fails (e.g. due to overflow), or if the
+ * converted number is smaller than @a minval or larger than @a maxval.
+ *
+ * Leading whitespace in @a str is skipped in a locale-dependent way.
+ * After that, the string may contain an optional '+' (positive, default)
+ * or '-' (negative) character, followed by an optional '0x' prefix if
+ * @a base is 0 or 16, followed by numeric digits appropriate for the base.
+ * If there are any more characters after the numeric digits, an error is
+ * returned.
+ *
+ * If @a base is zero, then a leading '0x' or '0X' prefix means hexadecimal,
+ * else a leading '0' means octal (implemented, though not documented, in
+ * apr_strtoi64() in APR 0.9.0 through 1.5.0), else use base ten.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_strtoi64(apr_int64_t *n, const char *str,
+                                            apr_int64_t minval,
+                                            apr_int64_t maxval,
+                                            int base);
+
+/**
+ * Parse the C string @a str into a 64 bit number, and return it in @a *n.
+ * Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoi64().
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoi64(apr_int64_t *n, const char *str);
+
+/**
+ * Parse the C string @a str into a 32 bit number, and return it in @a *n.
+ * Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoi64().
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoi(int *n, const char *str);
+
+/**
+ * Parse the C string @a str into an unsigned 64 bit number, and return
+ * it in @a *n. Assume that the number is represented in base @a base.
+ * Raise an error if conversion fails (e.g. due to overflow), or if the
+ * converted number is smaller than @a minval or larger than @a maxval.
+ *
+ * Leading whitespace in @a str is skipped in a locale-dependent way.
+ * After that, the string may contain an optional '+' (positive, default)
+ * or '-' (negative) character, followed by an optional '0x' prefix if
+ * @a base is 0 or 16, followed by numeric digits appropriate for the base.
+ * If there are any more characters after the numeric digits, an error is
+ * returned.
+ *
+ * If @a base is zero, then a leading '0x' or '0X' prefix means hexadecimal,
+ * else a leading '0' means octal (as implemented, though not documented, in
+ * apr_strtoi64(), else use base ten.
+ *
+ * @warning The implementation returns APR_ERANGE if the parsed number
+ * is greater than APR_INT64_MAX, even if it is not greater than @a maxval.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_strtoui64(apr_uint64_t *n, const char *str,
+                                             apr_uint64_t minval,
+                                             apr_uint64_t maxval,
+                                             int base);
+
+/**
+ * Parse the C string @a str into an unsigned 64 bit number, and return
+ * it in @a *n. Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoui64(),
+ * including the upper limit of APR_INT64_MAX.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoui64(apr_uint64_t *n, const char *str);
+
+/**
+ * Parse the C string @a str into an unsigned 32 bit number, and return
+ * it in @a *n. Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoui64(),
+ * including the upper limit of APR_INT64_MAX.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoui(unsigned int *n, const char *str);
+
+/**
+ * Skip the common prefix @a prefix from the C string @a str, and return
+ * a pointer to the next character after the prefix.
+ * Return @c NULL if @a str does not start with @a prefix.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(const char *) apr_cstr_skip_prefix(const char *str,
+                                               const char *prefix);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif  /* SVN_STRING_H */
diff -Nru apr-1.5.2/include/apr_errno.h apr-1.6.5/include/apr_errno.h
--- apr-1.5.2/include/apr_errno.h	2014-04-15 23:22:29.000000000 +0000
+++ apr-1.6.5/include/apr_errno.h	2016-03-03 16:11:16.000000000 +0000
@@ -833,6 +833,20 @@
 #define APR_EAFNOSUPPORT  (APR_OS_START_CANONERR + 27)
 #endif
 
+/** @see APR_STATUS_IS_EOPNOTSUPP */
+#ifdef EOPNOTSUPP
+#define APR_EOPNOTSUPP EOPNOTSUPP
+#else
+#define APR_EOPNOTSUPP    (APR_OS_START_CANONERR + 28)
+#endif
+
+/** @see APR_STATUS_IS_ERANGE */
+#ifdef ERANGE
+#define APR_ERANGE ERANGE
+#else
+#define APR_ERANGE          (APR_OS_START_CANONERR + 29)
+#endif
+
 /** @} */
 
 #if defined(OS2) && !defined(DOXYGEN)
@@ -977,6 +991,9 @@
                 || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED)
 #define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_AFNOSUPPORT \
                 || (s) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT)
+#define APR_STATUS_IS_EOPNOTSUPP(s)     ((s) == APR_EOPNOTSUPP \
+                || (s) == APR_OS_START_SYSERR + SOCEOPNOTSUPP)
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 
 /*
     Sorry, too tired to wrap this up for OS2... feel free to
@@ -990,7 +1007,6 @@
     { SOCENOPROTOOPT,           ENOPROTOOPT     },
     { SOCEPROTONOSUPPORT,       EPROTONOSUPPORT },
     { SOCESOCKTNOSUPPORT,       ESOCKTNOSUPPORT },
-    { SOCEOPNOTSUPP,            EOPNOTSUPP      },
     { SOCEPFNOSUPPORT,          EPFNOSUPPORT    },
     { SOCEADDRINUSE,            EADDRINUSE      },
     { SOCEADDRNOTAVAIL,         EADDRNOTAVAIL   },
@@ -1122,6 +1138,9 @@
                 || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY)
 #define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_EAFNOSUPPORT \
                 || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
+#define APR_STATUS_IS_EOPNOTSUPP(s)     ((s) == APR_EOPNOTSUPP \
+                || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP)
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 
 #elif defined(NETWARE) && defined(USE_WINSOCK) && !defined(DOXYGEN) /* !defined(OS2) && !defined(WIN32) */
 
@@ -1183,6 +1202,9 @@
 #define APR_STATUS_IS_ENOTEMPTY(s)      ((s) == APR_ENOTEMPTY)
 #define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_EAFNOSUPPORT \
                 || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
+#define APR_STATUS_IS_EOPNOTSUPP(s)     ((s) == APR_EOPNOTSUPP \
+                || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP)
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 
 #else /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
 
@@ -1291,7 +1313,7 @@
 #define APR_STATUS_IS_EHOSTUNREACH(s)    ((s) == APR_EHOSTUNREACH)
 /** network is unreachable */
 #define APR_STATUS_IS_ENETUNREACH(s)     ((s) == APR_ENETUNREACH)
-/** inappropiate file type or format */
+/** inappropriate file type or format */
 #define APR_STATUS_IS_EFTYPE(s)          ((s) == APR_EFTYPE)
 /** broken pipe */
 #define APR_STATUS_IS_EPIPE(s)           ((s) == APR_EPIPE)
@@ -1302,6 +1324,11 @@
                                           (s) == APR_EEXIST)
 /** Address Family not supported */
 #define APR_STATUS_IS_EAFNOSUPPORT(s)    ((s) == APR_EAFNOSUPPORT)
+/** Socket operation not supported */
+#define APR_STATUS_IS_EOPNOTSUPP(s)      ((s) == APR_EOPNOTSUPP)
+
+/** Numeric value not representable */
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 /** @} */
 
 #endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
diff -Nru apr-1.5.2/include/apr_escape.h apr-1.6.5/include/apr_escape.h
--- apr-1.5.2/include/apr_escape.h	2013-11-16 22:23:26.000000000 +0000
+++ apr-1.6.5/include/apr_escape.h	2018-08-26 10:25:03.000000000 +0000
@@ -40,7 +40,22 @@
  * passed to indicate a string-valued key, and have the length computed
  * automatically.
  */
-#define APR_ESCAPE_STRING     (-1)
+#define APR_ESCAPE_STRING      (-1)
+
+/**
+ * Apply LDAP distinguished name escaping as per RFC4514.
+ */
+#define APR_ESCAPE_LDAP_DN     (0x01)
+
+/**
+ * Apply LDAP filter escaping as per RFC4515.
+ */
+#define APR_ESCAPE_LDAP_FILTER (0x02)
+
+/**
+ * Apply both RFC4514 and RFC4515 LDAP escaping.
+ */
+#define APR_ESCAPE_LDAP_ALL    (0x03)
 
 /**
  * Perform shell escaping on the provided string.
@@ -208,8 +223,8 @@
 
 /**
  * Apply entity encoding to a string. Characters are replaced as follows:
- * '<' becomes '<', '>' becomes '>', '&' becomes '&', the
- * double quote becomes '"" and the single quote becomes '''.
+ * '<' becomes '\<', '>' becomes '\>', '&' becomes '\&', the
+ * double quote becomes '\"" and the single quote becomes '\''.
  *
  * If toasc is not zero, any non ascii character will be encoded as
  * '%\#ddd;', where ddd is the decimal code of the character.
@@ -227,9 +242,9 @@
 
 /**
  * Apply entity encoding to a string, returning the result from a pool.
- * Characters are replaced as follows: '<' becomes '<', '>' becomes
- * '>', '&' becomes '&', the double quote becomes '"" and the
- * single quote becomes '''.
+ * Characters are replaced as follows: '<' becomes '\<', '>' becomes
+ * '\>', '&' becomes '\&', the double quote becomes '\"" and the
+ * single quote becomes '\''.
  * @param p Pool to allocate from
  * @param str The original string
  * @param toasc If non zero, encode non ascii characters
@@ -366,6 +381,35 @@
 APR_DECLARE(const void *) apr_punescape_hex(apr_pool_t *p, const char *str,
         int colon, apr_size_t *len);
 
+/**
+ * Apply LDAP escaping to binary data. Characters from RFC4514 and RFC4515
+ * are escaped with their hex equivalents.
+ * @param dest The destination buffer, can be NULL
+ * @param src The original buffer
+ * @param srclen The length of the original buffer
+ * @param flags APR_ESCAPE_LDAP_DN for RFC4514, APR_ESCAPE_LDAP_FILTER for
+ * RFC4515, APR_ESCAPE_LDAP_ALL for both
+ * @param len If present, returns the length of the string
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL
+ */
+APR_DECLARE(apr_status_t) apr_escape_ldap(char *dest, const void *src,
+        apr_ssize_t srclen, int flags, apr_size_t *len);
+
+/**
+ * Apply LDAP escaping to binary data, and return the results from a
+ * pool. Characters from RFC4514 and RFC4515 are escaped with their hex
+ * equivalents.
+ * @param p Pool to allocate from
+ * @param src The original buffer
+ * @param slen The length of the original buffer
+ * @param flags APR_ESCAPE_LDAP_DN for RFC4514, APR_ESCAPE_LDAP_FILTER for
+ * RFC4515, APR_ESCAPE_LDAP_ALL for both
+ * @return A zero padded buffer allocated from the pool on success, or
+ * NULL if src was NULL.
+ */
+APR_DECLARE(const char *) apr_pescape_ldap(apr_pool_t *p, const void *src,
+        apr_ssize_t slen, int flags) __attribute__((nonnull(1)));
+
 /** @} */
 #ifdef __cplusplus
 }
diff -Nru apr-1.5.2/include/apr_file_info.h apr-1.6.5/include/apr_file_info.h
--- apr-1.5.2/include/apr_file_info.h	2014-04-15 13:55:28.000000000 +0000
+++ apr-1.6.5/include/apr_file_info.h	2018-08-26 10:05:37.000000000 +0000
@@ -50,7 +50,7 @@
 
 /** apr_filetype_e values for the filetype member of the 
  * apr_file_info_t structure
- * @warning: Not all of the filetypes below can be determined.
+ * @warning Not all of the filetypes below can be determined.
  * For example, a given platform might not correctly report 
  * a socket descriptor as APR_SOCK if that type isn't 
  * well-identified on that platform.  In such cases where
@@ -413,7 +413,7 @@
  * Determine the encoding used internally by the FilePath functions
  * @param style points to a variable which receives the encoding style flag
  * @param p the pool to allocate any working storage
- * @remark Use @c apr_os_locale_encoding and/or @c apr_os_default_encoding
+ * @remark Use apr_os_locale_encoding() and/or apr_os_default_encoding()
  * to get the name of the path encoding if it's not UTF-8.
  */
 APR_DECLARE(apr_status_t) apr_filepath_encoding(int *style, apr_pool_t *p);
diff -Nru apr-1.5.2/include/apr_file_io.h apr-1.6.5/include/apr_file_io.h
--- apr-1.5.2/include/apr_file_io.h	2013-11-17 20:31:58.000000000 +0000
+++ apr-1.6.5/include/apr_file_io.h	2017-03-30 19:53:44.000000000 +0000
@@ -315,6 +315,10 @@
  *     file's permissions are copied.
  * @param pool The pool to use.
  * @remark The new file does not need to exist, it will be created if required.
+ * @remark Note that advanced filesystem permissions such as ACLs are not
+ * duplicated by this API. The target permissions (including duplicating the
+ * source file permissions) are assigned only when the target file does not yet
+ * exist.
  */
 APR_DECLARE(apr_status_t) apr_file_append(const char *from_path, 
                                           const char *to_path,
@@ -695,7 +699,7 @@
  * @bug  Some platforms cannot toggle between blocking and nonblocking,
  * and when passing a pipe as a standard handle to an application which
  * does not expect it, a non-blocking stream will fluxor the client app.
- * @deprecated @see apr_file_pipe_create_ex()
+ * @deprecated @see apr_file_pipe_create_pools()
  */
 APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, 
                                                apr_file_t **out,
@@ -719,6 +723,7 @@
  * does not expect it, a non-blocking stream will fluxor the client app.
  * Use this function rather than apr_file_pipe_create() to create pipes 
  * where one or both ends require non-blocking semantics.
+ * @deprecated @see apr_file_pipe_create_pools()
  */
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
                                                   apr_file_t **out, 
@@ -726,6 +731,33 @@
                                                   apr_pool_t *pool);
 
 /**
+ * Create an anonymous pipe which portably supports async timeout options,
+ * placing each side of the pipe in a different pool.
+ * @param in The newly created pipe's file for reading.
+ * @param out The newly created pipe's file for writing.
+ * @param blocking one of these values defined in apr_thread_proc.h;
+ *                 @li #APR_FULL_BLOCK
+ *                 @li #APR_READ_BLOCK
+ *                 @li #APR_WRITE_BLOCK
+ *                 @li #APR_FULL_NONBLOCK
+ * @param pool_in The pool for the reading pipe.
+ * @param pool_out The pool for the writing pipe.
+ * @remark By default, the returned file descriptors will be inherited
+ * by child processes created using apr_proc_create().  This can be
+ * changed using apr_file_inherit_unset().
+ * @remark Some platforms cannot toggle between blocking and nonblocking,
+ * and when passing a pipe as a standard handle to an application which
+ * does not expect it, a non-blocking stream will fluxor the client app.
+ * Use this function rather than apr_file_pipe_create() to create pipes
+ * where one or both ends require non-blocking semantics.
+ */
+APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
+                                                     apr_file_t **out,
+                                                     apr_int32_t blocking,
+                                                     apr_pool_t *pool_in,
+                                                     apr_pool_t *pool_out);
+
+/**
  * Create a named pipe.
  * @param filename The filename of the named pipe
  * @param perm The permissions for the newly created pipe.
diff -Nru apr-1.5.2/include/apr_general.h apr-1.6.5/include/apr_general.h
--- apr-1.5.2/include/apr_general.h	2013-06-17 12:28:14.000000000 +0000
+++ apr-1.6.5/include/apr_general.h	2018-08-26 10:05:37.000000000 +0000
@@ -170,8 +170,8 @@
 /**
  * Setup any APR internal data structures.  This MUST be the first function 
  * called for any APR library. It is safe to call apr_initialize several
- * times as long as apr_terminate is called the same number of times.
- * @remark See apr_app_initialize if this is an application, rather than
+ * times as long as apr_terminate() is called the same number of times.
+ * @remark See apr_app_initialize() if this is an application, rather than
  * a library consumer of apr.
  */
 APR_DECLARE(apr_status_t) apr_initialize(void);
@@ -184,9 +184,9 @@
  * @param argc Pointer to the argc that may be corrected
  * @param argv Pointer to the argv that may be corrected
  * @param env Pointer to the env that may be corrected, may be NULL
- * @remark See apr_initialize if this is a library consumer of apr.
- * Otherwise, this call is identical to apr_initialize, and must be closed
- * with a call to apr_terminate at the end of program execution.
+ * @remark See apr_initialize() if this is a library consumer of apr.
+ * Otherwise, this call is identical to apr_initialize(), and must be closed
+ * with a call to apr_terminate() at the end of program execution.
  */
 APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
                                              char const * const * *argv, 
@@ -198,20 +198,21 @@
  * apr_initialize() or apr_app_initialize().
  * @remark An APR program must call this function at termination once it 
  *         has stopped using APR services.  The APR developers suggest using
- *         atexit to ensure this is called.  When using APR from a language
- *         other than C that has problems with the calling convention, use
- *         apr_terminate2() instead.
+ *         @c atexit(apr_terminate) to ensure this is called.  When using APR
+ *         from a language other than C that has problems with the calling
+ *         convention, use apr_terminate2() instead.
+ * @see apr_terminate2
  */
 APR_DECLARE_NONSTD(void) apr_terminate(void);
 
 /**
  * Tear down any APR internal data structures which aren't torn down 
- * automatically, same as apr_terminate
- * @remark An APR program must call either the apr_terminate or apr_terminate2 
+ * automatically, same as apr_terminate()
+ * @remark An APR program must call either the apr_terminate() or apr_terminate2
  *         function once it it has finished using APR services.  The APR 
- *         developers suggest using atexit(apr_terminate) to ensure this is done.
+ *         developers suggest using @c atexit(apr_terminate) to ensure this is done.
  *         apr_terminate2 exists to allow non-c language apps to tear down apr, 
- *         while apr_terminate is recommended from c language applications.
+ *         while apr_terminate() is recommended from c language applications.
  */
 APR_DECLARE(void) apr_terminate2(void);
 
diff -Nru apr-1.5.2/include/apr_global_mutex.h apr-1.6.5/include/apr_global_mutex.h
--- apr-1.5.2/include/apr_global_mutex.h	2013-10-17 15:14:27.000000000 +0000
+++ apr-1.6.5/include/apr_global_mutex.h	2017-05-24 15:21:43.000000000 +0000
@@ -127,14 +127,25 @@
 APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex);
 
 /**
- * Display the name of the mutex, as it relates to the actual method used
- * for the underlying apr_proc_mutex_t, if any.  NULL is returned if
- * there is no underlying apr_proc_mutex_t.
- * @param mutex the name of the mutex
+ * Get the mechanism of the mutex, as it relates to the actual method
+ * used for the underlying apr_proc_mutex_t.
+ * @param mutex the mutex to get the mechanism from.
+ */
+APR_DECLARE(apr_lockmech_e) apr_global_mutex_mech(apr_global_mutex_t *mutex);
+
+/**
+ * Get the mechanism's name of the mutex, as it relates to the actual method
+ * used for the underlying apr_proc_mutex_t.
+ * @param mutex the mutex to get the mechanism's name from.
  */
 APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex);
 
 /**
+ * Set mutex permissions.
+ */
+APR_PERMS_SET_IMPLEMENT(global_mutex);
+
+/**
  * Get the pool used by this global_mutex.
  * @return apr_pool_t the pool
  */
@@ -155,7 +166,9 @@
 #define apr_global_mutex_unlock     apr_proc_mutex_unlock
 #define apr_global_mutex_destroy    apr_proc_mutex_destroy
 #define apr_global_mutex_lockfile   apr_proc_mutex_lockfile
+#define apr_global_mutex_mech       apr_proc_mutex_mech
 #define apr_global_mutex_name       apr_proc_mutex_name
+#define apr_global_mutex_perms_set  apr_proc_mutex_perms_set
 #define apr_global_mutex_pool_get   apr_proc_mutex_pool_get
 
 #endif
diff -Nru apr-1.5.2/include/apr_hash.h apr-1.6.5/include/apr_hash.h
--- apr-1.5.2/include/apr_hash.h	2013-03-29 12:45:21.000000000 +0000
+++ apr-1.6.5/include/apr_hash.h	2016-03-25 10:28:19.000000000 +0000
@@ -102,7 +102,8 @@
  * @param key Pointer to the key
  * @param klen Length of the key. Can be APR_HASH_KEY_STRING to use the string length.
  * @param val Value to associate with the key
- * @remark If the value is NULL the hash entry is deleted.
+ * @remark If the value is NULL the hash entry is deleted. The key is stored as is,
+ *         and so must have a lifetime at least as long as the hash table's pool.
  */
 APR_DECLARE(void) apr_hash_set(apr_hash_t *ht, const void *key,
                                apr_ssize_t klen, const void *val);
diff -Nru apr-1.5.2/include/apr.h.in apr-1.6.5/include/apr.h.in
--- apr-1.5.2/include/apr.h.in	2013-10-06 19:49:04.000000000 +0000
+++ apr-1.6.5/include/apr.h.in	2017-05-23 16:36:02.000000000 +0000
@@ -245,6 +245,7 @@
 #define APR_HAVE_INET_ADDR      @have_inet_addr@
 #define APR_HAVE_INET_NETWORK   @have_inet_network@
 #define APR_HAVE_IPV6           @have_ipv6@
+#define APR_HAVE_SOCKADDR_UN    @have_sockaddr_un@
 #define APR_HAVE_MEMMOVE        @have_memmove@
 #define APR_HAVE_SETRLIMIT      @have_setrlimit@
 #define APR_HAVE_SIGACTION      @have_sigaction@
diff -Nru apr-1.5.2/include/apr.hnw apr-1.6.5/include/apr.hnw
--- apr-1.5.2/include/apr.hnw	2011-04-02 22:31:46.000000000 +0000
+++ apr-1.6.5/include/apr.hnw	2014-04-28 17:24:21.000000000 +0000
@@ -180,6 +180,7 @@
 #else
 #define APR_HAVE_IPV6                   0
 #endif
+#define APR_HAVE_SOCKADDR_UN            0
 #define APR_HAVE_MEMCHR                 1
 #define APR_HAVE_MEMMOVE                1
 #define APR_HAVE_SETRLIMIT              0
diff -Nru apr-1.5.2/include/apr.hw apr-1.6.5/include/apr.hw
--- apr-1.5.2/include/apr.hw	2013-06-07 15:57:56.000000000 +0000
+++ apr-1.6.5/include/apr.hw	2016-12-14 20:44:35.000000000 +0000
@@ -25,7 +25,7 @@
  * And please, make an effort to stub apr.hnw and apr.h.in in the process.
  *
  * This is the Win32 specific version of apr.h.  It is copied from
- * apr.hw by the apr.dsp and libapr.dsp projects. 
+ * apr.hw by the apr.dsp and libapr.dsp projects.
  */
 
 /**
@@ -60,7 +60,9 @@
  *   C4244: int to char/short - precision loss
  *   C4514: unreferenced inline function removed
  */
+#if defined(_MSC_VER)
 #pragma warning(disable: 4100 4127 4163 4201 4514; once: 4057 4075 4244)
+#endif
 
 /* Ignore Microsoft's interpretation of secure development
  * and the POSIX string handling API
@@ -212,25 +214,42 @@
 /** @} */
 /** @} */
 
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
+/* We don't include our conditional headers within the doxyblocks
+ * or the extern "C" namespace
  */
 
 #if APR_HAVE_STDLIB_H
 #include 
 #endif
+
 #if APR_HAVE_STDIO_H
 #include 
 #endif
+
 #if APR_HAVE_SYS_TYPES_H
 #include 
 #endif
+
 #if APR_HAVE_STDDEF_H
 #include 
 #endif
+
+#if APR_HAVE_SYS_SOCKET_H
+#include 
+#endif
+
+#if APR_HAVE_STDINT_H
+#include 
+#endif
+
+#if APR_HAVE_SYS_WAIT_H
+#include 
+#endif
+
 #if APR_HAVE_TIME_H
 #include 
 #endif
+
 #if APR_HAVE_PROCESS_H
 #include 
 #endif
@@ -261,12 +280,12 @@
 #define APR_USE_SHMEM_MMAP_ANON    0
 #define APR_USE_SHMEM_BEOS         0
 
-#define APR_USE_FLOCK_SERIALIZE           0 
+#define APR_USE_FLOCK_SERIALIZE           0
 #define APR_USE_POSIXSEM_SERIALIZE        0
 #define APR_USE_SYSVSEM_SERIALIZE         0
 #define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_SERIALIZE         0 
+#define APR_USE_PROC_PTHREAD_SERIALIZE    0
+#define APR_USE_PTHREAD_SERIALIZE         0
 
 #define APR_HAS_FLOCK_SERIALIZE           0
 #define APR_HAS_SYSVSEM_SERIALIZE         0
@@ -282,7 +301,8 @@
 #define APR_HAVE_IN_ADDR        1
 #define APR_HAVE_INET_ADDR      1
 #define APR_HAVE_INET_NETWORK   0
-#define APR_HAVE_IPV6           0
+#define APR_HAVE_IPV6           1
+#define APR_HAVE_SOCKADDR_UN    0
 #define APR_HAVE_MEMMOVE        1
 #define APR_HAVE_SETRLIMIT      0
 #define APR_HAVE_SIGACTION      0
@@ -354,7 +374,7 @@
 
 /* Is the O_NONBLOCK flag inherited from listening sockets?
  */
-#define APR_O_NONBLOCK_INHERITED  1
+#define APR_O_NONBLOCK_INHERITED 1
 
 /* Typedefs that APR needs. */
 
@@ -626,18 +646,20 @@
      && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
 #endif
 
-#endif /* APR_HAS_IPV6 */
+#endif /* APR_HAVE_IPV6 */
 
 #ifdef __cplusplus
 }
 #endif
 
-/* Done with badly written headers
+/* Done with badly written headers, leave 'deprecated CRT' undeprecated
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1200
 #pragma warning(pop)
+#if _MSC_VER >= 1400
 #pragma warning(disable: 4996)
 #endif
+#endif
 
 #endif /* WIN32 */
 
diff -Nru apr-1.5.2/include/apr.hwc apr-1.6.5/include/apr.hwc
--- apr-1.5.2/include/apr.hwc	2013-10-03 16:35:53.000000000 +0000
+++ apr-1.6.5/include/apr.hwc	2015-10-09 12:58:14.000000000 +0000
@@ -25,7 +25,7 @@
  * And please, make an effort to stub apr.hnw and apr.h.in in the process.
  *
  * This is the Win32 specific version of apr.h.  It is copied from
- * apr.hw by the apr.dsp and libapr.dsp projects. 
+ * apr.hw by the apr.dsp and libapr.dsp projects.
  */
 
 /**
@@ -60,7 +60,9 @@
  *   C4244: int to char/short - precision loss
  *   C4514: unreferenced inline function removed
  */
+#if defined(_MSC_VER)
 #pragma warning(disable: 4100 4127 4163 4201 4514; once: 4057 4075 4244)
+#endif
 
 /* Ignore Microsoft's interpretation of secure development
  * and the POSIX string handling API
@@ -209,25 +211,42 @@
 /** @} */
 /** @} */
 
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
+/* We don't include our conditional headers within the doxyblocks
+ * or the extern "C" namespace
  */
 
 #if APR_HAVE_STDLIB_H
 #include 
 #endif
+
 #if APR_HAVE_STDIO_H
 #include 
 #endif
+
 #if APR_HAVE_SYS_TYPES_H
 #include 
 #endif
+
 #if APR_HAVE_STDDEF_H
 #include 
 #endif
+
+#if APR_HAVE_SYS_SOCKET_H
+#include 
+#endif
+
+#if APR_HAVE_STDINT_H
+#include 
+#endif
+
+#if APR_HAVE_SYS_WAIT_H
+#include 
+#endif
+
 #if APR_HAVE_TIME_H
 #include 
 #endif
+
 #if APR_HAVE_PROCESS_H
 #include 
 #endif
@@ -258,12 +277,12 @@
 #define APR_USE_SHMEM_MMAP_ANON    0
 #define APR_USE_SHMEM_BEOS         0
 
-#define APR_USE_FLOCK_SERIALIZE           0 
+#define APR_USE_FLOCK_SERIALIZE           0
 #define APR_USE_POSIXSEM_SERIALIZE        0
 #define APR_USE_SYSVSEM_SERIALIZE         0
 #define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_SERIALIZE         0 
+#define APR_USE_PROC_PTHREAD_SERIALIZE    0
+#define APR_USE_PTHREAD_SERIALIZE         0
 
 #define APR_HAS_FLOCK_SERIALIZE           0
 #define APR_HAS_SYSVSEM_SERIALIZE         0
@@ -280,6 +299,7 @@
 #define APR_HAVE_INET_ADDR      1
 #define APR_HAVE_INET_NETWORK   0
 #define APR_HAVE_IPV6           @apr_have_ipv6_10@
+#define APR_HAVE_SOCKADDR_UN    0
 #define APR_HAVE_MEMMOVE        1
 #define APR_HAVE_SETRLIMIT      0
 #define APR_HAVE_SIGACTION      0
@@ -351,7 +371,7 @@
 
 /* Is the O_NONBLOCK flag inherited from listening sockets?
  */
-#define APR_O_NONBLOCK_INHERITED  1
+#define APR_O_NONBLOCK_INHERITED 1
 
 /* Typedefs that APR needs. */
 
@@ -623,18 +643,20 @@
      && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
 #endif
 
-#endif /* APR_HAS_IPV6 */
+#endif /* APR_HAVE_IPV6 */
 
 #ifdef __cplusplus
 }
 #endif
 
-/* Done with badly written headers
+/* Done with badly written headers, leave 'deprecated CRT' undeprecated
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1200
 #pragma warning(pop)
+#if _MSC_VER >= 1400
 #pragma warning(disable: 4996)
 #endif
+#endif
 
 #endif /* WIN32 */
 
diff -Nru apr-1.5.2/include/apr_network_io.h apr-1.6.5/include/apr_network_io.h
--- apr-1.5.2/include/apr_network_io.h	2013-12-06 17:10:34.000000000 +0000
+++ apr-1.6.5/include/apr_network_io.h	2016-03-03 12:10:41.000000000 +0000
@@ -26,10 +26,14 @@
 #include "apr_file_io.h"
 #include "apr_errno.h"
 #include "apr_inherit.h" 
+#include "apr_perms_set.h"
 
 #if APR_HAVE_NETINET_IN_H
 #include 
 #endif
+#if APR_HAVE_SYS_UN_H
+#include 
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -101,6 +105,9 @@
                                     */
 #define APR_SO_BROADCAST     65536 /**< Allow broadcast
                                     */
+#define APR_SO_FREEBIND     131072 /**< Allow binding to addresses not owned
+                                    * by any interface
+                                    */
 
 /** @} */
 
@@ -156,6 +163,25 @@
 #define APR_INET6    AF_INET6
 #endif
 
+#if APR_HAVE_SOCKADDR_UN
+#if defined (AF_UNIX)
+#define APR_UNIX    AF_UNIX
+#elif defined(AF_LOCAL)
+#define APR_UNIX    AF_LOCAL
+#else
+#error "Neither AF_UNIX nor AF_LOCAL is defined"
+#endif
+#else /* !APR_HAVE_SOCKADDR_UN */
+#if defined (AF_UNIX)
+#define APR_UNIX    AF_UNIX
+#elif defined(AF_LOCAL)
+#define APR_UNIX    AF_LOCAL
+#else
+/* TODO: Use a smarter way to detect unique APR_UNIX value */
+#define APR_UNIX    1234
+#endif
+#endif
+
 /**
  * @defgroup IP_Proto IP Protocol Definitions for use when creating sockets
  * @{
@@ -247,6 +273,10 @@
          * dependent on whether APR_HAVE_IPV6 is defined. */
         struct sockaddr_storage sas;
 #endif
+#if APR_HAVE_SOCKADDR_UN
+        /** Unix domain socket sockaddr structure */
+        struct sockaddr_un unx;
+#endif
     } sa;
 };
 
@@ -375,6 +405,7 @@
  * @param sa The new apr_sockaddr_t.
  * @param hostname The hostname or numeric address string to resolve/parse, or
  *               NULL to build an address that corresponds to 0.0.0.0 or ::
+ *               or in case of APR_UNIX family it is absolute socket filename.
  * @param family The address family to use, or APR_UNSPEC if the system should 
  *               decide.
  * @param port The port number.
@@ -401,6 +432,16 @@
                                           apr_pool_t *p);
 
 /**
+ * Copy apr_sockaddr_t src to dst on pool p.
+ * @param dst The destination apr_sockaddr_t.
+ * @param src The source apr_sockaddr_t.
+ * @param p The pool for the apr_sockaddr_t and associated storage.
+ */
+APR_DECLARE(apr_status_t) apr_sockaddr_info_copy(apr_sockaddr_t **dst,
+                                                 const apr_sockaddr_t *src,
+                                                 apr_pool_t *p);
+
+/**
  * Look up the host name from an apr_sockaddr_t.
  * @param hostname The hostname.
  * @param sa The apr_sockaddr_t.
@@ -620,6 +661,7 @@
  *                                  of local addresses.
  *            APR_SO_SNDBUF     --  Set the SendBufferSize
  *            APR_SO_RCVBUF     --  Set the ReceiveBufferSize
+ *            APR_SO_FREEBIND   --  Allow binding to non-local IP address.
  *
    * @param on Value for the option. */ @@ -807,6 +849,11 @@ APR_DECLARE_INHERIT_UNSET(socket); /** + * Set socket permissions. + */ +APR_PERMS_SET_IMPLEMENT(socket); + +/** * @defgroup apr_mcast IP Multicast * @{ */ diff -Nru apr-1.5.2/include/apr_perms_set.h apr-1.6.5/include/apr_perms_set.h --- apr-1.5.2/include/apr_perms_set.h 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/include/apr_perms_set.h 2014-04-28 12:08:38.000000000 +0000 @@ -0,0 +1,65 @@ +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef APR_PERMS_SET_H +#define APR_PERMS_SET_H + +/** + * @file apr_perms_set.h + * @brief APR Process Locking Routines + */ + +#include "apr.h" +#include "apr_pools.h" +#include "apr_errno.h" +#include "apr_user.h" +#include "apr_file_info.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * @defgroup apr_perms_set Object permission set functions + * @ingroup APR + * @{ + */ + +/** Permission set callback function. */ +typedef apr_status_t (apr_perms_setfn_t)(void *object, apr_fileperms_t perms, + apr_uid_t uid, apr_gid_t gid); + +#define APR_PERMS_SET_IMPLEMENT(type) \ + APR_DECLARE(apr_status_t) apr_##type##_perms_set \ + (void *the##type, apr_fileperms_t perms, \ + apr_uid_t uid, apr_gid_t gid) + +#define APR_PERMS_SET_ENOTIMPL(type) \ + APR_DECLARE(apr_status_t) apr_##type##_perms_set \ + (void *the##type, apr_fileperms_t perms, \ + apr_uid_t uid, apr_gid_t gid) \ + { return APR_ENOTIMPL ; } + +#define APR_PERMS_SET_FN(type) apr_##type##_perms_set + + +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* ! APR_PERMS_SET */ diff -Nru apr-1.5.2/include/apr_poll.h apr-1.6.5/include/apr_poll.h --- apr-1.5.2/include/apr_poll.h 2014-04-15 13:55:28.000000000 +0000 +++ apr-1.6.5/include/apr_poll.h 2016-03-25 01:19:34.000000000 +0000 @@ -66,7 +66,7 @@ * are not copied */ #define APR_POLLSET_WAKEABLE 0x004 /**< Poll operations are interruptable by - * apr_pollset_wakeup() + * apr_pollset_wakeup() or apr_pollcb_wakeup() */ #define APR_POLLSET_NODEFAULT 0x010 /**< Do not try to use the default method if * the specified non-default method cannot be @@ -323,8 +323,12 @@ * @param p The pool from which to allocate the pollcb * @param flags Optional flags to modify the operation of the pollcb. * + * @remark If flags contains APR_POLLSET_WAKEABLE, then a pollcb is + * created with an additional internal pipe object used for the + * apr_pollcb_wakeup() call. The actual size of pollcb is + * in that case @a size + 1. * @remark Pollcb is only supported on some platforms; the apr_pollcb_create() - * call will fail with APR_ENOTIMPL on platforms where it is not supported. + * call will fail with APR_ENOTIMPL on platforms where it is not supported. */ APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb, apr_uint32_t size, @@ -341,8 +345,12 @@ * method cannot be used, the default method will be used unless the * APR_POLLSET_NODEFAULT flag has been specified. * + * @remark If flags contains APR_POLLSET_WAKEABLE, then a pollcb is + * created with an additional internal pipe object used for the + * apr_pollcb_wakeup() call. The actual size of pollcb is + * in that case @a size + 1. * @remark Pollcb is only supported on some platforms; the apr_pollcb_create_ex() - * call will fail with APR_ENOTIMPL on platforms where it is not supported. + * call will fail with APR_ENOTIMPL on platforms where it is not supported. */ APR_DECLARE(apr_status_t) apr_pollcb_create_ex(apr_pollcb_t **pollcb, apr_uint32_t size, @@ -373,6 +381,7 @@ * Remove a descriptor from a pollcb * @param pollcb The pollcb from which to remove the descriptor * @param descriptor The descriptor to remove + * @remark If the descriptor is not found, APR_NOTFOUND is returned. * @remark apr_pollcb_remove() cannot be used to remove a subset of requested * events for a descriptor. The reqevents field in the apr_pollfd_t * parameter must contain the same value when removing as when adding. @@ -380,11 +389,14 @@ APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb, apr_pollfd_t *descriptor); -/** Function prototype for pollcb handlers +/** + * Function prototype for pollcb handlers * @param baton Opaque baton passed into apr_pollcb_poll() - * @param descriptor Contains the notification for an active descriptor, - * the rtnevents member contains what events were triggered + * @param descriptor Contains the notification for an active descriptor. + * The @a rtnevents member describes which events were triggered * for this descriptor. + * @remark If the pollcb handler does not return APR_SUCCESS, the apr_pollcb_poll() + * call returns with the handler's return value. */ typedef apr_status_t (*apr_pollcb_cb_t)(void *baton, apr_pollfd_t *descriptor); @@ -395,17 +407,34 @@ * maximum, not a minimum. If a descriptor is signalled, the * function will return before this time. If timeout is * negative, the function will block until a descriptor is - * signalled. + * signalled or until apr_pollcb_wakeup() has been called. * @param func Callback function to call for each active descriptor. * @param baton Opaque baton passed to the callback function. * @remark Multiple signalled conditions for the same descriptor may be reported * in one or more calls to the callback function, depending on the * implementation. + * @remark APR_EINTR will be returned if the pollset has been created with + * APR_POLLSET_WAKEABLE and apr_pollcb_wakeup() has been called while + * waiting for activity. */ APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb, apr_interval_time_t timeout, apr_pollcb_cb_t func, - void *baton); + void *baton); + +/** + * Interrupt the blocked apr_pollcb_poll() call. + * @param pollcb The pollcb to use + * @remark If the pollcb was not created with APR_POLLSET_WAKEABLE the + * return value is APR_EINIT. + */ +APR_DECLARE(apr_status_t) apr_pollcb_wakeup(apr_pollcb_t *pollcb); + +/** + * Return a printable representation of the pollcb method. + * @param pollcb The pollcb to use + */ +APR_DECLARE(const char *) apr_pollcb_method_name(apr_pollcb_t *pollcb); /** @} */ diff -Nru apr-1.5.2/include/apr_portable.h apr-1.6.5/include/apr_portable.h --- apr-1.5.2/include/apr_portable.h 2011-05-02 14:33:49.000000000 +0000 +++ apr-1.6.5/include/apr_portable.h 2018-08-26 10:05:37.000000000 +0000 @@ -46,6 +46,9 @@ #if APR_HAVE_PTHREAD_H #include #endif +#if APR_HAVE_SEMAPHORE_H +#include +#endif #ifdef __cplusplus extern "C" { @@ -140,6 +143,10 @@ pthread_mutex_t *intraproc; #endif #endif +#if APR_HAS_POSIXSEM_SERIALIZE + /** Value used for POSIX semaphores serialization */ + sem_t *psem_interproc; +#endif }; typedef int apr_os_file_t; /**< native file */ @@ -241,7 +248,7 @@ apr_socket_t *sock); /** - * Convert the proc mutex from os specific type to apr type + * Convert the proc mutex from apr type to os specific type * @param ospmutex The os specific proc mutex we are converting to. * @param pmutex The apr proc mutex to convert. */ @@ -249,6 +256,19 @@ apr_proc_mutex_t *pmutex); /** + * Convert the proc mutex from apr type to os specific type, also + * providing the mechanism used by the apr mutex. + * @param ospmutex The os specific proc mutex we are converting to. + * @param pmutex The apr proc mutex to convert. + * @param mech The mechanism used by the apr proc mutex (if not NULL). + * @remark Allows for disambiguation for platforms with multiple mechanisms + * available. + */ +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex, + apr_lockmech_e *mech); + +/** * Get the exploded time in the platforms native format. * @param ostime the native time format * @param aprtime the time to convert @@ -380,7 +400,10 @@ apr_pool_t *cont); /** - * Convert a socket from the os specific type to the apr type + * Convert a socket from the os specific type to the APR type. If + * sock points to NULL, a socket will be created from the pool + * provided. If **sock does not point to NULL, the structure pointed + * to by sock will be reused and updated with the given socket. * @param sock The pool to use. * @param thesock The socket to convert to. * @param cont The socket we are converting to an apr type. @@ -416,6 +439,24 @@ apr_pool_t *cont); /** + * Convert the proc mutex from os specific type to apr type, using the + * specified mechanism. + * @param pmutex The apr proc mutex we are converting to. + * @param ospmutex The os specific proc mutex to convert. + * @param mech The apr mutex locking mechanism + * @param register_cleanup Whether to destroy the os mutex with the apr + * one (either on explicit destroy or pool cleanup). + * @param cont The pool to use if it is needed. + * @remark Allows for disambiguation for platforms with multiple mechanisms + * available. + */ +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, + apr_os_proc_mutex_t *ospmutex, + apr_lockmech_e mech, + int register_cleanup, + apr_pool_t *cont); + +/** * Put the imploded time in the APR format. * @param aprtime the APR time format * @param ostime the time to convert @@ -494,7 +535,7 @@ /** * Get the name of the current locale character set. * @param pool the pool to allocate the name from, if needed - * @remark Defers to apr_os_default_encoding if the current locale's + * @remark Defers to apr_os_default_encoding() if the current locale's * data can't be retrieved on this system. */ APR_DECLARE(const char*) apr_os_locale_encoding(apr_pool_t *pool); diff -Nru apr-1.5.2/include/apr_proc_mutex.h apr-1.6.5/include/apr_proc_mutex.h --- apr-1.5.2/include/apr_proc_mutex.h 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/include/apr_proc_mutex.h 2017-05-24 15:21:43.000000000 +0000 @@ -25,6 +25,7 @@ #include "apr.h" #include "apr_pools.h" #include "apr_errno.h" +#include "apr_perms_set.h" #ifdef __cplusplus extern "C" { @@ -140,9 +141,16 @@ APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex); /** - * Display the name of the mutex, as it relates to the actual method used. - * This matches the valid options for Apache's AcceptMutex directive - * @param mutex the name of the mutex + * Get the mechanism of the mutex, as it relates to the actual method + * used for the underlying apr_proc_mutex_t. + * @param mutex the mutex to get the mechanism from. + */ +APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex); + +/** + * Get the mechanism's name of the mutex, as it relates to the actual method + * used for the underlying apr_proc_mutex_t. + * @param mutex the mutex to get the mechanism's name from. */ APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex); @@ -152,6 +160,11 @@ APR_DECLARE(const char *) apr_proc_mutex_defname(void); /** + * Set mutex permissions. + */ +APR_PERMS_SET_IMPLEMENT(proc_mutex); + +/** * Get the pool used by this proc_mutex. * @return apr_pool_t the pool */ diff -Nru apr-1.5.2/include/apr_shm.h apr-1.6.5/include/apr_shm.h --- apr-1.5.2/include/apr_shm.h 2013-10-21 11:57:36.000000000 +0000 +++ apr-1.6.5/include/apr_shm.h 2014-04-28 13:15:03.000000000 +0000 @@ -25,6 +25,7 @@ #include "apr.h" #include "apr_pools.h" #include "apr_errno.h" +#include "apr_perms_set.h" #ifdef __cplusplus extern "C" { @@ -136,6 +137,21 @@ apr_pool_t *pool); /** + * Delete named resource associated with a shared memory segment, + * preventing attachments to the resource. + * @param m The shared memory segment structure to delete. + * @remark This function is only supported on platforms which support + * name-based shared memory segments, and will return APR_ENOTIMPL on + * platforms without such support. Removing the file while the shm + * is in use is not entirely portable, caller may use this to enhance + * obscurity of the resource, but be prepared for the call to fail, + * and for concurrent attempts to create a resource of the same name + * to also fail. The pool cleanup of apr_shm_create (apr_shm_destroy) + * also removes the named resource. + */ +APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m); + +/** * Destroy a shared memory segment and associated memory. * @param m The shared memory segment structure to destroy. */ @@ -195,6 +211,11 @@ APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m); /** + * Set shared memory permissions. + */ +APR_PERMS_SET_IMPLEMENT(shm); + +/** * Get the pool used by this shared memory segment. */ APR_POOL_DECLARE_ACCESSOR(shm); diff -Nru apr-1.5.2/include/apr_skiplist.h apr-1.6.5/include/apr_skiplist.h --- apr-1.5.2/include/apr_skiplist.h 2015-03-13 15:33:14.000000000 +0000 +++ apr-1.6.5/include/apr_skiplist.h 2018-08-25 13:50:04.000000000 +0000 @@ -40,9 +40,7 @@ /** * apr_skiplist_compare is the function type that must be implemented * per object type that is used in a skip list for comparisons to maintain - * order. A value <0 indicates placement after this node; a value of 0 - * indicates collision with this exact node; a value >0 indicates placement - * before this node. + * order * */ typedef int (*apr_skiplist_compare) (void *, void *); @@ -155,6 +153,30 @@ APR_DECLARE(void *) apr_skiplist_find(apr_skiplist *sl, void *data, apr_skiplistnode **iter); /** + * Return the last matching element in the skip list using the specified + * comparison function. + * @param sl The skip list + * @param data The value to search for + * @param iter A pointer to the returned skip list node representing the element + * found + * @param comp The comparison function to use + */ +APR_DECLARE(void *) apr_skiplist_last_compare(apr_skiplist *sl, void *data, + apr_skiplistnode **iter, + apr_skiplist_compare comp); + +/** + * Return the last matching element in the skip list using the current comparison + * function. + * @param sl The skip list + * @param data The value to search for + * @param iter A pointer to the returned skip list node representing the element + * found + */ +APR_DECLARE(void *) apr_skiplist_last(apr_skiplist *sl, void *data, + apr_skiplistnode **iter); + +/** * Return the next element in the skip list. * @param sl The skip list * @param iter On entry, a pointer to the skip list node to start with; on return, @@ -173,6 +195,12 @@ APR_DECLARE(void *) apr_skiplist_previous(apr_skiplist *sl, apr_skiplistnode **iter); /** + * Return the element of the skip list node + * @param iter The skip list node + */ +APR_DECLARE(void *) apr_skiplist_element(apr_skiplistnode *iter); + +/** * Insert an element into the skip list using the specified comparison function * if it does not already exist. * @param sl The skip list @@ -184,7 +212,7 @@ /** * Insert an element into the skip list using the existing comparison function - * if it does not already exist (as determined by the comparison function) + * if it does not already exist. * @param sl The skip list * @param data The element to insert * @remark If no comparison function has been set for the skip list, the element @@ -193,6 +221,62 @@ APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert(apr_skiplist* sl, void *data); /** + * Add an element into the skip list using the specified comparison function + * allowing for duplicates. + * @param sl The skip list + * @param data The element to add + * @param comp The comparison function to use for placement into the skip list + */ +APR_DECLARE(apr_skiplistnode *) apr_skiplist_add_compare(apr_skiplist *sl, + void *data, apr_skiplist_compare comp); + +/** + * Add an element into the skip list using the existing comparison function + * allowing for duplicates. + * @param sl The skip list + * @param data The element to insert + * @remark If no comparison function has been set for the skip list, the element + * will not be inserted and NULL will be returned. + */ +APR_DECLARE(apr_skiplistnode *) apr_skiplist_add(apr_skiplist* sl, void *data); + +/** + * Add an element into the skip list using the specified comparison function + * removing the existing duplicates. + * @param sl The skip list + * @param data The element to insert + * @param comp The comparison function to use for placement into the skip list + * @param myfree A function to be called for each removed duplicate + * @remark If no comparison function has been set for the skip list, the element + * will not be inserted, none will be replaced, and NULL will be returned. + */ +APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace_compare(apr_skiplist *sl, + void *data, apr_skiplist_freefunc myfree, + apr_skiplist_compare comp); + +/** + * Add an element into the skip list using the existing comparison function + * removing the existing duplicates. + * @param sl The skip list + * @param data The element to insert + * @param myfree A function to be called for each removed duplicate + * @remark If no comparison function has been set for the skip list, the element + * will not be inserted, none will be replaced, and NULL will be returned. + */ +APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace(apr_skiplist *sl, + void *data, apr_skiplist_freefunc myfree); + +/** + * Remove a node from the skip list. + * @param sl The skip list + * @param iter The skip list node to remove + * @param myfree A function to be called for the removed element + */ +APR_DECLARE(int) apr_skiplist_remove_node(apr_skiplist *sl, + apr_skiplistnode *iter, + apr_skiplist_freefunc myfree); + +/** * Remove an element from the skip list using the specified comparison function for * locating the element. In the case of duplicates, the 1st entry will be removed. * @param sl The skip list @@ -248,6 +332,40 @@ APR_DECLARE(void *) apr_skiplist_peek(apr_skiplist *sl); /** + * Return the size of the list (number of elements), in O(1). + * @param sl The skip list + */ +APR_DECLARE(size_t) apr_skiplist_size(const apr_skiplist *sl); + +/** + * Return the height of the list (number of skip paths), in O(1). + * @param sl The skip list + */ +APR_DECLARE(int) apr_skiplist_height(const apr_skiplist *sl); + +/** + * Return the predefined maximum height of the skip list. + * @param sl The skip list + */ +APR_DECLARE(int) apr_skiplist_preheight(const apr_skiplist *sl); + +/** + * Set a predefined maximum height for the skip list. + * @param sl The skip list + * @param to The preheight to set, or a nul/negative value to disable. + * @remark When a preheight is used, the height of each inserted element is + * computed randomly up to this preheight instead of the current skip list's + * height plus one used by the default implementation. Using a preheight can + * probably ensure more fairness with long living elements (since with an + * adaptative height, former elements may have been created with a low height, + * hence a longest path to reach them while the skip list grows). On the other + * hand, the default behaviour (preheight <= 0) with a growing and decreasing + * maximum height is more adaptative/suitable for short living values. + * @note Should be called before any insertion/add. + */ +APR_DECLARE(void) apr_skiplist_set_preheight(apr_skiplist *sl, int to); + +/** * Merge two skip lists. XXX SEMANTICS * @param sl1 One of two skip lists to be merged * @param sl2 The other of two skip lists to be merged diff -Nru apr-1.5.2/include/apr_strings.h apr-1.6.5/include/apr_strings.h --- apr-1.5.2/include/apr_strings.h 2014-03-07 17:49:19.000000000 +0000 +++ apr-1.6.5/include/apr_strings.h 2018-08-26 10:05:37.000000000 +0000 @@ -101,10 +101,10 @@ * @param s The block of characters to duplicate * @param n The number of characters to duplicate * @return The new string or NULL if s == NULL - * @remark This is a faster alternative to apr_pstrndup, for use + * @remark This is a faster alternative to apr_pstrndup(), for use * when you know that the string being duplicated really * has 'n' or more characters. If the string might contain - * fewer characters, use apr_pstrndup. + * fewer characters, use apr_pstrndup(). */ APR_DECLARE(char *) apr_pstrmemdup(apr_pool_t *p, const char *s, apr_size_t n) #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) diff -Nru apr-1.5.2/include/apr_tables.h apr-1.6.5/include/apr_tables.h --- apr-1.5.2/include/apr_tables.h 2013-10-05 18:04:58.000000000 +0000 +++ apr-1.6.5/include/apr_tables.h 2018-08-26 10:05:37.000000000 +0000 @@ -179,7 +179,7 @@ * @param p The pool to allocate the copy of the array out of * @param arr The array to copy * @return An exact copy of the array passed in - * @remark The alternate apr_array_copy_hdr copies only the header, and arranges + * @remark The alternate apr_array_copy_hdr() copies only the header, and arranges * for the elements to be copied if (and only if) the code subsequently * does a push or arraycat. */ @@ -191,7 +191,7 @@ * @param p The pool to allocate the copy of the array out of * @param arr The array to copy * @return An exact copy of the array passed in - * @remark The alternate apr_array_copy copies the *entire* array. + * @remark The alternate apr_array_copy() copies the *entire* array. */ APR_DECLARE(apr_array_header_t *) apr_array_copy_hdr(apr_pool_t *p, const apr_array_header_t *arr); @@ -318,7 +318,7 @@ * @param t The table to search for the data * @param key The key to merge data for (case does not matter) * @param val The data to add - * @remark If the key is not found, then this function acts like apr_table_add + * @remark If the key is not found, then this function acts like apr_table_add() */ APR_DECLARE(void) apr_table_merge(apr_table_t *t, const char *key, const char *val); @@ -330,7 +330,7 @@ * @param t The table to search for the data * @param key The key to merge data for (case does not matter) * @param val The data to add - * @remark If the key is not found, then this function acts like apr_table_addn + * @remark If the key is not found, then this function acts like apr_table_addn() */ APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key, const char *val); @@ -380,6 +380,7 @@ * @remark Iteration continues while this callback function returns non-zero. * To export the callback function for apr_table_[v]do() it must be declared * in the _NONSTD convention. + * @see apr_table_do @see apr_table_vdo */ typedef int (apr_table_do_callback_fn_t)(void *rec, const char *key, const char *value); @@ -392,7 +393,7 @@ * in the table. Otherwise, the function is invoked only for those * elements matching the keys specified. * - * If an invocation of the @param comp function returns zero, + * If an invocation of the comp function returns zero, * iteration will continue using the next specified key, if any. * * @param comp The function to run @@ -401,7 +402,7 @@ * @param ... A varargs array of zero or more (char *) keys followed by NULL * @return FALSE if one of the comp() iterations returned zero; TRUE if all * iterations returned non-zero - * @see apr_table_do_callback_fn_t + * @see apr_table_do_callback_fn_t @see apr_table_vdo */ APR_DECLARE_NONSTD(int) apr_table_do(apr_table_do_callback_fn_t *comp, void *rec, const apr_table_t *t, ...) @@ -412,13 +413,13 @@ /** * Iterate over a table running the provided function once for every - * element in the table. The @param vp varargs parameter must be a + * element in the table. The vp varargs parameter must be a * list of zero or more (char *) keys followed by a NULL pointer. If * zero keys are given, the @param comp function will be invoked for * every element in the table. Otherwise, the function is invoked * only for those elements matching the keys specified. * - * If an invocation of the @param comp function returns zero, + * If an invocation of the comp function returns zero, * iteration will continue using the next specified key, if any. * * @param comp The function to run @@ -427,7 +428,7 @@ * @param vp List of zero or more (char *) keys followed by NULL * @return FALSE if one of the comp() iterations returned zero; TRUE if all * iterations returned non-zero - * @see apr_table_do_callback_fn_t + * @see apr_table_do_callback_fn_t @see apr_table_do */ APR_DECLARE(int) apr_table_vdo(apr_table_do_callback_fn_t *comp, void *rec, const apr_table_t *t, va_list vp); @@ -436,6 +437,8 @@ #define APR_OVERLAP_TABLES_SET (0) /** flag for overlap to use apr_table_mergen */ #define APR_OVERLAP_TABLES_MERGE (1) +/** flag for overlap to use apr_table_addn */ +#define APR_OVERLAP_TABLES_ADD (2) /** * For each element in table b, either use setn or mergen to add the data * to table a. Which method is used is determined by the flags passed in. @@ -444,6 +447,7 @@ * @param flags How to add the table to table a. One of: * APR_OVERLAP_TABLES_SET Use apr_table_setn * APR_OVERLAP_TABLES_MERGE Use apr_table_mergen + * APR_OVERLAP_TABLES_ADD Use apr_table_addn * @remark When merging duplicates, the two values are concatenated, * separated by the string ", ". * @remark This function is highly optimized, and uses less memory and CPU cycles @@ -461,6 +465,9 @@ * if (flags & APR_OVERLAP_TABLES_MERGE) { * apr_table_mergen(a, belt[i].key, belt[i].val); * } + * else if (flags & APR_OVERLAP_TABLES_ADD) { + * apr_table_addn(a, belt[i].key, belt[i].val); + * } * else { * apr_table_setn(a, belt[i].key, belt[i].val); * } @@ -484,7 +491,8 @@ * * @param t Table. * @param flags APR_OVERLAP_TABLES_MERGE to merge, or - * APR_OVERLAP_TABLES_SET to overwrite + * APR_OVERLAP_TABLES_SET to overwrite, or + * APR_OVERLAP_TABLES_ADD to add * @remark When merging duplicates, the two values are concatenated, * separated by the string ", ". */ diff -Nru apr-1.5.2/include/apr_thread_proc.h apr-1.6.5/include/apr_thread_proc.h --- apr-1.5.2/include/apr_thread_proc.h 2013-10-21 12:16:51.000000000 +0000 +++ apr-1.6.5/include/apr_thread_proc.h 2014-04-28 12:08:38.000000000 +0000 @@ -26,6 +26,7 @@ #include "apr_file_io.h" #include "apr_pools.h" #include "apr_errno.h" +#include "apr_perms_set.h" #if APR_HAVE_STRUCT_RLIMIT #include @@ -579,6 +580,18 @@ const char *groupname); +/** + * Register permission set function + * @param attr The procattr we care about. + * @param perms_set_fn Permission set callback + * @param data Data to pass to permission callback function + * @param perms Permissions to set + */ +APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr, + apr_perms_setfn_t *perms_set_fn, + void *data, + apr_fileperms_t perms); + #if APR_HAS_FORK /** * This is currently the only non-portable call in APR. This executes diff -Nru apr-1.5.2/include/apr_version.h apr-1.6.5/include/apr_version.h --- apr-1.5.2/include/apr_version.h 2015-04-25 11:59:33.000000000 +0000 +++ apr-1.6.5/include/apr_version.h 2018-09-10 21:07:14.000000000 +0000 @@ -38,7 +38,7 @@ */ -#define APR_COPYRIGHT "Copyright (c) 2000-2015 The Apache Software " \ +#define APR_COPYRIGHT "Copyright (c) 2000-2018 The Apache Software " \ "Foundation or its licensors, as applicable." /* The numeric compile-time version constants. These constants are the @@ -56,20 +56,20 @@ * Minor API changes that do not cause binary compatibility problems. * Reset to 0 when upgrading APR_MAJOR_VERSION */ -#define APR_MINOR_VERSION 5 +#define APR_MINOR_VERSION 6 /** patch level * The Patch Level never includes API changes, simply bug fixes. * Reset to 0 when upgrading APR_MINOR_VERSION */ -#define APR_PATCH_VERSION 2 +#define APR_PATCH_VERSION 5 /** * The symbol APR_IS_DEV_VERSION is only defined for internal, * "development" copies of APR. It is undefined for released versions * of APR. */ -/* #define APR_IS_DEV_VERSION */ +/* #undef APR_IS_DEV_VERSION */ /** * Check at compile time if the APR version is at least a certain diff -Nru apr-1.5.2/include/arch/unix/apr_arch_networkio.h apr-1.6.5/include/arch/unix/apr_arch_networkio.h --- apr-1.5.2/include/arch/unix/apr_arch_networkio.h 2006-08-03 10:55:31.000000000 +0000 +++ apr-1.6.5/include/arch/unix/apr_arch_networkio.h 2014-04-28 17:24:21.000000000 +0000 @@ -111,6 +111,9 @@ #ifndef HAVE_POLL int connected; #endif +#if APR_HAVE_SOCKADDR_UN + int bound; +#endif int local_port_unknown; int local_interface_unknown; int remote_addr_unknown; diff -Nru apr-1.5.2/include/arch/unix/apr_arch_poll_private.h apr-1.6.5/include/arch/unix/apr_arch_poll_private.h --- apr-1.5.2/include/arch/unix/apr_arch_poll_private.h 2013-10-21 16:36:24.000000000 +0000 +++ apr-1.6.5/include/arch/unix/apr_arch_poll_private.h 2017-09-11 15:23:23.000000000 +0000 @@ -126,7 +126,7 @@ apr_file_t *wakeup_pipe[2]; apr_pollfd_t wakeup_pfd; apr_pollset_private_t *p; - apr_pollset_provider_t *provider; + const apr_pollset_provider_t *provider; }; typedef union { @@ -149,10 +149,14 @@ apr_pool_t *pool; apr_uint32_t nelts; apr_uint32_t nalloc; + apr_uint32_t flags; + /* Pipe descriptors used for wakeup */ + apr_file_t *wakeup_pipe[2]; + apr_pollfd_t wakeup_pfd; int fd; apr_pollcb_pset pollset; apr_pollfd_t **copyset; - apr_pollcb_provider_t *provider; + const apr_pollcb_provider_t *provider; }; struct apr_pollset_provider_t { @@ -169,10 +173,17 @@ apr_status_t (*add)(apr_pollcb_t *, apr_pollfd_t *); apr_status_t (*remove)(apr_pollcb_t *, apr_pollfd_t *); apr_status_t (*poll)(apr_pollcb_t *, apr_interval_time_t, apr_pollcb_cb_t, void *); + apr_status_t (*cleanup)(apr_pollcb_t *); const char *name; }; -/* Private functions */ -void apr_pollset_drain_wakeup_pipe(apr_pollset_t *pollset); +/* + * Private functions used for the implementation of both apr_pollcb_* and + * apr_pollset_* + */ +apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, + apr_file_t **wakeup_pipe); +apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe); +void apr_poll_drain_wakeup_pipe(apr_file_t **wakeup_pipe); #endif /* APR_ARCH_POLL_PRIVATE_H */ diff -Nru apr-1.5.2/include/arch/unix/apr_arch_proc_mutex.h apr-1.6.5/include/arch/unix/apr_arch_proc_mutex.h --- apr-1.5.2/include/arch/unix/apr_arch_proc_mutex.h 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/include/arch/unix/apr_arch_proc_mutex.h 2017-05-24 15:21:43.000000000 +0000 @@ -62,9 +62,6 @@ #if APR_HAVE_PTHREAD_H #include #endif -#if APR_HAVE_SEMAPHORE_H -#include -#endif /* End System Headers */ struct apr_proc_mutex_unix_lock_methods_t { @@ -75,6 +72,8 @@ apr_status_t (*release)(apr_proc_mutex_t *); apr_status_t (*cleanup)(void *); apr_status_t (*child_init)(apr_proc_mutex_t **, apr_pool_t *, const char *); + apr_status_t (*perms_set)(apr_proc_mutex_t *, apr_fileperms_t, apr_uid_t, apr_gid_t); + apr_lockmech_e mech; const char *name; }; typedef struct apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_lock_methods_t; @@ -93,17 +92,24 @@ struct apr_proc_mutex_t { apr_pool_t *pool; const apr_proc_mutex_unix_lock_methods_t *meth; - const apr_proc_mutex_unix_lock_methods_t *inter_meth; int curr_locked; char *fname; -#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE - apr_file_t *interproc; -#endif -#if APR_HAS_POSIXSEM_SERIALIZE - sem_t *psem_interproc; + + apr_os_proc_mutex_t os; /* Native mutex holder. */ + +#if APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE + apr_file_t *interproc; /* For apr_file_ calls on native fd. */ + int interproc_closing; /* whether the native fd is opened/closed with + * 'interproc' or apr_os_file_put()ed (hence + * needing an an explicit close for consistency + * with other methods). + */ #endif #if APR_HAS_PROC_PTHREAD_SERIALIZE - pthread_mutex_t *pthread_interproc; + int pthread_refcounting; /* Whether the native mutex is refcounted or + * apr_os_proc_mutex_put()ed, which makes + * refcounting impossible/undesirable. + */ #endif }; diff -Nru apr-1.5.2/include/arch/unix/apr_arch_shm.h apr-1.6.5/include/arch/unix/apr_arch_shm.h --- apr-1.5.2/include/arch/unix/apr_arch_shm.h 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/include/arch/unix/apr_arch_shm.h 2014-04-28 12:08:38.000000000 +0000 @@ -67,6 +67,7 @@ const char *filename; /* NULL if anonymous */ #if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON int shmid; /* shmem ID returned from shmget() */ + key_t shmkey; /* shmem key IPC_ANON or returned from ftok() */ #endif }; diff -Nru apr-1.5.2/include/arch/unix/apr_arch_threadproc.h apr-1.6.5/include/arch/unix/apr_arch_threadproc.h --- apr-1.5.2/include/arch/unix/apr_arch_threadproc.h 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/include/arch/unix/apr_arch_threadproc.h 2014-04-28 12:08:38.000000000 +0000 @@ -19,6 +19,7 @@ #include "apr_thread_proc.h" #include "apr_file_io.h" #include "apr_arch_file_io.h" +#include "apr_perms_set.h" /* System headers required for thread/process library */ #if APR_HAVE_PTHREAD_H @@ -76,6 +77,14 @@ #endif +typedef struct apr_procattr_pscb_t apr_procattr_pscb_t; +struct apr_procattr_pscb_t { + struct apr_procattr_pscb_t *next; + apr_perms_setfn_t *perms_set_fn; + apr_fileperms_t perms; + const void *data; +}; + struct apr_procattr_t { apr_pool_t *pool; apr_file_t *parent_in; @@ -103,6 +112,7 @@ apr_int32_t errchk; apr_uid_t uid; apr_gid_t gid; + apr_procattr_pscb_t *perms_set_callbacks; }; #endif /* ! THREAD_PROC_H */ diff -Nru apr-1.5.2/include/arch/unix/apr_private.h.in apr-1.6.5/include/arch/unix/apr_private.h.in --- apr-1.5.2/include/arch/unix/apr_private.h.in 2015-04-25 12:04:18.000000000 +0000 +++ apr-1.6.5/include/arch/unix/apr_private.h.in 2018-09-10 21:14:53.000000000 +0000 @@ -8,6 +8,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Define if apr_allocator should use guard pages */ +#undef APR_ALLOCATOR_GUARD_PAGES + /* Define if apr_allocator should use mmap */ #undef APR_ALLOCATOR_USES_MMAP @@ -18,6 +21,9 @@ /* Define as function used for conversion of strings to apr_off_t */ #undef APR_OFF_T_STRFN +/* Define if pool functions should abort if concurrent usage is detected */ +#undef APR_POOL_CONCURRENCY_CHECK + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -274,6 +280,9 @@ /* Define if MAP_ANON is defined in sys/mman.h */ #undef HAVE_MAP_ANON +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMCHECK_H + /* Define to 1 if you have the `memchr' function. */ #undef HAVE_MEMCHR @@ -295,6 +304,9 @@ /* Define to 1 if you have the `mmap64' function. */ #undef HAVE_MMAP64 +/* Define to 1 if you have the `mprotect' function. */ +#undef HAVE_MPROTECT + /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP @@ -316,6 +328,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NET_ERRNO_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_H + /* Define to 1 if you have the `nl_langinfo' function. */ #undef HAVE_NL_LANGINFO @@ -688,6 +703,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UUID_UUID_H +/* Compile in valgrind support */ +#undef HAVE_VALGRIND + +/* Define to 1 if you have the header file. */ +#undef HAVE_VALGRIND_H + /* Define if C compiler supports VLA */ #undef HAVE_VLA @@ -706,8 +727,7 @@ /* Define for z/OS pthread API nuances */ #undef HAVE_ZOS_PTHREADS -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Define if EAI_ error codes from getaddrinfo are negative */ diff -Nru apr-1.5.2/libapr.dsp apr-1.6.5/libapr.dsp --- apr-1.5.2/libapr.dsp 2014-09-22 02:12:38.000000000 +0000 +++ apr-1.6.5/libapr.dsp 2016-12-03 20:49:29.000000000 +0000 @@ -19,8 +19,6 @@ !MESSAGE !MESSAGE "libapr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libapr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - Win32 Release9x" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - Win32 Debug9x" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libapr - x64 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libapr - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE @@ -97,70 +95,6 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 # End Special Build Tool -!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "9x\Release" -# PROP BASE Intermediate_Dir "9x\Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "9x\Release" -# PROP Intermediate_Dir "9x\Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"9x\Release\libapr-1.dll" /pdb:"9x\Release\libapr-1.pdb" /implib:"9x\Release\libapr-1.lib" /MACHINE:X86 /opt:ref -# Begin Special Build Tool -TargetPath=9x\Release\libapr.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "9x\Debug" -# PROP BASE Intermediate_Dir "9x\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "9x\Debug" -# PROP Intermediate_Dir "9x\Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"9x\Debug\libapr-1.dll" /pdb:"9x\Debug\libapr-1.pdb" /implib:"9x\Debug\libapr-1.lib" /MACHINE:X86 -# Begin Special Build Tool -TargetPath=9x\Debug\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 -# End Special Build Tool - !ELSEIF "$(CFG)" == "libapr - x64 Release" # PROP BASE Use_MFC 0 @@ -231,8 +165,6 @@ # Name "libapr - Win32 Release" # Name "libapr - Win32 Debug" -# Name "libapr - Win32 Release9x" -# Name "libapr - Win32 Debug9x" # Name "libapr - x64 Release" # Name "libapr - x64 Debug" # Begin Group "Source Files" @@ -490,6 +422,10 @@ SOURCE=.\poll\unix\select.c # End Source File +# Begin Source File + +SOURCE=.\poll\unix\wakeup.c +# End Source File # End Group # Begin Group "random" @@ -524,6 +460,10 @@ # End Source File # Begin Source File +SOURCE=.\strings\apr_cstr.c +# End Source File +# Begin Source File + SOURCE=.\strings\apr_fnmatch.c # End Source File # Begin Source File @@ -693,26 +633,6 @@ # End Custom Build -!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - !ELSEIF "$(CFG)" == "libapr - x64 Release" # Begin Custom Build - Creating apr.h from apr.hw @@ -782,28 +702,6 @@ # End Custom Build -!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" - -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\Release\gen_test_char /Fe.\9x\Release\gen_test_char.exe .\tools\gen_test_char.c - .\9x\Release\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" - -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\Debug\gen_test_char /Fe.\9x\Debug\gen_test_char.exe .\tools\gen_test_char.c - .\9x\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - !ELSEIF "$(CFG)" == "libapr - x64 Release" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h diff -Nru apr-1.5.2/libapr.mak apr-1.6.5/libapr.mak --- apr-1.5.2/libapr.mak 2013-11-06 05:15:39.000000000 +0000 +++ apr-1.6.5/libapr.mak 2016-12-07 08:04:32.000000000 +0000 @@ -15,8 +15,6 @@ !MESSAGE !MESSAGE "libapr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libapr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - Win32 Release9x" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - Win32 Debug9x" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libapr - x64 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libapr - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE @@ -44,6 +42,7 @@ CLEAN : -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cpstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -117,6 +116,7 @@ -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\libapr-1.dll" -@erase "$(OUTDIR)\libapr-1.exp" -@erase "$(OUTDIR)\libapr-1.lib" @@ -229,6 +229,7 @@ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -245,6 +246,7 @@ "$(INTDIR)\timestr.obj" \ "$(INTDIR)\groupinfo.obj" \ "$(INTDIR)\userinfo.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\libapr.res" "$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -280,6 +282,7 @@ CLEAN : -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cpstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -353,6 +356,7 @@ -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\libapr-1.dll" -@erase "$(OUTDIR)\libapr-1.exp" -@erase "$(OUTDIR)\libapr-1.lib" @@ -465,6 +469,7 @@ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -481,6 +486,7 @@ "$(INTDIR)\timestr.obj" \ "$(INTDIR)\groupinfo.obj" \ "$(INTDIR)\userinfo.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\libapr.res" "$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -501,478 +507,6 @@ if exist .\Debug\libapr-1.dll.manifest mt.exe -manifest .\Debug\libapr-1.dll.manifest -outputresource:.\Debug\libapr-1.dll;2 echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" -!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" - -OUTDIR=.\9x\Release -INTDIR=.\9x\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\9x\Release -# End Custom Macros - -ALL : ".\include\apr_escape_test_char.h" ".\9x\Release\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_escape.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_skiplist.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\apr_escape.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\apr_skiplist.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\9x\Release\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\9x\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\9x\Release\libapr-1.dll.manifest mt.exe -manifest .\9x\Release\libapr-1.dll.manifest -outputresource:.\9x\Release\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" - -OUTDIR=.\9x\Debug -INTDIR=.\9x\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\9x\Debug -# End Custom Macros - -ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\Debug\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_escape.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_skiplist.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\apr_escape.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\apr_skiplist.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\9x\Debug\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\9x\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\9x\Debug\libapr-1.dll.manifest mt.exe -manifest .\9x\Debug\libapr-1.dll.manifest -outputresource:.\9x\Debug\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - !ELSEIF "$(CFG)" == "libapr - x64 Release" OUTDIR=.\x64\Release @@ -988,6 +522,7 @@ CLEAN : -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cpstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -1034,6 +569,7 @@ -@erase "$(INTDIR)\poll.obj" -@erase "$(INTDIR)\pollcb.obj" -@erase "$(INTDIR)\pollset.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(INTDIR)\proc.obj" -@erase "$(INTDIR)\proc_mutex.obj" -@erase "$(INTDIR)\rand.obj" @@ -1167,12 +703,14 @@ "$(INTDIR)\poll.obj" \ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\select.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -1224,6 +762,7 @@ CLEAN : -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cpstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -1270,6 +809,7 @@ -@erase "$(INTDIR)\poll.obj" -@erase "$(INTDIR)\pollcb.obj" -@erase "$(INTDIR)\pollset.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(INTDIR)\proc.obj" -@erase "$(INTDIR)\proc_mutex.obj" -@erase "$(INTDIR)\rand.obj" @@ -1403,12 +943,14 @@ "$(INTDIR)\poll.obj" \ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\select.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -1457,7 +999,7 @@ !ENDIF -!IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" || "$(CFG)" == "libapr - Win32 Release9x" || "$(CFG)" == "libapr - Win32 Debug9x" || "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug" +!IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" || "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug" SOURCE=.\atomic\win32\apr_atomic.c "$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" @@ -1765,6 +1307,12 @@ $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=.\poll\unix\wakeup.c + +"$(INTDIR)\wakeup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=.\random\unix\apr_random.c "$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" @@ -1795,6 +1343,12 @@ $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=.\strings\apr_cstr.c + +"$(INTDIR)\apr_cstr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_cstr.h" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=.\strings\apr_fnmatch.c "$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" @@ -1908,28 +1462,6 @@ InputPath=.\include\apr.hw -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" - -InputPath=.\include\apr.hw - ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" <sem = pmutex->Lock; ospmutex->ben = pmutex->LockCount; + if (mech) { + *mech = APR_LOCK_DEFAULT; + } return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex) +{ + return apr_os_proc_mutex_get_ex(ospmutex, pmutex, NULL); +} + +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, + apr_lockmech_e mech, + int register_cleanup, apr_pool_t *pool) { if (pool == NULL) { return APR_ENOPOOL; } + if (mech != APR_LOCK_DEFAULT) { + return APR_ENOTIMPL; + } + if ((*pmutex) == NULL) { (*pmutex) = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); (*pmutex)->pool = pool; } (*pmutex)->Lock = ospmutex->sem; (*pmutex)->LockCount = ospmutex->ben; + + if (register_cleanup) { + apr_pool_cleanup_register(pool, *pmutex, _proc_mutex_cleanup, + apr_pool_cleanup_null); + } return APR_SUCCESS; } +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, + apr_os_proc_mutex_t *ospmutex, + apr_pool_t *pool) +{ + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, + 0, pool); +} + diff -Nru apr-1.5.2/locks/netware/proc_mutex.c apr-1.6.5/locks/netware/proc_mutex.c --- apr-1.5.2/locks/netware/proc_mutex.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/locks/netware/proc_mutex.c 2017-06-02 17:44:41.000000000 +0000 @@ -27,9 +27,13 @@ { apr_status_t ret; apr_proc_mutex_t *new_mutex = NULL; + + if (mech != APR_LOCK_DEFAULT) { + return APR_ENOTIMPL; + } + new_mutex = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); - - if(new_mutex ==NULL) { + if (new_mutex == NULL) { return APR_ENOMEM; } @@ -87,6 +91,11 @@ return NULL; } +APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex) +{ + return APR_LOCK_DEFAULT; +} + APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) { return "netwarethread"; @@ -97,22 +106,76 @@ return "netwarethread"; } +APR_PERMS_SET_ENOTIMPL(proc_mutex) + APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex) /* Implement OS-specific accessors defined in apr_portable.h */ -apr_status_t apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, - apr_proc_mutex_t *pmutex) +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex, + apr_lockmech_e *mech) { - if (pmutex) + if (pmutex && pmutex->mutex) ospmutex = pmutex->mutex->mutex; return APR_ENOLOCK; +#if 0 + /* We need to change apr_os_proc_mutex_t to a pointer type + * to be able to implement this function. + */ + *ospmutex = pmutex->mutex->mutex; + if (mech) { + *mech = APR_LOCK_DEFAULT; + } + return APR_SUCCESS; +#endif } -apr_status_t apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, - apr_os_proc_mutex_t *ospmutex, - apr_pool_t *pool) +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex) { + return apr_os_proc_mutex_get_ex(ospmutex, pmutex, NULL); +} + +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, + apr_os_proc_mutex_t *ospmutex, + apr_lockmech_e mech, + int register_cleanup, + apr_pool_t *pool) +{ + if (pool == NULL) { + return APR_ENOPOOL; + } + if (mech != APR_LOCK_DEFAULT) { + return APR_ENOTIMPL; + } +#if 0 + /* We need to change apr_os_proc_mutex_t to a pointer type + * to be able to implement this function. + */ + if ((*pmutex) == NULL) { + (*pmutex) = apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); + (*pmutex)->pool = pool; + } + (*pmutex)->mutex = apr_pcalloc(pool, sizeof(apr_thread_mutex_t)); + (*pmutex)->mutex->mutex = *ospmutex; + (*pmutex)->mutex->pool = pool; + + if (register_cleanup) { + apr_pool_cleanup_register(pool, *pmutex, apr_proc_mutex_cleanup, + apr_pool_cleanup_null); + } + return APR_SUCCESS; +#else return APR_ENOTIMPL; +#endif +} + +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, + apr_os_proc_mutex_t *ospmutex, + apr_pool_t *pool) +{ + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, + 0, pool); } diff -Nru apr-1.5.2/locks/os2/proc_mutex.c apr-1.6.5/locks/os2/proc_mutex.c --- apr-1.5.2/locks/os2/proc_mutex.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/locks/os2/proc_mutex.c 2017-06-01 22:42:00.000000000 +0000 @@ -60,6 +60,11 @@ return NULL; } +APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex) +{ + return APR_LOCK_DEFAULT; +} + APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) { return "os2sem"; @@ -199,7 +204,7 @@ return APR_FROM_OS_ERROR(rc); } - +APR_PERMS_SET_ENOTIMPL(proc_mutex) APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex) @@ -207,20 +212,36 @@ /* Implement OS-specific accessors defined in apr_portable.h */ -APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, - apr_proc_mutex_t *pmutex) +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex, + apr_lockmech_e *mech) { *ospmutex = pmutex->hMutex; - return APR_ENOTIMPL; + if (mech) { + *mech = APR_LOCK_DEFAULT; + } + return APR_SUCCESS; } +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex) +{ + return apr_os_proc_mutex_get_ex(ospmutex, pmutex, NULL); +} - -APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, + apr_lockmech_e mech, + int register_cleanup, apr_pool_t *pool) { apr_proc_mutex_t *new; + if (pool == NULL) { + return APR_ENOPOOL; + } + if (mech != APR_LOCK_DEFAULT) { + return APR_ENOTIMPL; + } new = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t)); new->pool = pool; @@ -229,6 +250,18 @@ new->hMutex = *ospmutex; *pmutex = new; + if (register_cleanup) { + apr_pool_cleanup_register(pool, *pmutex, apr_proc_mutex_cleanup, + apr_pool_cleanup_null); + } return APR_SUCCESS; } +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, + apr_os_proc_mutex_t *ospmutex, + apr_pool_t *pool) +{ + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, + 0, pool); +} + diff -Nru apr-1.5.2/locks/unix/global_mutex.c apr-1.6.5/locks/unix/global_mutex.c --- apr-1.5.2/locks/unix/global_mutex.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/locks/unix/global_mutex.c 2017-05-24 15:21:43.000000000 +0000 @@ -15,6 +15,7 @@ */ #include "apr.h" + #include "apr_strings.h" #include "apr_arch_global_mutex.h" #include "apr_proc_mutex.h" @@ -59,7 +60,7 @@ } #if APR_HAS_THREADS - if (m->proc_mutex->inter_meth->flags & APR_PROCESS_LOCK_MECH_IS_GLOBAL) { + if (m->proc_mutex->meth->flags & APR_PROCESS_LOCK_MECH_IS_GLOBAL) { m->thread_mutex = NULL; /* We don't need a thread lock. */ } else { @@ -180,9 +181,24 @@ return apr_proc_mutex_lockfile(mutex->proc_mutex); } +APR_DECLARE(apr_lockmech_e) apr_global_mutex_mech(apr_global_mutex_t *mutex) +{ + return apr_proc_mutex_mech(mutex->proc_mutex); +} + APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex) { return apr_proc_mutex_name(mutex->proc_mutex); } +APR_PERMS_SET_IMPLEMENT(global_mutex) +{ + apr_status_t rv; + apr_global_mutex_t *mutex = (apr_global_mutex_t *)theglobal_mutex; + + rv = APR_PERMS_SET_FN(proc_mutex)(mutex->proc_mutex, perms, uid, gid); + return rv; +} + APR_POOL_IMPLEMENT_ACCESSOR(global_mutex) + diff -Nru apr-1.5.2/locks/unix/proc_mutex.c apr-1.6.5/locks/unix/proc_mutex.c --- apr-1.5.2/locks/unix/proc_mutex.c 2014-07-16 13:26:17.000000000 +0000 +++ apr-1.6.5/locks/unix/proc_mutex.c 2017-05-24 15:24:15.000000000 +0000 @@ -19,6 +19,7 @@ #include "apr_arch_proc_mutex.h" #include "apr_arch_file_io.h" /* for apr_mkstemp() */ #include "apr_hash.h" +#include "apr_atomic.h" APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex) { @@ -26,7 +27,7 @@ } #if APR_HAS_POSIXSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || \ - APR_HAS_PROC_PTHREAD_SERIALIZE || APR_HAS_SYSVSEM_SERIALIZE + APR_HAS_SYSVSEM_SERIALIZE static apr_status_t proc_mutex_no_child_init(apr_proc_mutex_t **mutex, apr_pool_t *cont, const char *fname) @@ -35,6 +36,17 @@ } #endif +#if APR_HAS_POSIXSEM_SERIALIZE || APR_HAS_PROC_PTHREAD_SERIALIZE +static apr_status_t proc_mutex_no_perms_set(apr_proc_mutex_t *mutex, + apr_fileperms_t perms, + apr_uid_t uid, + apr_gid_t gid) +{ + return APR_ENOTIMPL; +} +#endif + + #if APR_HAS_POSIXSEM_SERIALIZE #ifndef SEM_FAILED @@ -45,7 +57,7 @@ { apr_proc_mutex_t *mutex = mutex_; - if (sem_close(mutex->psem_interproc) < 0) { + if (sem_close(mutex->os.psem_interproc) < 0) { return errno; } @@ -74,8 +86,6 @@ sem_t *psem; char semname[32]; - new_mutex->interproc = apr_palloc(new_mutex->pool, - sizeof(*new_mutex->interproc)); /* * This bogusness is to follow what appears to be the * lowest common denominator in Posix semaphore naming: @@ -134,7 +144,7 @@ } /* Ahhh. The joys of Posix sems. Predelete it... */ sem_unlink(semname); - new_mutex->psem_interproc = psem; + new_mutex->os.psem_interproc = psem; new_mutex->fname = apr_pstrdup(new_mutex->pool, semname); apr_pool_cleanup_register(new_mutex->pool, (void *)new_mutex, apr_proc_mutex_cleanup, @@ -147,7 +157,7 @@ int rc; do { - rc = sem_wait(mutex->psem_interproc); + rc = sem_wait(mutex->os.psem_interproc); } while (rc < 0 && errno == EINTR); if (rc < 0) { return errno; @@ -161,7 +171,7 @@ int rc; do { - rc = sem_trywait(mutex->psem_interproc); + rc = sem_trywait(mutex->os.psem_interproc); } while (rc < 0 && errno == EINTR); if (rc < 0) { if (errno == EAGAIN) { @@ -176,7 +186,7 @@ static apr_status_t proc_mutex_posix_release(apr_proc_mutex_t *mutex) { mutex->curr_locked = 0; - if (sem_post(mutex->psem_interproc) < 0) { + if (sem_post(mutex->os.psem_interproc) < 0) { /* any failure is probably fatal, so no big deal to leave * ->curr_locked at 0. */ return errno; @@ -197,6 +207,8 @@ proc_mutex_posix_release, proc_mutex_posix_cleanup, proc_mutex_no_child_init, + proc_mutex_no_perms_set, + APR_LOCK_POSIXSEM, "posixsem" }; @@ -226,9 +238,9 @@ apr_proc_mutex_t *mutex=mutex_; union semun ick; - if (mutex->interproc->filedes != -1) { + if (mutex->os.crossproc != -1) { ick.val = 0; - semctl(mutex->interproc->filedes, 0, IPC_RMID, ick); + semctl(mutex->os.crossproc, 0, IPC_RMID, ick); } return APR_SUCCESS; } @@ -239,18 +251,17 @@ union semun ick; apr_status_t rv; - new_mutex->interproc = apr_palloc(new_mutex->pool, sizeof(*new_mutex->interproc)); - new_mutex->interproc->filedes = semget(IPC_PRIVATE, 1, IPC_CREAT | 0600); - - if (new_mutex->interproc->filedes < 0) { + new_mutex->os.crossproc = semget(IPC_PRIVATE, 1, IPC_CREAT | 0600); + if (new_mutex->os.crossproc == -1) { rv = errno; proc_mutex_sysv_cleanup(new_mutex); return rv; } ick.val = 1; - if (semctl(new_mutex->interproc->filedes, 0, SETVAL, ick) < 0) { + if (semctl(new_mutex->os.crossproc, 0, SETVAL, ick) < 0) { rv = errno; proc_mutex_sysv_cleanup(new_mutex); + new_mutex->os.crossproc = -1; return rv; } new_mutex->curr_locked = 0; @@ -265,7 +276,7 @@ int rc; do { - rc = semop(mutex->interproc->filedes, &proc_mutex_op_on, 1); + rc = semop(mutex->os.crossproc, &proc_mutex_op_on, 1); } while (rc < 0 && errno == EINTR); if (rc < 0) { return errno; @@ -279,7 +290,7 @@ int rc; do { - rc = semop(mutex->interproc->filedes, &proc_mutex_op_try, 1); + rc = semop(mutex->os.crossproc, &proc_mutex_op_try, 1); } while (rc < 0 && errno == EINTR); if (rc < 0) { if (errno == EAGAIN) { @@ -297,7 +308,7 @@ mutex->curr_locked = 0; do { - rc = semop(mutex->interproc->filedes, &proc_mutex_op_off, 1); + rc = semop(mutex->os.crossproc, &proc_mutex_op_off, 1); } while (rc < 0 && errno == EINTR); if (rc < 0) { return errno; @@ -305,6 +316,24 @@ return APR_SUCCESS; } +static apr_status_t proc_mutex_sysv_perms_set(apr_proc_mutex_t *mutex, + apr_fileperms_t perms, + apr_uid_t uid, + apr_gid_t gid) +{ + + union semun ick; + struct semid_ds buf; + buf.sem_perm.uid = uid; + buf.sem_perm.gid = gid; + buf.sem_perm.mode = apr_unix_perms2mode(perms); + ick.buf = &buf; + if (semctl(mutex->os.crossproc, 0, IPC_SET, ick) < 0) { + return errno; + } + return APR_SUCCESS; +} + static const apr_proc_mutex_unix_lock_methods_t mutex_sysv_methods = { #if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS || defined(SYSVSEM_IS_GLOBAL) @@ -318,6 +347,8 @@ proc_mutex_sysv_release, proc_mutex_sysv_cleanup, proc_mutex_no_child_init, + proc_mutex_sysv_perms_set, + APR_LOCK_SYSVSEM, "sysvsem" }; @@ -325,36 +356,83 @@ #if APR_HAS_PROC_PTHREAD_SERIALIZE -static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_) +/* The mmap()ed pthread_interproc is the native pthread_mutex_t followed + * by a refcounter to track children using it. We want to avoid calling + * pthread_mutex_destroy() on the shared mutex area while it is in use by + * another process, because this may mark the shared pthread_mutex_t as + * invalid for everyone, including forked children (unlike "sysvsem" for + * example), causing unexpected errors or deadlocks (PR 49504). So the + * last process (parent or child) referencing the mutex will effectively + * destroy it. + */ +typedef struct { + pthread_mutex_t mutex; + apr_uint32_t refcount; +} proc_pthread_mutex_t; + +#define proc_pthread_mutex_refcount(m) \ + (((proc_pthread_mutex_t *)(m)->os.pthread_interproc)->refcount) + +static APR_INLINE int proc_pthread_mutex_inc(apr_proc_mutex_t *mutex) +{ + if (mutex->pthread_refcounting) { + apr_atomic_inc32(&proc_pthread_mutex_refcount(mutex)); + return 1; + } + return 0; +} + +static APR_INLINE int proc_pthread_mutex_dec(apr_proc_mutex_t *mutex) +{ + if (mutex->pthread_refcounting) { + return apr_atomic_dec32(&proc_pthread_mutex_refcount(mutex)); + } + return 0; +} + +static apr_status_t proc_pthread_mutex_unref(void *mutex_) { apr_proc_mutex_t *mutex=mutex_; apr_status_t rv; if (mutex->curr_locked == 1) { - if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) { + if ((rv = pthread_mutex_unlock(mutex->os.pthread_interproc))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif return rv; } } - /* curr_locked is set to -1 until the mutex has been created */ - if (mutex->curr_locked != -1) { - if ((rv = pthread_mutex_destroy(mutex->pthread_interproc))) { + if (!proc_pthread_mutex_dec(mutex)) { + if ((rv = pthread_mutex_destroy(mutex->os.pthread_interproc))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif return rv; } } - if (munmap((caddr_t)mutex->pthread_interproc, sizeof(pthread_mutex_t))) { + return APR_SUCCESS; +} + +static apr_status_t proc_mutex_pthread_cleanup(void *mutex_) +{ + apr_proc_mutex_t *mutex=mutex_; + apr_status_t rv; + + /* curr_locked is set to -1 until the mutex has been created */ + if (mutex->curr_locked != -1) { + if ((rv = proc_pthread_mutex_unref(mutex))) { + return rv; + } + } + if (munmap(mutex->os.pthread_interproc, sizeof(proc_pthread_mutex_t))) { return errno; } return APR_SUCCESS; } -static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex, - const char *fname) +static apr_status_t proc_mutex_pthread_create(apr_proc_mutex_t *new_mutex, + const char *fname) { apr_status_t rv; int fd; @@ -365,31 +443,32 @@ return errno; } - new_mutex->pthread_interproc = (pthread_mutex_t *)mmap( - (caddr_t) 0, - sizeof(pthread_mutex_t), - PROT_READ | PROT_WRITE, MAP_SHARED, - fd, 0); - if (new_mutex->pthread_interproc == (pthread_mutex_t *) (caddr_t) -1) { + new_mutex->os.pthread_interproc = mmap(NULL, sizeof(proc_pthread_mutex_t), + PROT_READ | PROT_WRITE, MAP_SHARED, + fd, 0); + if (new_mutex->os.pthread_interproc == MAP_FAILED) { + new_mutex->os.pthread_interproc = NULL; + rv = errno; close(fd); - return errno; + return rv; } close(fd); + new_mutex->pthread_refcounting = 1; new_mutex->curr_locked = -1; /* until the mutex has been created */ if ((rv = pthread_mutexattr_init(&mattr))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif - proc_mutex_proc_pthread_cleanup(new_mutex); + proc_mutex_pthread_cleanup(new_mutex); return rv; } if ((rv = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif - proc_mutex_proc_pthread_cleanup(new_mutex); + proc_mutex_pthread_cleanup(new_mutex); pthread_mutexattr_destroy(&mattr); return rv; } @@ -400,7 +479,7 @@ #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif - proc_mutex_proc_pthread_cleanup(new_mutex); + proc_mutex_pthread_cleanup(new_mutex); pthread_mutexattr_destroy(&mattr); return rv; } @@ -408,28 +487,29 @@ #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif - proc_mutex_proc_pthread_cleanup(new_mutex); + proc_mutex_pthread_cleanup(new_mutex); pthread_mutexattr_destroy(&mattr); return rv; } #endif /* HAVE_PTHREAD_MUTEX_ROBUST */ - if ((rv = pthread_mutex_init(new_mutex->pthread_interproc, &mattr))) { + if ((rv = pthread_mutex_init(new_mutex->os.pthread_interproc, &mattr))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif - proc_mutex_proc_pthread_cleanup(new_mutex); + proc_mutex_pthread_cleanup(new_mutex); pthread_mutexattr_destroy(&mattr); return rv; } + proc_pthread_mutex_refcount(new_mutex) = 1; /* first/parent reference */ new_mutex->curr_locked = 0; /* mutex created now */ if ((rv = pthread_mutexattr_destroy(&mattr))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif - proc_mutex_proc_pthread_cleanup(new_mutex); + proc_mutex_pthread_cleanup(new_mutex); return rv; } @@ -440,34 +520,45 @@ return APR_SUCCESS; } -static apr_status_t proc_mutex_proc_pthread_acquire(apr_proc_mutex_t *mutex) +static apr_status_t proc_mutex_pthread_child_init(apr_proc_mutex_t **mutex, + apr_pool_t *pool, + const char *fname) +{ + (*mutex)->curr_locked = 0; + if (proc_pthread_mutex_inc(*mutex)) { + apr_pool_cleanup_register(pool, *mutex, proc_pthread_mutex_unref, + apr_pool_cleanup_null); + } + return APR_SUCCESS; +} + +static apr_status_t proc_mutex_pthread_acquire(apr_proc_mutex_t *mutex) { apr_status_t rv; - if ((rv = pthread_mutex_lock(mutex->pthread_interproc))) { + if ((rv = pthread_mutex_lock(mutex->os.pthread_interproc))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif #ifdef HAVE_PTHREAD_MUTEX_ROBUST /* Okay, our owner died. Let's try to make it consistent again. */ if (rv == EOWNERDEAD) { - pthread_mutex_consistent_np(mutex->pthread_interproc); + proc_pthread_mutex_dec(mutex); + pthread_mutex_consistent_np(mutex->os.pthread_interproc); } else - return rv; -#else - return rv; #endif + return rv; } mutex->curr_locked = 1; return APR_SUCCESS; } -static apr_status_t proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex) +static apr_status_t proc_mutex_pthread_tryacquire(apr_proc_mutex_t *mutex) { apr_status_t rv; - if ((rv = pthread_mutex_trylock(mutex->pthread_interproc))) { + if ((rv = pthread_mutex_trylock(mutex->os.pthread_interproc))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif @@ -477,25 +568,23 @@ #ifdef HAVE_PTHREAD_MUTEX_ROBUST /* Okay, our owner died. Let's try to make it consistent again. */ if (rv == EOWNERDEAD) { - pthread_mutex_consistent_np(mutex->pthread_interproc); - rv = APR_SUCCESS; + proc_pthread_mutex_dec(mutex); + pthread_mutex_consistent_np(mutex->os.pthread_interproc); } else - return rv; -#else - return rv; #endif + return rv; } mutex->curr_locked = 1; - return rv; + return APR_SUCCESS; } -static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex) +static apr_status_t proc_mutex_pthread_release(apr_proc_mutex_t *mutex) { apr_status_t rv; mutex->curr_locked = 0; - if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) { + if ((rv = pthread_mutex_unlock(mutex->os.pthread_interproc))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; #endif @@ -507,12 +596,14 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_methods = { APR_PROCESS_LOCK_MECH_IS_GLOBAL, - proc_mutex_proc_pthread_create, - proc_mutex_proc_pthread_acquire, - proc_mutex_proc_pthread_tryacquire, - proc_mutex_proc_pthread_release, - proc_mutex_proc_pthread_cleanup, - proc_mutex_no_child_init, + proc_mutex_pthread_create, + proc_mutex_pthread_acquire, + proc_mutex_pthread_tryacquire, + proc_mutex_pthread_release, + proc_mutex_pthread_cleanup, + proc_mutex_pthread_child_init, + proc_mutex_no_perms_set, + APR_LOCK_PROC_PTHREAD, "pthread" }; @@ -541,7 +632,7 @@ static apr_status_t proc_mutex_fcntl_cleanup(void *mutex_) { - apr_status_t status; + apr_status_t status = APR_SUCCESS; apr_proc_mutex_t *mutex=mutex_; if (mutex->curr_locked == 1) { @@ -550,7 +641,16 @@ return status; } - return apr_file_close(mutex->interproc); + if (mutex->interproc) { + status = apr_file_close(mutex->interproc); + } + if (!mutex->interproc_closing + && mutex->os.crossproc != -1 + && close(mutex->os.crossproc) == -1 + && status == APR_SUCCESS) { + status = errno; + } + return status; } static apr_status_t proc_mutex_fcntl_create(apr_proc_mutex_t *new_mutex, @@ -576,6 +676,8 @@ return rv; } + new_mutex->os.crossproc = new_mutex->interproc->filedes; + new_mutex->interproc_closing = 1; new_mutex->curr_locked = 0; unlink(new_mutex->fname); apr_pool_cleanup_register(new_mutex->pool, @@ -590,7 +692,7 @@ int rc; do { - rc = fcntl(mutex->interproc->filedes, F_SETLKW, &proc_mutex_lock_it); + rc = fcntl(mutex->os.crossproc, F_SETLKW, &proc_mutex_lock_it); } while (rc < 0 && errno == EINTR); if (rc < 0) { return errno; @@ -604,7 +706,7 @@ int rc; do { - rc = fcntl(mutex->interproc->filedes, F_SETLK, &proc_mutex_lock_it); + rc = fcntl(mutex->os.crossproc, F_SETLK, &proc_mutex_lock_it); } while (rc < 0 && errno == EINTR); if (rc < 0) { #if FCNTL_TRYACQUIRE_EACCES @@ -626,7 +728,7 @@ mutex->curr_locked=0; do { - rc = fcntl(mutex->interproc->filedes, F_SETLKW, &proc_mutex_unlock_it); + rc = fcntl(mutex->os.crossproc, F_SETLKW, &proc_mutex_unlock_it); } while (rc < 0 && errno == EINTR); if (rc < 0) { return errno; @@ -634,6 +736,22 @@ return APR_SUCCESS; } +static apr_status_t proc_mutex_fcntl_perms_set(apr_proc_mutex_t *mutex, + apr_fileperms_t perms, + apr_uid_t uid, + apr_gid_t gid) +{ + + if (mutex->fname) { + if (!(perms & APR_FPROT_GSETID)) + gid = -1; + if (fchown(mutex->os.crossproc, uid, gid) < 0) { + return errno; + } + } + return APR_SUCCESS; +} + static const apr_proc_mutex_unix_lock_methods_t mutex_fcntl_methods = { #if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS || defined(FCNTL_IS_GLOBAL) @@ -647,6 +765,8 @@ proc_mutex_fcntl_release, proc_mutex_fcntl_cleanup, proc_mutex_no_child_init, + proc_mutex_fcntl_perms_set, + APR_LOCK_FCNTL, "fcntl" }; @@ -658,7 +778,7 @@ static apr_status_t proc_mutex_flock_cleanup(void *mutex_) { - apr_status_t status; + apr_status_t status = APR_SUCCESS; apr_proc_mutex_t *mutex=mutex_; if (mutex->curr_locked == 1) { @@ -667,10 +787,18 @@ return status; } if (mutex->interproc) { /* if it was opened properly */ - apr_file_close(mutex->interproc); + status = apr_file_close(mutex->interproc); } - unlink(mutex->fname); - return APR_SUCCESS; + if (!mutex->interproc_closing + && mutex->os.crossproc != -1 + && close(mutex->os.crossproc) == -1 + && status == APR_SUCCESS) { + status = errno; + } + if (mutex->fname) { + unlink(mutex->fname); + } + return status; } static apr_status_t proc_mutex_flock_create(apr_proc_mutex_t *new_mutex, @@ -694,8 +822,11 @@ if (rv != APR_SUCCESS) { proc_mutex_flock_cleanup(new_mutex); - return errno; + return rv; } + + new_mutex->os.crossproc = new_mutex->interproc->filedes; + new_mutex->interproc_closing = 1; new_mutex->curr_locked = 0; apr_pool_cleanup_register(new_mutex->pool, (void *)new_mutex, apr_proc_mutex_cleanup, @@ -708,7 +839,7 @@ int rc; do { - rc = flock(mutex->interproc->filedes, LOCK_EX); + rc = flock(mutex->os.crossproc, LOCK_EX); } while (rc < 0 && errno == EINTR); if (rc < 0) { return errno; @@ -722,7 +853,7 @@ int rc; do { - rc = flock(mutex->interproc->filedes, LOCK_EX | LOCK_NB); + rc = flock(mutex->os.crossproc, LOCK_EX | LOCK_NB); } while (rc < 0 && errno == EINTR); if (rc < 0) { if (errno == EWOULDBLOCK || errno == EAGAIN) { @@ -740,7 +871,7 @@ mutex->curr_locked = 0; do { - rc = flock(mutex->interproc->filedes, LOCK_UN); + rc = flock(mutex->os.crossproc, LOCK_UN); } while (rc < 0 && errno == EINTR); if (rc < 0) { return errno; @@ -755,23 +886,45 @@ apr_proc_mutex_t *new_mutex; int rv; - new_mutex = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t)); - - memcpy(new_mutex, *mutex, sizeof *new_mutex); - new_mutex->pool = pool; if (!fname) { fname = (*mutex)->fname; + if (!fname) { + return APR_SUCCESS; + } } + + new_mutex = (apr_proc_mutex_t *)apr_pmemdup(pool, *mutex, + sizeof(apr_proc_mutex_t)); + new_mutex->pool = pool; new_mutex->fname = apr_pstrdup(pool, fname); rv = apr_file_open(&new_mutex->interproc, new_mutex->fname, APR_FOPEN_WRITE, 0, new_mutex->pool); if (rv != APR_SUCCESS) { return rv; } + new_mutex->os.crossproc = new_mutex->interproc->filedes; + new_mutex->interproc_closing = 1; + *mutex = new_mutex; return APR_SUCCESS; } +static apr_status_t proc_mutex_flock_perms_set(apr_proc_mutex_t *mutex, + apr_fileperms_t perms, + apr_uid_t uid, + apr_gid_t gid) +{ + + if (mutex->fname) { + if (!(perms & APR_FPROT_GSETID)) + gid = -1; + if (fchown(mutex->os.crossproc, uid, gid) < 0) { + return errno; + } + } + return APR_SUCCESS; +} + static const apr_proc_mutex_unix_lock_methods_t mutex_flock_methods = { #if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS || defined(FLOCK_IS_GLOBAL) @@ -785,6 +938,8 @@ proc_mutex_flock_release, proc_mutex_flock_cleanup, proc_mutex_flock_child_init, + proc_mutex_flock_perms_set, + APR_LOCK_FLOCK, "flock" }; @@ -801,55 +956,132 @@ #endif } -static apr_status_t proc_mutex_choose_method(apr_proc_mutex_t *new_mutex, apr_lockmech_e mech) +static apr_status_t proc_mutex_choose_method(apr_proc_mutex_t *new_mutex, + apr_lockmech_e mech, + apr_os_proc_mutex_t *ospmutex) { +#if APR_HAS_PROC_PTHREAD_SERIALIZE + new_mutex->os.pthread_interproc = NULL; +#endif +#if APR_HAS_POSIXSEM_SERIALIZE + new_mutex->os.psem_interproc = NULL; +#endif +#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE + new_mutex->os.crossproc = -1; + +#if APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE + new_mutex->interproc = NULL; + new_mutex->interproc_closing = 0; +#endif +#endif + switch (mech) { case APR_LOCK_FCNTL: #if APR_HAS_FCNTL_SERIALIZE - new_mutex->inter_meth = &mutex_fcntl_methods; + new_mutex->meth = &mutex_fcntl_methods; + if (ospmutex) { + if (ospmutex->crossproc == -1) { + return APR_EINVAL; + } + new_mutex->os.crossproc = ospmutex->crossproc; + } #else return APR_ENOTIMPL; #endif break; case APR_LOCK_FLOCK: #if APR_HAS_FLOCK_SERIALIZE - new_mutex->inter_meth = &mutex_flock_methods; + new_mutex->meth = &mutex_flock_methods; + if (ospmutex) { + if (ospmutex->crossproc == -1) { + return APR_EINVAL; + } + new_mutex->os.crossproc = ospmutex->crossproc; + } #else return APR_ENOTIMPL; #endif break; case APR_LOCK_SYSVSEM: #if APR_HAS_SYSVSEM_SERIALIZE - new_mutex->inter_meth = &mutex_sysv_methods; + new_mutex->meth = &mutex_sysv_methods; + if (ospmutex) { + if (ospmutex->crossproc == -1) { + return APR_EINVAL; + } + new_mutex->os.crossproc = ospmutex->crossproc; + } #else return APR_ENOTIMPL; #endif break; case APR_LOCK_POSIXSEM: #if APR_HAS_POSIXSEM_SERIALIZE - new_mutex->inter_meth = &mutex_posixsem_methods; + new_mutex->meth = &mutex_posixsem_methods; + if (ospmutex) { + if (ospmutex->psem_interproc == NULL) { + return APR_EINVAL; + } + new_mutex->os.psem_interproc = ospmutex->psem_interproc; + } #else return APR_ENOTIMPL; #endif break; case APR_LOCK_PROC_PTHREAD: #if APR_HAS_PROC_PTHREAD_SERIALIZE - new_mutex->inter_meth = &mutex_proc_pthread_methods; + new_mutex->meth = &mutex_proc_pthread_methods; + if (ospmutex) { + if (ospmutex->pthread_interproc == NULL) { + return APR_EINVAL; + } + new_mutex->os.pthread_interproc = ospmutex->pthread_interproc; + } #else return APR_ENOTIMPL; #endif break; case APR_LOCK_DEFAULT: #if APR_USE_FLOCK_SERIALIZE - new_mutex->inter_meth = &mutex_flock_methods; + new_mutex->meth = &mutex_flock_methods; + if (ospmutex) { + if (ospmutex->crossproc == -1) { + return APR_EINVAL; + } + new_mutex->os.crossproc = ospmutex->crossproc; + } #elif APR_USE_SYSVSEM_SERIALIZE - new_mutex->inter_meth = &mutex_sysv_methods; + new_mutex->meth = &mutex_sysv_methods; + if (ospmutex) { + if (ospmutex->crossproc == -1) { + return APR_EINVAL; + } + new_mutex->os.crossproc = ospmutex->crossproc; + } #elif APR_USE_FCNTL_SERIALIZE - new_mutex->inter_meth = &mutex_fcntl_methods; + new_mutex->meth = &mutex_fcntl_methods; + if (ospmutex) { + if (ospmutex->crossproc == -1) { + return APR_EINVAL; + } + new_mutex->os.crossproc = ospmutex->crossproc; + } #elif APR_USE_PROC_PTHREAD_SERIALIZE - new_mutex->inter_meth = &mutex_proc_pthread_methods; + new_mutex->meth = &mutex_proc_pthread_methods; + if (ospmutex) { + if (ospmutex->pthread_interproc == NULL) { + return APR_EINVAL; + } + new_mutex->os.pthread_interproc = ospmutex->pthread_interproc; + } #elif APR_USE_POSIXSEM_SERIALIZE - new_mutex->inter_meth = &mutex_posixsem_methods; + new_mutex->meth = &mutex_posixsem_methods; + if (ospmutex) { + if (ospmutex->psem_interproc == NULL) { + return APR_EINVAL; + } + new_mutex->os.psem_interproc = ospmutex->psem_interproc; + } #else return APR_ENOTIMPL; #endif @@ -865,10 +1097,10 @@ apr_status_t rv; apr_proc_mutex_t mutex; - if ((rv = proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT)) != APR_SUCCESS) { + if ((rv = proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT, + NULL)) != APR_SUCCESS) { return "unknown"; } - mutex.meth = mutex.inter_meth; return apr_proc_mutex_name(&mutex); } @@ -877,12 +1109,11 @@ { apr_status_t rv; - if ((rv = proc_mutex_choose_method(new_mutex, mech)) != APR_SUCCESS) { + if ((rv = proc_mutex_choose_method(new_mutex, mech, + NULL)) != APR_SUCCESS) { return rv; } - new_mutex->meth = new_mutex->inter_meth; - if ((rv = new_mutex->meth->create(new_mutex, fname)) != APR_SUCCESS) { return rv; } @@ -935,6 +1166,11 @@ return ((apr_proc_mutex_t *)mutex)->meth->cleanup(mutex); } +APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex) +{ + return mutex->meth->mech; +} + APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) { return mutex->meth->name; @@ -957,45 +1193,69 @@ return NULL; } +APR_PERMS_SET_IMPLEMENT(proc_mutex) +{ + apr_proc_mutex_t *mutex = (apr_proc_mutex_t *)theproc_mutex; + return mutex->meth->perms_set(mutex, perms, uid, gid); +} + APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex) /* Implement OS-specific accessors defined in apr_portable.h */ +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex, + apr_lockmech_e *mech) +{ + *ospmutex = pmutex->os; + if (mech) { + *mech = pmutex->meth->mech; + } + return APR_SUCCESS; +} + APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, apr_proc_mutex_t *pmutex) { -#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE || APR_HAS_POSIXSEM_SERIALIZE - if (pmutex->interproc) { - ospmutex->crossproc = pmutex->interproc->filedes; - } - else { - ospmutex->crossproc = -1; - } -#endif -#if APR_HAS_PROC_PTHREAD_SERIALIZE - ospmutex->pthread_interproc = pmutex->pthread_interproc; -#endif - return APR_SUCCESS; + return apr_os_proc_mutex_get_ex(ospmutex, pmutex, NULL); } -APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, + apr_lockmech_e mech, + int register_cleanup, apr_pool_t *pool) { + apr_status_t rv; if (pool == NULL) { return APR_ENOPOOL; } + if ((*pmutex) == NULL) { (*pmutex) = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); (*pmutex)->pool = pool; } -#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE || APR_HAS_POSIXSEM_SERIALIZE - apr_os_file_put(&(*pmutex)->interproc, &ospmutex->crossproc, 0, pool); -#endif -#if APR_HAS_PROC_PTHREAD_SERIALIZE - (*pmutex)->pthread_interproc = ospmutex->pthread_interproc; + rv = proc_mutex_choose_method(*pmutex, mech, ospmutex); +#if APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE + if (rv == APR_SUCCESS) { + rv = apr_os_file_put(&(*pmutex)->interproc, &(*pmutex)->os.crossproc, + 0, pool); + } #endif - return APR_SUCCESS; + + if (rv == APR_SUCCESS && register_cleanup) { + apr_pool_cleanup_register(pool, *pmutex, apr_proc_mutex_cleanup, + apr_pool_cleanup_null); + } + return rv; +} + +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, + apr_os_proc_mutex_t *ospmutex, + apr_pool_t *pool) +{ + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, + 0, pool); } diff -Nru apr-1.5.2/locks/win32/proc_mutex.c apr-1.6.5/locks/win32/proc_mutex.c --- apr-1.5.2/locks/win32/proc_mutex.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/locks/win32/proc_mutex.c 2017-06-01 21:10:38.000000000 +0000 @@ -43,6 +43,10 @@ HANDLE hMutex; void *mutexkey; + if (mech != APR_LOCK_DEFAULT) { + return APR_ENOTIMPL; + } + /* res_name_from_filename turns fname into a pseduo-name * without slashes or backslashes, and prepends the \global * prefix on Win2K and later @@ -189,6 +193,11 @@ return mutex->fname; } +APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex) +{ + return APR_LOCK_DEFAULT; +} + APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) { return apr_proc_mutex_defname(); @@ -199,30 +208,61 @@ return "win32mutex"; } +APR_PERMS_SET_ENOTIMPL(proc_mutex) + APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex) /* Implement OS-specific accessors defined in apr_portable.h */ +APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex, + apr_proc_mutex_t *pmutex, + apr_lockmech_e *mech) +{ + *ospmutex = pmutex->handle; + if (mech) { + *mech = APR_LOCK_DEFAULT; + } + return APR_SUCCESS; +} + APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, - apr_proc_mutex_t *mutex) + apr_proc_mutex_t *pmutex) { - *ospmutex = mutex->handle; - return APR_SUCCESS; + return apr_os_proc_mutex_get_ex(ospmutex, pmutex, NULL); } -APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, + apr_lockmech_e mech, + int register_cleanup, apr_pool_t *pool) { if (pool == NULL) { return APR_ENOPOOL; } + if (mech != APR_LOCK_DEFAULT) { + return APR_ENOTIMPL; + } + if ((*pmutex) == NULL) { (*pmutex) = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t)); (*pmutex)->pool = pool; } (*pmutex)->handle = *ospmutex; + + if (register_cleanup) { + apr_pool_cleanup_register(pool, *pmutex, proc_mutex_cleanup, + apr_pool_cleanup_null); + } return APR_SUCCESS; } +APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, + apr_os_proc_mutex_t *ospmutex, + apr_pool_t *pool) +{ + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, + 0, pool); +} + diff -Nru apr-1.5.2/Makefile.in apr-1.6.5/Makefile.in --- apr-1.5.2/Makefile.in 2014-04-25 10:51:11.000000000 +0000 +++ apr-1.6.5/Makefile.in 2018-08-25 14:56:57.000000000 +0000 @@ -63,6 +63,7 @@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ +datadir=@datadir@ installbuilddir=@installbuilddir@ # Create apr-config script suitable for the install tree @@ -91,6 +92,8 @@ $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \ done $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk + $(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir) + $(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir) $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG) @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ for i in $(INSTALL_SUBDIRS); do \ diff -Nru apr-1.5.2/Makefile.win apr-1.6.5/Makefile.win --- apr-1.5.2/Makefile.win 2013-10-03 10:58:21.000000000 +0000 +++ apr-1.6.5/Makefile.win 2016-12-03 20:49:29.000000000 +0000 @@ -18,8 +18,6 @@ # # ARCH="Win32 Release" # ARCH="Win32 Debug" -# ARCH="Win32 Release9x" -# ARCH="Win32 Debug9x" # ARCH="x64 Release" # ARCH="x64 Debug" # @@ -66,14 +64,6 @@ SLNARCH=Debug|Win32 ARCHOSPATH=Debug LIBSOSPATH=LibD -!ELSEIF "$(ARCH)" == "Win32 Release9x" -SLNARCH=Release9x|Win32 -ARCHOSPATH=9x\Release -LIBSOSPATH=9x\LibR -!ELSEIF "$(ARCH)" == "Win32 Debug9x" -SLNARCH=Debug9x|Win32 -ARCHOSPATH=9x\Debug -LIBSOSPATH=9x\LibD !ELSEIF "$(ARCH)" == "x64 Release" SLNARCH=Release|x64 ARCHOSPATH=x64\Release diff -Nru apr-1.5.2/memory/unix/apr_pools.c apr-1.6.5/memory/unix/apr_pools.c --- apr-1.5.2/memory/unix/apr_pools.c 2014-05-09 19:55:08.000000000 +0000 +++ apr-1.6.5/memory/unix/apr_pools.c 2018-04-04 16:41:28.000000000 +0000 @@ -27,6 +27,7 @@ #include "apr_thread_mutex.h" #include "apr_hash.h" #include "apr_time.h" +#include "apr_support.h" #define APR_WANT_MEMFUNC #include "apr_want.h" #include "apr_env.h" @@ -39,10 +40,39 @@ #include /* for getpid and sysconf */ #endif +#if APR_ALLOCATOR_GUARD_PAGES && !APR_ALLOCATOR_USES_MMAP +#define APR_ALLOCATOR_USES_MMAP 1 +#endif + #if APR_ALLOCATOR_USES_MMAP #include #endif +#if HAVE_VALGRIND +#include +#include + +#define REDZONE APR_ALIGN_DEFAULT(8) +int apr_running_on_valgrind = 0; +#define APR_IF_VALGRIND(x) \ + do { if (apr_running_on_valgrind) { x; } } while (0) + +#else + +#define APR_IF_VALGRIND(x) + +#endif /* HAVE_VALGRIND */ + +#define APR_VALGRIND_NOACCESS(addr_, size_) \ + APR_IF_VALGRIND(VALGRIND_MAKE_MEM_NOACCESS(addr_, size_)) +#define APR_VALGRIND_UNDEFINED(addr_, size_) \ + APR_IF_VALGRIND(VALGRIND_MAKE_MEM_UNDEFINED(addr_, size_)) + + +#if APR_POOL_CONCURRENCY_CHECK && !APR_HAS_THREADS +#error pool-concurrency-check does not make sense without threads +#endif + /* * Magic numbers */ @@ -65,6 +95,16 @@ #define BOUNDARY_SIZE (1 << BOUNDARY_INDEX) #endif +#if APR_ALLOCATOR_GUARD_PAGES +#if defined(_SC_PAGESIZE) +#define GUARDPAGE_SIZE boundary_size +#else +#error Cannot determine page size +#endif /* _SC_PAGESIZE */ +#else +#define GUARDPAGE_SIZE 0 +#endif /* APR_ALLOCATOR_GUARD_PAGES */ + /* * Timing constants for killing subprocesses * There is a total 3-second delay between sending a SIGINT @@ -84,18 +124,18 @@ struct apr_allocator_t { /** largest used index into free[], always < MAX_INDEX */ - apr_uint32_t max_index; + apr_size_t max_index; /** Total size (in BOUNDARY_SIZE multiples) of unused memory before * blocks are given back. @see apr_allocator_max_free_set(). * @note Initialized to APR_ALLOCATOR_MAX_FREE_UNLIMITED, * which means to never give back blocks. */ - apr_uint32_t max_free_index; + apr_size_t max_free_index; /** * Memory size (in BOUNDARY_SIZE multiples) that currently must be freed * before blocks are given back. Range: 0..max_free_index */ - apr_uint32_t current_free_index; + apr_size_t current_free_index; #if APR_HAS_THREADS apr_thread_mutex_t *mutex; #endif /* APR_HAS_THREADS */ @@ -139,7 +179,7 @@ APR_DECLARE(void) apr_allocator_destroy(apr_allocator_t *allocator) { - apr_uint32_t index; + apr_size_t index; apr_memnode_t *node, **ref; for (index = 0; index < MAX_INDEX; index++) { @@ -147,7 +187,8 @@ while ((node = *ref) != NULL) { *ref = node->next; #if APR_ALLOCATOR_USES_MMAP - munmap(node, (node->index+1) << BOUNDARY_INDEX); + munmap((char *)node - GUARDPAGE_SIZE, + 2 * GUARDPAGE_SIZE + ((node->index+1) << BOUNDARY_INDEX)); #else free(node); #endif @@ -185,8 +226,8 @@ APR_DECLARE(void) apr_allocator_max_free_set(apr_allocator_t *allocator, apr_size_t in_size) { - apr_uint32_t max_free_index; - apr_uint32_t size = (APR_UINT32_TRUNC_CAST)in_size; + apr_size_t max_free_index; + apr_size_t size = in_size; #if APR_HAS_THREADS apr_thread_mutex_t *mutex; @@ -210,21 +251,45 @@ } static APR_INLINE +apr_size_t allocator_align(apr_size_t in_size) +{ + apr_size_t size = in_size; + + /* Round up the block size to the next boundary, but always + * allocate at least a certain size (MIN_ALLOC). + */ + size = APR_ALIGN(size + APR_MEMNODE_T_SIZE, BOUNDARY_SIZE); + if (size < in_size) { + return 0; + } + if (size < MIN_ALLOC) { + size = MIN_ALLOC; + } + + return size; +} + +APR_DECLARE(apr_size_t) apr_allocator_align(apr_allocator_t *allocator, + apr_size_t size) +{ + (void)allocator; + return allocator_align(size); +} + +static APR_INLINE apr_memnode_t *allocator_alloc(apr_allocator_t *allocator, apr_size_t in_size) { apr_memnode_t *node, **ref; - apr_uint32_t max_index; + apr_size_t max_index; apr_size_t size, i, index; /* Round up the block size to the next boundary, but always * allocate at least a certain size (MIN_ALLOC). */ - size = APR_ALIGN(in_size + APR_MEMNODE_T_SIZE, BOUNDARY_SIZE); - if (size < in_size) { + size = allocator_align(in_size); + if (!size) { return NULL; } - if (size < MIN_ALLOC) - size = MIN_ALLOC; /* Find the index for this node size by * dividing its size by the boundary size @@ -273,7 +338,7 @@ ref--; max_index--; } - while (*ref == NULL && max_index > 0); + while (*ref == NULL && max_index); allocator->max_index = max_index; } @@ -287,10 +352,7 @@ apr_thread_mutex_unlock(allocator->mutex); #endif /* APR_HAS_THREADS */ - node->next = NULL; - node->first_avail = (char *)node + APR_MEMNODE_T_SIZE; - - return node; + goto have_node; } #if APR_HAS_THREADS @@ -327,10 +389,7 @@ apr_thread_mutex_unlock(allocator->mutex); #endif /* APR_HAS_THREADS */ - node->next = NULL; - node->first_avail = (char *)node + APR_MEMNODE_T_SIZE; - - return node; + goto have_node; } #if APR_HAS_THREADS @@ -342,7 +401,10 @@ /* If we haven't got a suitable node, malloc a new one * and initialize it. */ -#if APR_ALLOCATOR_USES_MMAP +#if APR_ALLOCATOR_GUARD_PAGES + if ((node = mmap(NULL, size + 2 * GUARDPAGE_SIZE, PROT_NONE, + MAP_PRIVATE|MAP_ANON, -1, 0)) == MAP_FAILED) +#elif APR_ALLOCATOR_USES_MMAP if ((node = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0)) == MAP_FAILED) #else @@ -350,10 +412,21 @@ #endif return NULL; +#if APR_ALLOCATOR_GUARD_PAGES + node = (apr_memnode_t *)((char *)node + GUARDPAGE_SIZE); + if (mprotect(node, size, PROT_READ|PROT_WRITE) != 0) { + munmap((char *)node - GUARDPAGE_SIZE, size + 2 * GUARDPAGE_SIZE); + return NULL; + } +#endif + node->index = index; + node->endp = (char *)node + size; + +have_node: node->next = NULL; - node->index = (APR_UINT32_TRUNC_CAST)index; node->first_avail = (char *)node + APR_MEMNODE_T_SIZE; - node->endp = (char *)node + size; + + APR_VALGRIND_UNDEFINED(node->first_avail, size - APR_MEMNODE_T_SIZE); return node; } @@ -362,8 +435,8 @@ void allocator_free(apr_allocator_t *allocator, apr_memnode_t *node) { apr_memnode_t *next, *freelist = NULL; - apr_uint32_t index, max_index; - apr_uint32_t max_free_index, current_free_index; + apr_size_t index, max_index; + apr_size_t max_free_index, current_free_index; #if APR_HAS_THREADS if (allocator->mutex) @@ -381,14 +454,17 @@ next = node->next; index = node->index; + APR_VALGRIND_NOACCESS((char *)node + APR_MEMNODE_T_SIZE, + (node->index+1) << BOUNDARY_INDEX); + if (max_free_index != APR_ALLOCATOR_MAX_FREE_UNLIMITED && index + 1 > current_free_index) { node->next = freelist; freelist = node; } else if (index < MAX_INDEX) { - /* Add the node to the appropiate 'size' bucket. Adjust - * the max_index when appropiate. + /* Add the node to the appropriate 'size' bucket. Adjust + * the max_index when appropriate. */ if ((node->next = allocator->free[index]) == NULL && index > max_index) { @@ -425,7 +501,8 @@ node = freelist; freelist = node->next; #if APR_ALLOCATOR_USES_MMAP - munmap(node, (node->index+1) << BOUNDARY_INDEX); + munmap((char *)node - GUARDPAGE_SIZE, + 2 * GUARDPAGE_SIZE + ((node->index+1) << BOUNDARY_INDEX)); #else free(node); #endif @@ -482,7 +559,7 @@ struct debug_node_t { debug_node_t *next; - apr_uint32_t index; + apr_size_t index; void *beginp[64]; void *endp[64]; }; @@ -533,6 +610,14 @@ apr_os_proc_t owner_proc; #endif /* defined(NETWARE) */ cleanup_t *pre_cleanups; +#if APR_POOL_CONCURRENCY_CHECK + +#define IDLE 0 +#define IN_USE 1 +#define DESTROYED 2 + volatile apr_uint32_t in_use; + apr_os_thread_t in_use_by; +#endif /* APR_POOL_CONCURRENCY_CHECK */ }; #define SIZEOF_POOL_T APR_ALIGN_DEFAULT(sizeof(apr_pool_t)) @@ -576,6 +661,10 @@ if (apr_pools_initialized++) return APR_SUCCESS; +#if HAVE_VALGRIND + apr_running_on_valgrind = RUNNING_ON_VALGRIND; +#endif + #if APR_ALLOCATOR_USES_MMAP && defined(_SC_PAGESIZE) boundary_size = sysconf(_SC_PAGESIZE); boundary_index = 12; @@ -662,6 +751,68 @@ #define node_free_space(node_) ((apr_size_t)(node_->endp - node_->first_avail)) /* + * Helpers to mark pool as in-use/free. Used for finding thread-unsafe + * concurrent accesses from different threads. + */ +#if APR_POOL_CONCURRENCY_CHECK + +static const char * const in_use_string[] = { "idle", "in use", "destroyed" }; + +static void pool_concurrency_abort(apr_pool_t *pool, apr_uint32_t new, apr_uint32_t old) +{ + fprintf(stderr, "pool concurrency check: pool %p(%s), thread cur %lx " + "in use by %lx, state %s -> %s \n", + pool, pool->tag, (unsigned long)apr_os_thread_current(), + (unsigned long)pool->in_use_by, + in_use_string[old], in_use_string[new]); + abort(); +} + +static APR_INLINE void pool_concurrency_set_used(apr_pool_t *pool) +{ + apr_uint32_t old; + + old = apr_atomic_cas32(&pool->in_use, IN_USE, IDLE); + + if (old != IDLE) + pool_concurrency_abort(pool, IN_USE, old); + + pool->in_use_by = apr_os_thread_current(); +} + +static APR_INLINE void pool_concurrency_set_idle(apr_pool_t *pool) +{ + apr_uint32_t old; + + old = apr_atomic_cas32(&pool->in_use, IDLE, IN_USE); + + if (old != IN_USE) + pool_concurrency_abort(pool, IDLE, old); +} + +static APR_INLINE void pool_concurrency_init(apr_pool_t *pool) +{ + pool->in_use = IDLE; +} + +static APR_INLINE void pool_concurrency_set_destroyed(apr_pool_t *pool) +{ + apr_uint32_t old; + + old = apr_atomic_cas32(&pool->in_use, DESTROYED, IDLE); + + if (old != IDLE) + pool_concurrency_abort(pool, DESTROYED, old); + pool->in_use_by = apr_os_thread_current(); +} +#else +static APR_INLINE void pool_concurrency_init(apr_pool_t *pool) { } +static APR_INLINE void pool_concurrency_set_used(apr_pool_t *pool) { } +static APR_INLINE void pool_concurrency_set_idle(apr_pool_t *pool) { } +static APR_INLINE void pool_concurrency_set_destroyed(apr_pool_t *pool) { } +#endif /* APR_POOL_CONCURRENCY_CHECK */ + +/* * Memory allocation */ @@ -671,8 +822,14 @@ void *mem; apr_size_t size, free_index; + pool_concurrency_set_used(pool); size = APR_ALIGN_DEFAULT(in_size); +#if HAVE_VALGRIND + if (apr_running_on_valgrind) + size += 2 * REDZONE; +#endif if (size < in_size) { + pool_concurrency_set_idle(pool); if (pool->abort_fn) pool->abort_fn(APR_ENOMEM); @@ -684,8 +841,7 @@ if (size <= node_free_space(active)) { mem = active->first_avail; active->first_avail += size; - - return mem; + goto have_mem; } node = active->next; @@ -694,6 +850,7 @@ } else { if ((node = allocator_alloc(pool->allocator, size)) == NULL) { + pool_concurrency_set_idle(pool); if (pool->abort_fn) pool->abort_fn(APR_ENOMEM); @@ -713,10 +870,10 @@ free_index = (APR_ALIGN(active->endp - active->first_avail + 1, BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX; - active->free_index = (APR_UINT32_TRUNC_CAST)free_index; + active->free_index = free_index; node = active->next; if (free_index >= node->free_index) - return mem; + goto have_mem; do { node = node->next; @@ -726,7 +883,22 @@ list_remove(active); list_insert(active, node); +have_mem: +#if HAVE_VALGRIND + if (!apr_running_on_valgrind) { + pool_concurrency_set_idle(pool); + return mem; + } + else { + mem = (char *)mem + REDZONE; + VALGRIND_MEMPOOL_ALLOC(pool, mem, in_size); + pool_concurrency_set_idle(pool); + return mem; + } +#else + pool_concurrency_set_idle(pool); return mem; +#endif } /* Provide an implementation of apr_pcalloc for backward compatibility @@ -760,7 +932,10 @@ /* Run pre destroy cleanups */ run_cleanups(&pool->pre_cleanups); + + pool_concurrency_set_used(pool); pool->pre_cleanups = NULL; + pool_concurrency_set_idle(pool); /* Destroy the subpools. The subpools will detach themselves from * this pool thus this loop is safe and easy. @@ -770,6 +945,8 @@ /* Run cleanups */ run_cleanups(&pool->cleanups); + + pool_concurrency_set_used(pool); pool->cleanups = NULL; pool->free_cleanups = NULL; @@ -786,13 +963,19 @@ active = pool->active = pool->self; active->first_avail = pool->self_first_avail; - if (active->next == active) + APR_IF_VALGRIND(VALGRIND_MEMPOOL_TRIM(pool, pool, 1)); + + if (active->next == active) { + pool_concurrency_set_idle(pool); return; + } *active->ref = NULL; allocator_free(pool->allocator, active->next); active->next = active; active->ref = &active->next; + + pool_concurrency_set_idle(pool); } APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool) @@ -802,7 +985,10 @@ /* Run pre destroy cleanups */ run_cleanups(&pool->pre_cleanups); + + pool_concurrency_set_used(pool); pool->pre_cleanups = NULL; + pool_concurrency_set_idle(pool); /* Destroy the subpools. The subpools will detach themselve from * this pool thus this loop is safe and easy. @@ -812,6 +998,7 @@ /* Run cleanups */ run_cleanups(&pool->cleanups); + pool_concurrency_set_destroyed(pool); /* Free subprocesses */ free_proc_chain(pool->subprocesses); @@ -863,6 +1050,7 @@ if (apr_allocator_owner_get(allocator) == pool) { apr_allocator_destroy(allocator); } + APR_IF_VALGRIND(VALGRIND_DESTROY_MEMPOOL(pool)); } APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool, @@ -899,8 +1087,23 @@ node->next = node; node->ref = &node->next; +#if HAVE_VALGRIND + if (!apr_running_on_valgrind) { + pool = (apr_pool_t *)node->first_avail; + pool->self_first_avail = (char *)pool + SIZEOF_POOL_T; + } + else { + pool = (apr_pool_t *)(node->first_avail + REDZONE); + pool->self_first_avail = (char *)pool + SIZEOF_POOL_T + 2 * REDZONE; + VALGRIND_MAKE_MEM_NOACCESS(pool->self_first_avail, + node->endp - pool->self_first_avail); + VALGRIND_CREATE_MEMPOOL(pool, REDZONE, 0); + } +#else pool = (apr_pool_t *)node->first_avail; - node->first_avail = pool->self_first_avail = (char *)pool + SIZEOF_POOL_T; + pool->self_first_avail = (char *)pool + SIZEOF_POOL_T; +#endif + node->first_avail = pool->self_first_avail; pool->allocator = allocator; pool->active = pool->self = node; @@ -941,6 +1144,8 @@ pool->ref = NULL; } + pool_concurrency_init(pool); + *newpool = pool; return APR_SUCCESS; @@ -1010,6 +1215,8 @@ #endif /* defined(NETWARE) */ if (!allocator) pool_allocator->owner = pool; + + pool_concurrency_init(pool); *newpool = pool; return APR_SUCCESS; @@ -1079,7 +1286,7 @@ free_index = (APR_ALIGN(active->endp - active->first_avail + 1, BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX; - active->free_index = (APR_UINT32_TRUNC_CAST)free_index; + active->free_index = free_index; node = active->next; if (free_index < node->free_index) { do { @@ -1105,7 +1312,11 @@ ps->got_a_new_node = 1; } + APR_VALGRIND_UNDEFINED(node->first_avail, + node->endp - node->first_avail); memcpy(node->first_avail, active->first_avail, cur_len); + APR_VALGRIND_NOACCESS(active->first_avail, + active->endp - active->first_avail); ps->node = node; ps->vbuff.curpos = node->first_avail + cur_len; @@ -1114,6 +1325,35 @@ return 0; } +#if HAVE_VALGRIND +static int add_redzone(int (*flush_func)(apr_vformatter_buff_t *b), + struct psprintf_data *ps) +{ + apr_size_t len = ps->vbuff.curpos - ps->node->first_avail + REDZONE; + + while (ps->vbuff.curpos - ps->node->first_avail < len) { + if (ps->vbuff.endpos - ps->node->first_avail >= len) + ps->vbuff.curpos = ps->node->first_avail + len; + else + ps->vbuff.curpos = ps->vbuff.endpos; + + /* + * Prevent valgrind from complaining when psprintf_flush() + * does a memcpy(). The VALGRIND_MEMPOOL_ALLOC() will reset + * the redzone to NOACCESS. + */ + if (ps->vbuff.curpos != ps->node->first_avail) + VALGRIND_MAKE_MEM_DEFINED(ps->node->first_avail, + ps->vbuff.curpos - ps->node->first_avail); + if (ps->vbuff.curpos == ps->vbuff.endpos) { + if (psprintf_flush(&ps->vbuff) == -1) + return -1; + } + } + return 0; +} +#endif + APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap) { struct psprintf_data ps; @@ -1122,6 +1362,7 @@ apr_memnode_t *active, *node; apr_size_t free_index; + pool_concurrency_set_used(pool); ps.node = active = pool->active; ps.pool = pool; ps.vbuff.curpos = ps.node->first_avail; @@ -1136,18 +1377,46 @@ */ if (ps.node->first_avail == ps.node->endp) { if (psprintf_flush(&ps.vbuff) == -1) - goto error; + goto error; } +#if HAVE_VALGRIND + if (apr_running_on_valgrind) { + if (add_redzone(psprintf_flush, &ps) == -1) + goto error; + if (!ps.got_a_new_node) { + /* psprintf_flush() has not been called, allow access to our node */ + VALGRIND_MAKE_MEM_UNDEFINED(ps.vbuff.curpos, + ps.node->endp - ps.vbuff.curpos); + } + } +#endif /* HAVE_VALGRIND */ if (apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap) == -1) goto error; - strp = ps.vbuff.curpos; - *strp++ = '\0'; + *ps.vbuff.curpos++ = '\0'; - size = strp - ps.node->first_avail; - size = APR_ALIGN_DEFAULT(size); +#if HAVE_VALGRIND + if (!apr_running_on_valgrind) { + strp = ps.node->first_avail; + } + else { + if (add_redzone(psprintf_flush, &ps) == -1) + goto error; + if (ps.node->endp != ps.vbuff.curpos) + APR_VALGRIND_NOACCESS(ps.vbuff.curpos, + ps.node->endp - ps.vbuff.curpos); + strp = ps.node->first_avail + REDZONE; + size = ps.vbuff.curpos - strp; + VALGRIND_MEMPOOL_ALLOC(pool, strp, size); + VALGRIND_MAKE_MEM_DEFINED(strp, size); + } +#else strp = ps.node->first_avail; +#endif + + size = ps.vbuff.curpos - ps.node->first_avail; + size = APR_ALIGN_DEFAULT(size); ps.node->first_avail += size; if (ps.free) @@ -1156,8 +1425,10 @@ /* * Link the node in if it's a new one */ - if (!ps.got_a_new_node) + if (!ps.got_a_new_node) { + pool_concurrency_set_idle(pool); return strp; + } active = pool->active; node = ps.node; @@ -1171,11 +1442,13 @@ free_index = (APR_ALIGN(active->endp - active->first_avail + 1, BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX; - active->free_index = (APR_UINT32_TRUNC_CAST)free_index; + active->free_index = free_index; node = active->next; - if (free_index >= node->free_index) + if (free_index >= node->free_index) { + pool_concurrency_set_idle(pool); return strp; + } do { node = node->next; @@ -1185,15 +1458,19 @@ list_remove(active); list_insert(active, node); + pool_concurrency_set_idle(pool); return strp; error: + pool_concurrency_set_idle(pool); if (pool->abort_fn) pool->abort_fn(APR_ENOMEM); if (ps.got_a_new_node) { ps.node->next = ps.free; allocator_free(pool->allocator, ps.node); } + APR_VALGRIND_NOACCESS(pool->active->first_avail, + pool->active->endp - pool->active->first_avail); return NULL; } @@ -1336,7 +1613,7 @@ if (!apr_pool_is_child_of(pool, global_pool)) { #if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) apr_pool_log_event(pool, "LIFE", - __FILE__ ":apr_pool_integrity check", 0); + __FILE__ ":apr_pool_integrity check [lifetime]", 0); #endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */ abort(); } @@ -1347,7 +1624,7 @@ if (!apr_os_thread_equal(pool->owner, apr_os_thread_current())) { #if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) apr_pool_log_event(pool, "THREAD", - __FILE__ ":apr_pool_integrity check", 0); + __FILE__ ":apr_pool_integrity check [owner]", 0); #endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */ abort(); } @@ -1537,7 +1814,7 @@ static void pool_clear_debug(apr_pool_t *pool, const char *file_line) { debug_node_t *node; - apr_uint32_t index; + apr_size_t index; /* Run pre destroy cleanups */ run_cleanups(&pool->pre_cleanups); @@ -1854,7 +2131,7 @@ *newpool = pool; #if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE) - apr_pool_log_event(pool, "CREATE", file_line, 1); + apr_pool_log_event(pool, "CREATEU", file_line, 1); #endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE) */ return APR_SUCCESS; @@ -1953,7 +2230,7 @@ { void **pmem = (void **)data; debug_node_t *node; - apr_uint32_t index; + apr_size_t index; node = pool->nodes; @@ -1986,7 +2263,7 @@ { apr_size_t *psize = (apr_size_t *)data; debug_node_t *node; - apr_uint32_t index; + apr_size_t index; node = pool->nodes; diff -Nru apr-1.5.2/misc/unix/errorcodes.c apr-1.6.5/misc/unix/errorcodes.c --- apr-1.5.2/misc/unix/errorcodes.c 2014-05-09 20:01:43.000000000 +0000 +++ apr-1.6.5/misc/unix/errorcodes.c 2018-08-30 02:49:36.000000000 +0000 @@ -369,7 +369,7 @@ /* glibc style */ /* BeOS has the function available, but it doesn't provide - * the prototype publically (doh!), so to avoid a build warning + * the prototype publicly (doh!), so to avoid a build warning * we add a suitable prototype here. */ #if defined(BEOS) diff -Nru apr-1.5.2/misc/win32/start.c apr-1.6.5/misc/win32/start.c --- apr-1.5.2/misc/win32/start.c 2011-04-14 07:21:39.000000000 +0000 +++ apr-1.6.5/misc/win32/start.c 2018-08-25 21:08:44.000000000 +0000 @@ -39,7 +39,7 @@ * _CRT_BLOCK to trick the system into trusting our store. */ static int warrsztoastr(const char * const * *retarr, - const wchar_t * arrsz, int args) + const wchar_t * arrsz) { const apr_wchar_t *wch; apr_size_t totlen; @@ -48,13 +48,11 @@ char **env; char *pstrs; char *strs; - int arg; + int arg, args; - if (args < 0) { - for (args = 1, wch = arrsz; wch[0] || wch[1]; ++wch) - if (!*wch) - ++args; - } + for (args = 1, wch = arrsz; wch[0] || wch[1]; ++wch) + if (!*wch) + ++args; wsize = 1 + wch - arrsz; /* This is a safe max allocation, we will alloc each @@ -134,7 +132,7 @@ } sysstr = GetEnvironmentStringsW(); - dupenv = warrsztoastr(&_environ, sysstr, -1); + dupenv = warrsztoastr(&_environ, sysstr); if (env) { *env = apr_malloc_dbg((dupenv + 1) * sizeof (char *), diff -Nru apr-1.5.2/network_io/unix/multicast.c apr-1.6.5/network_io/unix/multicast.c --- apr-1.5.2/network_io/unix/multicast.c 2013-05-30 09:28:55.000000000 +0000 +++ apr-1.6.5/network_io/unix/multicast.c 2015-08-16 14:18:02.000000000 +0000 @@ -62,7 +62,7 @@ for (ifp = ifs; ifp; ifp = ifp->ifa_next) { if (ifp->ifa_addr != NULL && ifp->ifa_addr->sa_family == AF_INET6) { if (memcmp(&iface->sa.sin6.sin6_addr, - &ifp->ifa_addr->sa_data[0], + &((struct sockaddr_in6*)ifp->ifa_addr)->sin6_addr, sizeof(iface->sa.sin6.sin6_addr)) == 0) { index = if_nametoindex(ifp->ifa_name); break; diff -Nru apr-1.5.2/network_io/unix/sockaddr.c apr-1.6.5/network_io/unix/sockaddr.c --- apr-1.5.2/network_io/unix/sockaddr.c 2014-10-27 17:51:38.000000000 +0000 +++ apr-1.6.5/network_io/unix/sockaddr.c 2017-10-25 13:26:42.000000000 +0000 @@ -167,6 +167,14 @@ addr->ipaddr_len = sizeof(struct in6_addr); } #endif +#if APR_HAVE_SOCKADDR_UN + else if (family == APR_UNIX) { + addr->salen = sizeof(struct sockaddr_un); + addr->addr_str_len = sizeof(addr->sa.unx.sun_path);; + addr->ipaddr_ptr = &(addr->sa.unx.sun_path); + addr->ipaddr_len = addr->addr_str_len; + } +#endif } APR_DECLARE(apr_status_t) apr_socket_addr_get(apr_sockaddr_t **sa, @@ -269,19 +277,13 @@ return APR_EINVAL; } addrlen = scope_delim - str - 1; - *scope_id = apr_palloc(p, end_bracket - scope_delim); - memcpy(*scope_id, scope_delim + 1, end_bracket - scope_delim - 1); - (*scope_id)[end_bracket - scope_delim - 1] = '\0'; + *scope_id = apr_pstrmemdup(p, scope_delim + 1, end_bracket - scope_delim - 1); } else { addrlen = addrlen - 2; /* minus 2 for '[' and ']' */ } - *addr = apr_palloc(p, addrlen + 1); - memcpy(*addr, - str + 1, - addrlen); - (*addr)[addrlen] = '\0'; + *addr = apr_pstrmemdup(p, str + 1, addrlen); if (apr_inet_pton(AF_INET6, *addr, &ipaddr) != 1) { *addr = NULL; *scope_id = NULL; @@ -295,9 +297,7 @@ /* XXX If '%' is not a valid char in a DNS name, we *could* check * for bogus scope ids first. */ - *addr = apr_palloc(p, addrlen + 1); - memcpy(*addr, str, addrlen); - (*addr)[addrlen] = '\0'; + *addr = apr_pstrmemdup(p, str, addrlen); } return APR_SUCCESS; } @@ -622,6 +622,33 @@ } #endif } + if (family == APR_UNSPEC && hostname && *hostname == '/') { + family = APR_UNIX; + } + if (family == APR_UNIX) { +#if APR_HAVE_SOCKADDR_UN + if (hostname && *hostname == '/') { + *sa = apr_pcalloc(p, sizeof(apr_sockaddr_t)); + (*sa)->pool = p; + apr_cpystrn((*sa)->sa.unx.sun_path, hostname, + sizeof((*sa)->sa.unx.sun_path)); + (*sa)->hostname = apr_pstrdup(p, hostname); + (*sa)->family = APR_UNIX; + (*sa)->sa.unx.sun_family = APR_UNIX; + (*sa)->salen = sizeof(struct sockaddr_un); + (*sa)->addr_str_len = sizeof((*sa)->sa.unx.sun_path); + (*sa)->ipaddr_ptr = &((*sa)->sa.unx.sun_path); + (*sa)->ipaddr_len = (*sa)->addr_str_len; + + return APR_SUCCESS; + } + else +#endif + { + *sa = NULL; + return APR_ENOTIMPL; + } + } #if !APR_HAVE_IPV6 /* What may happen is that APR is not IPv6-enabled, but we're still * going to call getaddrinfo(), so we have to tell the OS we only @@ -636,6 +663,42 @@ return find_addresses(sa, hostname, family, port, flags, p); } +APR_DECLARE(apr_status_t) apr_sockaddr_info_copy(apr_sockaddr_t **dst, + const apr_sockaddr_t *src, + apr_pool_t *p) +{ + apr_sockaddr_t *d; + const apr_sockaddr_t *s; + + for (*dst = d = NULL, s = src; s; s = s->next) { + if (!d) { + *dst = d = apr_pmemdup(p, s, sizeof *s); + } + else { + d = d->next = apr_pmemdup(p, s, sizeof *s); + } + if (s->hostname) { + if (s == src || s->hostname != src->hostname) { + d->hostname = apr_pstrdup(p, s->hostname); + } + else { + d->hostname = (*dst)->hostname; + } + } + if (s->servname) { + if (s == src || s->servname != src->servname) { + d->servname = apr_pstrdup(p, s->servname); + } + else { + d->servname = (*dst)->servname; + } + } + d->pool = p; + apr_sockaddr_vars_set(d, s->family, s->port); + } + return APR_SUCCESS; +} + APR_DECLARE(apr_status_t) apr_getnameinfo(char **hostname, apr_sockaddr_t *sockaddr, apr_int32_t flags) @@ -674,6 +737,12 @@ tmphostname, sizeof(tmphostname), NULL, 0, flags != 0 ? flags : NI_NAMEREQD); } +#if APR_HAVE_SOCKADDR_UN + else if (sockaddr->family == APR_UNIX) { + *hostname = sockaddr->hostname; + return APR_SUCCESS; + } +#endif else #endif rc = getnameinfo((const struct sockaddr *)&sockaddr->sa, sockaddr->salen, @@ -985,6 +1054,10 @@ static int looks_like_ip(const char *ipstr) { + if (strlen(ipstr) == 0) { + return 0; + } + if (strchr(ipstr, ':')) { /* definitely not a hostname; assume it is intended to be an IPv6 address */ return 1; diff -Nru apr-1.5.2/network_io/unix/sockets.c apr-1.6.5/network_io/unix/sockets.c --- apr-1.5.2/network_io/unix/sockets.c 2015-03-20 01:34:07.000000000 +0000 +++ apr-1.6.5/network_io/unix/sockets.c 2015-03-20 01:31:17.000000000 +0000 @@ -26,13 +26,26 @@ #define close closesocket #endif /* BEOS_R5 */ -static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */ +#if APR_HAVE_SOCKADDR_UN +#define GENERIC_INADDR_ANY_LEN sizeof(struct sockaddr_un) +#else +#define GENERIC_INADDR_ANY_LEN 16 +#endif + +/* big enough for IPv4, IPv6 and optionaly sun_path */ +static char generic_inaddr_any[GENERIC_INADDR_ANY_LEN] = {0}; static apr_status_t socket_cleanup(void *sock) { apr_socket_t *thesocket = sock; int sd = thesocket->socketdes; +#if APR_HAVE_SOCKADDR_UN + if (thesocket->bound && thesocket->local_addr->family == APR_UNIX) { + /* XXX: Check for return values ? */ + unlink(thesocket->local_addr->hostname); + } +#endif /* Set socket descriptor to -1 before close(), so that there is no * chance of returning an already closed FD from apr_os_sock_get(). */ @@ -49,6 +62,18 @@ } } +static apr_status_t socket_child_cleanup(void *sock) +{ + apr_socket_t *thesocket = sock; + if (close(thesocket->socketdes) == 0) { + thesocket->socketdes = -1; + return APR_SUCCESS; + } + else { + return errno; + } +} + static void set_socket_vars(apr_socket_t *sock, int family, int type, int protocol) { sock->type = type; @@ -92,6 +117,7 @@ int protocol, apr_pool_t *cont) { int family = ofamily, flags = 0; + int oprotocol = protocol; #ifdef HAVE_SOCK_CLOEXEC flags |= SOCK_CLOEXEC; @@ -104,7 +130,11 @@ family = APR_INET; #endif } - +#if APR_HAVE_SOCKADDR_UN + if (family == APR_UNIX) { + protocol = 0; + } +#endif alloc_socket(new, cont); #ifndef BEOS_R5 @@ -140,7 +170,7 @@ if ((*new)->socketdes < 0) { return errno; } - set_socket_vars(*new, family, type, protocol); + set_socket_vars(*new, family, type, oprotocol); #ifndef HAVE_SOCK_CLOEXEC { @@ -167,7 +197,7 @@ (*new)->timeout = -1; (*new)->inherit = 0; apr_pool_cleanup_register((*new)->pool, (void *)(*new), socket_cleanup, - socket_cleanup); + socket_child_cleanup); return APR_SUCCESS; } @@ -192,6 +222,13 @@ else { sock->local_addr = sa; /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */ +#if APR_HAVE_SOCKADDR_UN + if (sock->local_addr->family == APR_UNIX) { + sock->bound = 1; + sock->local_port_unknown = 1; + } + else +#endif if (sock->local_addr->sa.sin.sin_port == 0) { /* no need for ntohs() when comparing w/ 0 */ sock->local_port_unknown = 1; /* kernel got us an ephemeral port */ } @@ -282,6 +319,14 @@ (*new)->local_addr->ipaddr_ptr = &(*new)->local_addr->sa.sin6.sin6_addr; } #endif +#if APR_HAVE_SOCKADDR_UN + else if (sock->local_addr->sa.sin.sin_family == AF_UNIX) { + *(*new)->remote_addr = *sock->local_addr; + (*new)->local_addr->ipaddr_ptr = &((*new)->local_addr->sa.unx.sun_path); + (*new)->remote_addr->ipaddr_ptr = &((*new)->remote_addr->sa.unx.sun_path); + } + if (sock->local_addr->sa.sin.sin_family != AF_UNIX) +#endif (*new)->remote_addr->port = ntohs((*new)->remote_addr->sa.sin.sin_port); if (sock->local_port_unknown) { /* not likely for a listening socket, but theoretically possible :) */ @@ -375,7 +420,6 @@ #endif /* SO_ERROR */ } - if (memcmp(sa->ipaddr_ptr, generic_inaddr_any, sa->ipaddr_len)) { /* A real remote address was passed in. If the unspecified * address was used, the actual remote addr will have to be @@ -393,6 +437,13 @@ /* connect() got us an ephemeral port */ sock->local_port_unknown = 1; } +#if APR_HAVE_SOCKADDR_UN + if (sock->local_addr->sa.sin.sin_family == AF_UNIX) { + /* Assign connect address as local. */ + sock->local_addr = sa; + } + else +#endif if (!memcmp(sock->local_addr->ipaddr_ptr, generic_inaddr_any, sock->local_addr->ipaddr_len)) { diff -Nru apr-1.5.2/network_io/unix/sockopt.c apr-1.6.5/network_io/unix/sockopt.c --- apr-1.5.2/network_io/unix/sockopt.c 2012-11-07 16:10:09.000000000 +0000 +++ apr-1.6.5/network_io/unix/sockopt.c 2016-03-04 13:07:48.000000000 +0000 @@ -330,6 +330,20 @@ return APR_ENOTIMPL; #endif break; + case APR_SO_FREEBIND: +#if defined(IP_FREEBIND) + if (setsockopt(sock->socketdes, SOL_IP, IP_FREEBIND, + (void *)&one, sizeof(int)) == -1) { + return errno; + } + apr_set_option(sock, APR_SO_FREEBIND, on); +#elif 0 /* defined(IP_BINDANY) ... */ + /* TODO: insert FreeBSD support here, note family specific + * options, IP_BINDANY vs IPV6_BINDANY */ +#else + return APR_ENOTIMPL; +#endif + break; default: return APR_EINVAL; } @@ -428,3 +442,24 @@ return APR_SUCCESS; } #endif + +APR_PERMS_SET_IMPLEMENT(socket) +{ +#if APR_HAVE_SOCKADDR_UN + apr_status_t rv = APR_SUCCESS; + apr_socket_t *socket = (apr_socket_t *)thesocket; + + if (socket->local_addr->family == APR_UNIX) { + if (!(perms & APR_FPROT_GSETID)) + gid = -1; + if (fchown(socket->socketdes, uid, gid) < 0) { + rv = errno; + } + } + else + rv = APR_EINVAL; + return rv; +#else + return APR_ENOTIMPL; +#endif +} diff -Nru apr-1.5.2/NOTICE apr-1.6.5/NOTICE --- apr-1.5.2/NOTICE 2015-01-01 12:37:54.000000000 +0000 +++ apr-1.6.5/NOTICE 2018-01-04 12:57:45.000000000 +0000 @@ -1,5 +1,5 @@ Apache Portable Runtime -Copyright (c) 2000-2015 The Apache Software Foundation. +Copyright (c) 2000-2018 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff -Nru apr-1.5.2/NWGNUmakefile apr-1.6.5/NWGNUmakefile --- apr-1.5.2/NWGNUmakefile 2014-07-24 13:19:33.000000000 +0000 +++ apr-1.6.5/NWGNUmakefile 2016-09-17 21:49:57.000000000 +0000 @@ -362,6 +362,7 @@ $(OBJDIR)/userinfo.o \ $(OBJDIR)/version.o \ $(OBJDIR)/waitio.o \ + $(OBJDIR)/wakeup.o \ $(EOLIST) diff -Nru apr-1.5.2/poll/os2/pollset.c apr-1.6.5/poll/os2/pollset.c --- apr-1.5.2/poll/os2/pollset.c 2009-10-02 23:24:56.000000000 +0000 +++ apr-1.6.5/poll/os2/pollset.c 2016-08-10 13:46:54.000000000 +0000 @@ -18,7 +18,9 @@ #include "apr_poll.h" #include "apr_arch_networkio.h" - +#ifndef MSG_DONTWAIT +#define MSG_DONTWAIT 0x100 +#endif struct apr_pollset_t { apr_pool_t *pool; @@ -31,6 +33,9 @@ int num_total; apr_pollfd_t *query_set; apr_pollfd_t *result_set; + apr_socket_t *wake_listen; + apr_socket_t *wake_sender; + apr_sockaddr_t *wake_address; }; @@ -40,6 +45,12 @@ apr_pool_t *p, apr_uint32_t flags) { + apr_status_t rc = APR_SUCCESS; + + if (flags & APR_POLLSET_WAKEABLE) { + size++; + } + *pollset = apr_palloc(p, sizeof(**pollset)); (*pollset)->pool = p; (*pollset)->nelts = 0; @@ -48,7 +59,34 @@ (*pollset)->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t)); (*pollset)->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t)); (*pollset)->num_read = -1; - return APR_SUCCESS; + (*pollset)->wake_listen = NULL; + (*pollset)->wake_sender = NULL; + + if (flags & APR_POLLSET_WAKEABLE) { + rc = apr_socket_create(&(*pollset)->wake_listen, APR_UNIX, SOCK_DGRAM, 0, p); + + if (rc == APR_SUCCESS) { + apr_sockaddr_t *listen_address; + apr_socket_timeout_set((*pollset)->wake_listen, 0); + apr_sockaddr_info_get(&listen_address, "", APR_UNIX, 0, 0, p); + rc = apr_socket_bind((*pollset)->wake_listen, listen_address); + + if (rc == APR_SUCCESS) { + apr_pollfd_t wake_poll_fd; + wake_poll_fd.p = p; + wake_poll_fd.desc_type = APR_POLL_SOCKET; + wake_poll_fd.reqevents = APR_POLLIN; + wake_poll_fd.desc.s = (*pollset)->wake_listen; + wake_poll_fd.client_data = NULL; + apr_pollset_add(*pollset, &wake_poll_fd); + apr_socket_addr_get(&(*pollset)->wake_address, APR_LOCAL, (*pollset)->wake_listen); + + rc = apr_socket_create(&(*pollset)->wake_sender, APR_UNIX, SOCK_DGRAM, 0, p); + } + } + } + + return rc; } APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **pollset, @@ -57,6 +95,13 @@ apr_uint32_t flags, apr_pollset_method_e method) { + /* Only one method is supported */ + if (flags & APR_POLLSET_NODEFAULT) { + if (method != APR_POLLSET_DEFAULT && method != APR_POLLSET_POLL) { + return APR_ENOTIMPL; + } + } + return apr_pollset_create(pollset, size, p, flags); } @@ -167,6 +212,7 @@ apr_uint32_t i; int *pollresult; int read_pos, write_pos, except_pos; + apr_status_t rc = APR_SUCCESS; if (pollset->num_read < 0) { make_pollset(pollset); @@ -216,9 +262,28 @@ } if (rtnevents) { - pollset->result_set[*num] = pollset->query_set[i]; - pollset->result_set[*num].rtnevents = rtnevents; - (*num)++; + if (i == 0 && pollset->wake_listen != NULL) { + struct apr_sockaddr_t from_addr; + char buffer[16]; + apr_size_t buflen; + for (;;) { + buflen = sizeof(buffer); + rv = apr_socket_recvfrom(&from_addr, pollset->wake_listen, + MSG_DONTWAIT, buffer, &buflen); + if (rv != APR_SUCCESS) { + break; + } + /* Woken up, drain the pipe still. */ + rc = APR_EINTR; + } + } + else { + pollset->result_set[*num] = pollset->query_set[i]; + pollset->result_set[*num].rtnevents = rtnevents; + /* Event(s) besides wakeup pipe. */ + rc = APR_SUCCESS; + (*num)++; + } } } @@ -226,5 +291,31 @@ *descriptors = pollset->result_set; } - return APR_SUCCESS; + return rc; +} + + + +APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset) +{ + if (pollset->wake_sender) { + apr_size_t len = 1; + return apr_socket_sendto(pollset->wake_sender, pollset->wake_address, 0, "", &len); + } + + return APR_EINIT; +} + + + +APR_DECLARE(const char *) apr_poll_method_defname() +{ + return "select"; +} + + + +APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset) +{ + return "select"; } diff -Nru apr-1.5.2/poll/unix/epoll.c apr-1.6.5/poll/unix/epoll.c --- apr-1.5.2/poll/unix/epoll.c 2015-03-20 01:34:07.000000000 +0000 +++ apr-1.6.5/poll/unix/epoll.c 2018-01-03 09:50:41.000000000 +0000 @@ -157,7 +157,7 @@ const apr_pollfd_t *descriptor) { struct epoll_event ev = {0}; - int ret = -1; + int ret; pfd_elem_t *elem = NULL; apr_status_t rv = APR_SUCCESS; @@ -214,7 +214,7 @@ struct epoll_event ev = {0}; /* ignored, but must be passed with * kernel < 2.6.9 */ - int ret = -1; + int ret; if (descriptor->desc_type == APR_POLL_SOCKET) { ret = epoll_ctl(pollset->p->epoll_fd, EPOLL_CTL_DEL, @@ -255,9 +255,10 @@ apr_int32_t *num, const apr_pollfd_t **descriptors) { - int ret, i, j; + int ret; apr_status_t rv = APR_SUCCESS; - apr_pollfd_t *fdptr; + + *num = 0; if (timeout > 0) { timeout /= 1000; @@ -265,8 +266,6 @@ ret = epoll_wait(pollset->p->epoll_fd, pollset->p->pollset, pollset->nalloc, timeout); - (*num) = ret; - if (ret < 0) { rv = apr_get_netos_error(); } @@ -274,6 +273,9 @@ rv = APR_TIMEUP; } else { + int i, j; + const apr_pollfd_t *fdptr; + for (i = 0, j = 0; i < ret; i++) { if (pollset->flags & APR_POLLSET_NOCOPY) { fdptr = (apr_pollfd_t *)(pollset->p->pollset[i].data.ptr); @@ -287,7 +289,7 @@ if ((pollset->flags & APR_POLLSET_WAKEABLE) && fdptr->desc_type == APR_POLL_FILE && fdptr->desc.f == pollset->wakeup_pipe[0]) { - apr_pollset_drain_wakeup_pipe(pollset); + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); rv = APR_EINTR; } else { @@ -318,7 +320,7 @@ return rv; } -static apr_pollset_provider_t impl = { +static const apr_pollset_provider_t impl = { impl_pollset_create, impl_pollset_add, impl_pollset_remove, @@ -327,11 +329,10 @@ "epoll" }; -apr_pollset_provider_t *apr_pollset_provider_epoll = &impl; +const apr_pollset_provider_t *const apr_pollset_provider_epoll = &impl; -static apr_status_t cb_cleanup(void *p_) +static apr_status_t impl_pollcb_cleanup(apr_pollcb_t *pollcb) { - apr_pollcb_t *pollcb = (apr_pollcb_t *) p_; close(pollcb->fd); return APR_SUCCESS; } @@ -377,7 +378,6 @@ pollcb->fd = fd; pollcb->pollset.epoll = apr_palloc(p, size * sizeof(struct epoll_event)); - apr_pool_cleanup_register(p, pollcb, cb_cleanup, apr_pool_cleanup_null); return APR_SUCCESS; } @@ -385,11 +385,11 @@ static apr_status_t impl_pollcb_add(apr_pollcb_t *pollcb, apr_pollfd_t *descriptor) { - struct epoll_event ev; + struct epoll_event ev = { 0 }; int ret; ev.events = get_epoll_event(descriptor->reqevents); - ev.data.ptr = (void *)descriptor; + ev.data.ptr = (void *) descriptor; if (descriptor->desc_type == APR_POLL_SOCKET) { ret = epoll_ctl(pollcb->fd, EPOLL_CTL_ADD, @@ -414,7 +414,7 @@ struct epoll_event ev = {0}; /* ignored, but must be passed with * kernel < 2.6.9 */ - int ret = -1; + int ret; if (descriptor->desc_type == APR_POLL_SOCKET) { ret = epoll_ctl(pollcb->fd, EPOLL_CTL_DEL, @@ -456,6 +456,14 @@ else { for (i = 0; i < ret; i++) { apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.epoll[i].data.ptr); + + if ((pollcb->flags & APR_POLLSET_WAKEABLE) && + pollfd->desc_type == APR_POLL_FILE && + pollfd->desc.f == pollcb->wakeup_pipe[0]) { + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); + return APR_EINTR; + } + pollfd->rtnevents = get_epoll_revent(pollcb->pollset.epoll[i].events); rv = func(baton, pollfd); @@ -468,14 +476,15 @@ return rv; } -static apr_pollcb_provider_t impl_cb = { +static const apr_pollcb_provider_t impl_cb = { impl_pollcb_create, impl_pollcb_add, impl_pollcb_remove, impl_pollcb_poll, + impl_pollcb_cleanup, "epoll" }; -apr_pollcb_provider_t *apr_pollcb_provider_epoll = &impl_cb; +const apr_pollcb_provider_t *const apr_pollcb_provider_epoll = &impl_cb; #endif /* HAVE_EPOLL */ diff -Nru apr-1.5.2/poll/unix/kqueue.c apr-1.6.5/poll/unix/kqueue.c --- apr-1.5.2/poll/unix/kqueue.c 2015-03-20 01:34:07.000000000 +0000 +++ apr-1.6.5/poll/unix/kqueue.c 2018-01-03 09:50:41.000000000 +0000 @@ -254,10 +254,11 @@ apr_int32_t *num, const apr_pollfd_t **descriptors) { - int ret, i, j; + int ret; struct timespec tv, *tvptr; apr_status_t rv = APR_SUCCESS; - apr_pollfd_t fd; + + *num = 0; if (timeout < 0) { tvptr = NULL; @@ -270,7 +271,6 @@ ret = kevent(pollset->p->kqueue_fd, NULL, 0, pollset->p->ke_set, pollset->p->setsize, tvptr); - (*num) = ret; if (ret < 0) { rv = apr_get_netos_error(); } @@ -278,16 +278,19 @@ rv = APR_TIMEUP; } else { + int i, j; + const apr_pollfd_t *fd; + for (i = 0, j = 0; i < ret; i++) { - fd = (((pfd_elem_t*)(pollset->p->ke_set[i].udata))->pfd); + fd = &((pfd_elem_t *)pollset->p->ke_set[i].udata)->pfd; if ((pollset->flags & APR_POLLSET_WAKEABLE) && - fd.desc_type == APR_POLL_FILE && - fd.desc.f == pollset->wakeup_pipe[0]) { - apr_pollset_drain_wakeup_pipe(pollset); + fd->desc_type == APR_POLL_FILE && + fd->desc.f == pollset->wakeup_pipe[0]) { + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); rv = APR_EINTR; } else { - pollset->p->result_set[j] = fd; + pollset->p->result_set[j] = *fd; pollset->p->result_set[j].rtnevents = get_kqueue_revent(pollset->p->ke_set[i].filter, pollset->p->ke_set[i].flags); @@ -302,7 +305,6 @@ } } - pollset_lock_rings(); /* Shift all PFDs in the Dead Ring to the Free Ring */ @@ -314,7 +316,7 @@ return rv; } -static apr_pollset_provider_t impl = { +static const apr_pollset_provider_t impl = { impl_pollset_create, impl_pollset_add, impl_pollset_remove, @@ -323,11 +325,10 @@ "kqueue" }; -apr_pollset_provider_t *apr_pollset_provider_kqueue = &impl; +const apr_pollset_provider_t *apr_pollset_provider_kqueue = &impl; -static apr_status_t cb_cleanup(void *b_) +static apr_status_t impl_pollcb_cleanup(apr_pollcb_t *pollcb) { - apr_pollcb_t *pollcb = (apr_pollcb_t *) b_; close(pollcb->fd); return APR_SUCCESS; } @@ -365,8 +366,7 @@ } pollcb->fd = fd; - pollcb->pollset.ke = (struct kevent *)apr_pcalloc(p, 2 * size * sizeof(struct kevent)); - apr_pool_cleanup_register(p, pollcb, cb_cleanup, apr_pool_cleanup_null); + pollcb->pollset.ke = (struct kevent *) apr_pcalloc(p, 2 * size * sizeof(struct kevent)); return APR_SUCCESS; } @@ -469,7 +469,14 @@ else { for (i = 0; i < ret; i++) { apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.ke[i].udata); - + + if ((pollcb->flags & APR_POLLSET_WAKEABLE) && + pollfd->desc_type == APR_POLL_FILE && + pollfd->desc.f == pollcb->wakeup_pipe[0]) { + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); + return APR_EINTR; + } + pollfd->rtnevents = get_kqueue_revent(pollcb->pollset.ke[i].filter, pollcb->pollset.ke[i].flags); @@ -484,14 +491,15 @@ return rv; } -static apr_pollcb_provider_t impl_cb = { +static const apr_pollcb_provider_t impl_cb = { impl_pollcb_create, impl_pollcb_add, impl_pollcb_remove, impl_pollcb_poll, + impl_pollcb_cleanup, "kqueue" }; -apr_pollcb_provider_t *apr_pollcb_provider_kqueue = &impl_cb; +const apr_pollcb_provider_t *apr_pollcb_provider_kqueue = &impl_cb; #endif /* HAVE_KQUEUE */ diff -Nru apr-1.5.2/poll/unix/poll.c apr-1.6.5/poll/unix/poll.c --- apr-1.5.2/poll/unix/poll.c 2015-03-20 01:40:52.000000000 +0000 +++ apr-1.6.5/poll/unix/poll.c 2017-09-11 15:23:23.000000000 +0000 @@ -241,10 +241,11 @@ int ret; apr_status_t rv = APR_SUCCESS; + *num = 0; + #ifdef WIN32 /* WSAPoll() requires at least one socket. */ if (pollset->nelts == 0) { - *num = 0; if (timeout > 0) { apr_sleep(timeout); return APR_TIMEUP; @@ -261,7 +262,6 @@ } ret = poll(pollset->p->pollset, pollset->nelts, timeout); #endif - (*num) = ret; if (ret < 0) { return apr_get_netos_error(); } @@ -279,8 +279,8 @@ if ((pollset->flags & APR_POLLSET_WAKEABLE) && pollset->p->query_set[i].desc_type == APR_POLL_FILE && pollset->p->query_set[i].desc.f == pollset->wakeup_pipe[0]) { - apr_pollset_drain_wakeup_pipe(pollset); - rv = APR_EINTR; + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); + rv = APR_EINTR; } else { pollset->p->result_set[j] = pollset->p->query_set[i]; @@ -290,15 +290,16 @@ } } } - if (((*num) = j) > 0) + if ((*num = j)) { /* any event besides wakeup pipe? */ rv = APR_SUCCESS; + } } if (descriptors && (*num)) *descriptors = pollset->p->result_set; return rv; } -static apr_pollset_provider_t impl = { +static const apr_pollset_provider_t impl = { impl_pollset_create, impl_pollset_add, impl_pollset_remove, @@ -307,7 +308,7 @@ "poll" }; -apr_pollset_provider_t *apr_pollset_provider_poll = &impl; +const apr_pollset_provider_t *apr_pollset_provider_poll = &impl; /* Poll method pollcb. * This is probably usable only for WIN32 having WSAPoll @@ -426,6 +427,14 @@ for (i = 0; i < pollcb->nelts; i++) { if (pollcb->pollset.ps[i].revents != 0) { apr_pollfd_t *pollfd = pollcb->copyset[i]; + + if ((pollcb->flags & APR_POLLSET_WAKEABLE) && + pollfd->desc_type == APR_POLL_FILE && + pollfd->desc.f == pollcb->wakeup_pipe[0]) { + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); + return APR_EINTR; + } + pollfd->rtnevents = get_revent(pollcb->pollset.ps[i].revents); rv = func(baton, pollfd); if (rv) { @@ -437,14 +446,15 @@ return rv; } -static apr_pollcb_provider_t impl_cb = { +static const apr_pollcb_provider_t impl_cb = { impl_pollcb_create, impl_pollcb_add, impl_pollcb_remove, impl_pollcb_poll, + NULL, "poll" }; -apr_pollcb_provider_t *apr_pollcb_provider_poll = &impl_cb; +const apr_pollcb_provider_t *apr_pollcb_provider_poll = &impl_cb; #endif /* HAVE_POLL */ diff -Nru apr-1.5.2/poll/unix/pollcb.c apr-1.6.5/poll/unix/pollcb.c --- apr-1.5.2/poll/unix/pollcb.c 2015-03-20 01:34:07.000000000 +0000 +++ apr-1.6.5/poll/unix/pollcb.c 2017-09-11 15:23:23.000000000 +0000 @@ -29,21 +29,21 @@ static apr_pollset_method_e pollset_default_method = POLLSET_DEFAULT_METHOD; #if defined(HAVE_KQUEUE) -extern apr_pollcb_provider_t *apr_pollcb_provider_kqueue; +extern const apr_pollcb_provider_t *apr_pollcb_provider_kqueue; #endif #if defined(HAVE_PORT_CREATE) -extern apr_pollcb_provider_t *apr_pollcb_provider_port; +extern const apr_pollcb_provider_t *apr_pollcb_provider_port; #endif #if defined(HAVE_EPOLL) -extern apr_pollcb_provider_t *apr_pollcb_provider_epoll; +extern const apr_pollcb_provider_t *apr_pollcb_provider_epoll; #endif #if defined(HAVE_POLL) -extern apr_pollcb_provider_t *apr_pollcb_provider_poll; +extern const apr_pollcb_provider_t *apr_pollcb_provider_poll; #endif -static apr_pollcb_provider_t *pollcb_provider(apr_pollset_method_e method) +static const apr_pollcb_provider_t *pollcb_provider(apr_pollset_method_e method) { - apr_pollcb_provider_t *provider = NULL; + const apr_pollcb_provider_t *provider = NULL; switch (method) { case APR_POLLSET_KQUEUE: #if defined(HAVE_KQUEUE) @@ -73,6 +73,20 @@ return provider; } +static apr_status_t pollcb_cleanup(void *p) +{ + apr_pollcb_t *pollcb = (apr_pollcb_t *) p; + + if (pollcb->provider->cleanup) { + (*pollcb->provider->cleanup)(pollcb); + } + if (pollcb->flags & APR_POLLSET_WAKEABLE) { + apr_poll_close_wakeup_pipe(pollcb->wakeup_pipe); + } + + return APR_SUCCESS; +} + APR_DECLARE(apr_status_t) apr_pollcb_create_ex(apr_pollcb_t **ret_pollcb, apr_uint32_t size, apr_pool_t *p, @@ -81,7 +95,7 @@ { apr_status_t rv; apr_pollcb_t *pollcb; - apr_pollcb_provider_t *provider = NULL; + const apr_pollcb_provider_t *provider = NULL; *ret_pollcb = NULL; @@ -109,9 +123,15 @@ } } + if (flags & APR_POLLSET_WAKEABLE) { + /* Add room for wakeup descriptor */ + size++; + } + pollcb = apr_palloc(p, sizeof(*pollcb)); pollcb->nelts = 0; pollcb->nalloc = size; + pollcb->flags = flags; pollcb->pool = p; pollcb->provider = provider; @@ -140,6 +160,22 @@ return rv; } + if (flags & APR_POLLSET_WAKEABLE) { + /* Create wakeup pipe */ + if ((rv = apr_poll_create_wakeup_pipe(pollcb->pool, &pollcb->wakeup_pfd, + pollcb->wakeup_pipe)) + != APR_SUCCESS) { + return rv; + } + + if ((rv = apr_pollcb_add(pollcb, &pollcb->wakeup_pfd)) != APR_SUCCESS) { + return rv; + } + } + if ((flags & APR_POLLSET_WAKEABLE) || provider->cleanup) + apr_pool_cleanup_register(p, pollcb, pollcb_cleanup, + apr_pool_cleanup_null); + *ret_pollcb = pollcb; return APR_SUCCESS; } @@ -173,3 +209,16 @@ { return (*pollcb->provider->poll)(pollcb, timeout, func, baton); } + +APR_DECLARE(apr_status_t) apr_pollcb_wakeup(apr_pollcb_t *pollcb) +{ + if (pollcb->flags & APR_POLLSET_WAKEABLE) + return apr_file_putc(1, pollcb->wakeup_pipe[1]); + else + return APR_EINIT; +} + +APR_DECLARE(const char *) apr_pollcb_method_name(apr_pollcb_t *pollcb) +{ + return pollcb->provider->name; +} diff -Nru apr-1.5.2/poll/unix/pollset.c apr-1.6.5/poll/unix/pollset.c --- apr-1.5.2/poll/unix/pollset.c 2013-10-21 16:36:24.000000000 +0000 +++ apr-1.6.5/poll/unix/pollset.c 2017-09-11 15:23:23.000000000 +0000 @@ -30,101 +30,6 @@ static apr_pollset_method_e pollset_default_method = POLLSET_DEFAULT_METHOD; -#if !APR_FILES_AS_SOCKETS -#if defined (WIN32) - -/* Create a dummy wakeup socket pipe for interrupting the poller - */ -static apr_status_t create_wakeup_pipe(apr_pollset_t *pollset) -{ - apr_status_t rv; - - if ((rv = apr_file_socket_pipe_create(&pollset->wakeup_pipe[0], - &pollset->wakeup_pipe[1], - pollset->pool)) != APR_SUCCESS) - return rv; - - pollset->wakeup_pfd.p = pollset->pool; - pollset->wakeup_pfd.reqevents = APR_POLLIN; - pollset->wakeup_pfd.desc_type = APR_POLL_FILE; - pollset->wakeup_pfd.desc.f = pollset->wakeup_pipe[0]; - - return apr_pollset_add(pollset, &pollset->wakeup_pfd); -} - -#else /* !WIN32 */ -static apr_status_t create_wakeup_pipe(apr_pollset_t *pollset) -{ - return APR_ENOTIMPL; -} - -static apr_status_t apr_file_socket_pipe_close(apr_file_t *file) -{ - return APR_ENOTIMPL; -} - -#endif /* WIN32 */ -#else /* APR_FILES_AS_SOCKETS */ - -/* Create a dummy wakeup pipe for interrupting the poller - */ -static apr_status_t create_wakeup_pipe(apr_pollset_t *pollset) -{ - apr_status_t rv; - - if ((rv = apr_file_pipe_create(&pollset->wakeup_pipe[0], - &pollset->wakeup_pipe[1], - pollset->pool)) != APR_SUCCESS) - return rv; - - pollset->wakeup_pfd.p = pollset->pool; - pollset->wakeup_pfd.reqevents = APR_POLLIN; - pollset->wakeup_pfd.desc_type = APR_POLL_FILE; - pollset->wakeup_pfd.desc.f = pollset->wakeup_pipe[0]; - - { - int flags; - - if ((flags = fcntl(pollset->wakeup_pipe[0]->filedes, F_GETFD)) == -1) - return errno; - - flags |= FD_CLOEXEC; - if (fcntl(pollset->wakeup_pipe[0]->filedes, F_SETFD, flags) == -1) - return errno; - } - { - int flags; - - if ((flags = fcntl(pollset->wakeup_pipe[1]->filedes, F_GETFD)) == -1) - return errno; - - flags |= FD_CLOEXEC; - if (fcntl(pollset->wakeup_pipe[1]->filedes, F_SETFD, flags) == -1) - return errno; - } - - return apr_pollset_add(pollset, &pollset->wakeup_pfd); -} -#endif /* !APR_FILES_AS_SOCKETS */ - -/* Read and discard what's ever in the wakeup pipe. - */ -void apr_pollset_drain_wakeup_pipe(apr_pollset_t *pollset) -{ - char rb[512]; - apr_size_t nr = sizeof(rb); - - while (apr_file_read(pollset->wakeup_pipe[0], rb, &nr) == APR_SUCCESS) { - /* Although we write just one byte to the other end of the pipe - * during wakeup, multiple threads could call the wakeup. - * So simply drain out from the input side of the pipe all - * the data. - */ - if (nr != sizeof(rb)) - break; - } -} - static apr_status_t pollset_cleanup(void *p) { apr_pollset_t *pollset = (apr_pollset_t *) p; @@ -132,48 +37,32 @@ (*pollset->provider->cleanup)(pollset); } if (pollset->flags & APR_POLLSET_WAKEABLE) { - /* Close both sides of the wakeup pipe */ - if (pollset->wakeup_pipe[0]) { -#if APR_FILES_AS_SOCKETS - apr_file_close(pollset->wakeup_pipe[0]); -#else - apr_file_socket_pipe_close(pollset->wakeup_pipe[0]); -#endif - pollset->wakeup_pipe[0] = NULL; - } - if (pollset->wakeup_pipe[1]) { -#if APR_FILES_AS_SOCKETS - apr_file_close(pollset->wakeup_pipe[1]); -#else - apr_file_socket_pipe_close(pollset->wakeup_pipe[1]); -#endif - pollset->wakeup_pipe[1] = NULL; - } + apr_poll_close_wakeup_pipe(pollset->wakeup_pipe); } return APR_SUCCESS; } #if defined(HAVE_KQUEUE) -extern apr_pollset_provider_t *apr_pollset_provider_kqueue; +extern const apr_pollset_provider_t *apr_pollset_provider_kqueue; #endif #if defined(HAVE_PORT_CREATE) -extern apr_pollset_provider_t *apr_pollset_provider_port; +extern const apr_pollset_provider_t *apr_pollset_provider_port; #endif #if defined(HAVE_EPOLL) -extern apr_pollset_provider_t *apr_pollset_provider_epoll; +extern const apr_pollset_provider_t *apr_pollset_provider_epoll; #endif #if defined(HAVE_AIO_MSGQ) -extern apr_pollset_provider_t *apr_pollset_provider_aio_msgq; +extern const apr_pollset_provider_t *apr_pollset_provider_aio_msgq; #endif #if defined(HAVE_POLL) -extern apr_pollset_provider_t *apr_pollset_provider_poll; +extern const apr_pollset_provider_t *apr_pollset_provider_poll; #endif -extern apr_pollset_provider_t *apr_pollset_provider_select; +extern const apr_pollset_provider_t *apr_pollset_provider_select; -static apr_pollset_provider_t *pollset_provider(apr_pollset_method_e method) +static const apr_pollset_provider_t *pollset_provider(apr_pollset_method_e method) { - apr_pollset_provider_t *provider = NULL; + const apr_pollset_provider_t *provider = NULL; switch (method) { case APR_POLLSET_KQUEUE: #if defined(HAVE_KQUEUE) @@ -217,7 +106,7 @@ { apr_status_t rv; apr_pollset_t *pollset; - apr_pollset_provider_t *provider = NULL; + const apr_pollset_provider_t *provider = NULL; *ret_pollset = NULL; @@ -276,7 +165,13 @@ } if (flags & APR_POLLSET_WAKEABLE) { /* Create wakeup pipe */ - if ((rv = create_wakeup_pipe(pollset)) != APR_SUCCESS) { + if ((rv = apr_poll_create_wakeup_pipe(pollset->pool, &pollset->wakeup_pfd, + pollset->wakeup_pipe)) + != APR_SUCCESS) { + return rv; + } + + if ((rv = apr_pollset_add(pollset, &pollset->wakeup_pfd)) != APR_SUCCESS) { return rv; } } @@ -295,7 +190,7 @@ APR_DECLARE(const char *) apr_poll_method_defname() { - apr_pollset_provider_t *provider = NULL; + const apr_pollset_provider_t *provider = NULL; provider = pollset_provider(pollset_default_method); if (provider) diff -Nru apr-1.5.2/poll/unix/port.c apr-1.6.5/poll/unix/port.c --- apr-1.5.2/poll/unix/port.c 2015-03-20 01:34:07.000000000 +0000 +++ apr-1.6.5/poll/unix/port.c 2018-08-24 21:13:34.000000000 +0000 @@ -354,12 +354,13 @@ const apr_pollfd_t **descriptors) { apr_os_sock_t fd; - int ret, i, j; - unsigned int nget; + int ret; + unsigned int nget, i; + apr_int32_t nres = 0; pfd_elem_t *ep; apr_status_t rv = APR_SUCCESS; - apr_pollfd_t fp; + *num = 0; nget = 1; pollset_lock_rings(); @@ -403,50 +404,42 @@ port_associate within apr_pollset_add() */ apr_atomic_dec32(&pollset->p->waiting); - (*num) = nget; - if (nget) { - - pollset_lock_rings(); + pollset_lock_rings(); - for (i = 0, j = 0; i < nget; i++) { - fp = (((pfd_elem_t*)(pollset->p->port_set[i].portev_user))->pfd); - if ((pollset->flags & APR_POLLSET_WAKEABLE) && - fp.desc_type == APR_POLL_FILE && - fp.desc.f == pollset->wakeup_pipe[0]) { - apr_pollset_drain_wakeup_pipe(pollset); - rv = APR_EINTR; - } - else { - pollset->p->result_set[j] = fp; - pollset->p->result_set[j].rtnevents = - get_revent(pollset->p->port_set[i].portev_events); - - /* If the ring element is still on the query ring, move it - * to the add ring for re-association with the event port - * later. (It may have already been moved to the dead ring - * by a call to pollset_remove on another thread.) - */ - ep = (pfd_elem_t *)pollset->p->port_set[i].portev_user; - if (ep->on_query_ring) { - APR_RING_REMOVE(ep, link); - ep->on_query_ring = 0; - APR_RING_INSERT_TAIL(&(pollset->p->add_ring), ep, - pfd_elem_t, link); - } - j++; - } + for (i = 0; i < nget; i++) { + ep = (pfd_elem_t *)pollset->p->port_set[i].portev_user; + if ((pollset->flags & APR_POLLSET_WAKEABLE) && + ep->pfd.desc_type == APR_POLL_FILE && + ep->pfd.desc.f == pollset->wakeup_pipe[0]) { + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); + rv = APR_EINTR; } - pollset_unlock_rings(); - if ((*num = j)) { /* any event besides wakeup pipe? */ - rv = APR_SUCCESS; - if (descriptors) { - *descriptors = pollset->p->result_set; - } + else { + pollset->p->result_set[nres] = ep->pfd; + pollset->p->result_set[nres].rtnevents = + get_revent(pollset->p->port_set[i].portev_events); + ++nres; + } + /* If the ring element is still on the query ring, move it + * to the add ring for re-association with the event port + * later. (It may have already been moved to the dead ring + * by a call to pollset_remove on another thread.) + */ + if (ep->on_query_ring) { + APR_RING_REMOVE(ep, link); + ep->on_query_ring = 0; + APR_RING_INSERT_TAIL(&(pollset->p->add_ring), ep, + pfd_elem_t, link); + } + } + if (nres > 0) { /* any event besides wakeup pipe? */ + *num = nres; + rv = APR_SUCCESS; + if (descriptors) { + *descriptors = pollset->p->result_set; } } - pollset_lock_rings(); - /* Shift all PFDs in the Dead Ring to the Free Ring */ APR_RING_CONCAT(&(pollset->p->free_ring), &(pollset->p->dead_ring), pfd_elem_t, link); @@ -455,7 +448,7 @@ return rv; } -static apr_pollset_provider_t impl = { +static const apr_pollset_provider_t impl = { impl_pollset_create, impl_pollset_add, impl_pollset_remove, @@ -464,11 +457,10 @@ "port" }; -apr_pollset_provider_t *apr_pollset_provider_port = &impl; +const apr_pollset_provider_t *apr_pollset_provider_port = &impl; -static apr_status_t cb_cleanup(void *p_) +static apr_status_t impl_pollcb_cleanup(apr_pollcb_t *pollcb) { - apr_pollcb_t *pollcb = (apr_pollcb_t *) p_; close(pollcb->fd); return APR_SUCCESS; } @@ -505,7 +497,6 @@ } pollcb->pollset.port = apr_palloc(p, size * sizeof(port_event_t)); - apr_pool_cleanup_register(p, pollcb, cb_cleanup, apr_pool_cleanup_null); return APR_SUCCESS; } @@ -558,16 +549,25 @@ apr_pollcb_cb_t func, void *baton) { - apr_pollfd_t *pollfd; apr_status_t rv; - unsigned int i, nget = 1; + unsigned int nget = 1; rv = call_port_getn(pollcb->fd, pollcb->pollset.port, pollcb->nalloc, &nget, timeout); if (nget) { + unsigned int i; + for (i = 0; i < nget; i++) { - pollfd = (apr_pollfd_t *)(pollcb->pollset.port[i].portev_user); + apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.port[i].portev_user); + + if ((pollcb->flags & APR_POLLSET_WAKEABLE) && + pollfd->desc_type == APR_POLL_FILE && + pollfd->desc.f == pollcb->wakeup_pipe[0]) { + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); + return APR_EINTR; + } + pollfd->rtnevents = get_revent(pollcb->pollset.port[i].portev_events); rv = func(baton, pollfd); @@ -581,14 +581,15 @@ return rv; } -static apr_pollcb_provider_t impl_cb = { +static const apr_pollcb_provider_t impl_cb = { impl_pollcb_create, impl_pollcb_add, impl_pollcb_remove, impl_pollcb_poll, + impl_pollcb_cleanup, "port" }; -apr_pollcb_provider_t *apr_pollcb_provider_port = &impl_cb; +const apr_pollcb_provider_t *apr_pollcb_provider_port = &impl_cb; #endif /* HAVE_PORT_CREATE */ diff -Nru apr-1.5.2/poll/unix/select.c apr-1.6.5/poll/unix/select.c --- apr-1.5.2/poll/unix/select.c 2011-04-29 12:12:55.000000000 +0000 +++ apr-1.6.5/poll/unix/select.c 2017-09-11 15:23:23.000000000 +0000 @@ -347,13 +347,14 @@ fd_set readset, writeset, exceptset; apr_status_t rv = APR_SUCCESS; + *num = 0; + #ifdef WIN32 /* On Win32, select() must be presented with at least one socket to * poll on, or select() will return WSAEINVAL. So, we'll just * short-circuit and bail now. */ if (pollset->nelts == 0) { - (*num) = 0; if (timeout > 0) { apr_sleep(timeout); return APR_TIMEUP; @@ -385,7 +386,6 @@ rs = select(pollset->p->maxfd + 1, &readset, &writeset, &exceptset, tvptr); - (*num) = rs; if (rs < 0) { return apr_get_netos_error(); } @@ -401,7 +401,7 @@ else { if ((pollset->flags & APR_POLLSET_WAKEABLE) && pollset->p->query_set[i].desc.f == pollset->wakeup_pipe[0]) { - apr_pollset_drain_wakeup_pipe(pollset); + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); rv = APR_EINTR; continue; } @@ -437,7 +437,7 @@ return rv; } -static apr_pollset_provider_t impl = { +static const apr_pollset_provider_t impl = { impl_pollset_create, impl_pollset_add, impl_pollset_remove, @@ -446,4 +446,4 @@ "select" }; -apr_pollset_provider_t *apr_pollset_provider_select = &impl; +const apr_pollset_provider_t *apr_pollset_provider_select = &impl; diff -Nru apr-1.5.2/poll/unix/wakeup.c apr-1.6.5/poll/unix/wakeup.c --- apr-1.5.2/poll/unix/wakeup.c 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/poll/unix/wakeup.c 2016-12-03 20:49:29.000000000 +0000 @@ -0,0 +1,151 @@ +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "apr.h" +#include "apr_poll.h" +#include "apr_time.h" +#include "apr_portable.h" +#include "apr_arch_file_io.h" +#include "apr_arch_networkio.h" +#include "apr_arch_poll_private.h" +#include "apr_arch_inherit.h" + +#if !APR_FILES_AS_SOCKETS + +#ifdef WIN32 + +apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, + apr_file_t **wakeup_pipe) +{ + apr_status_t rv; + + if ((rv = apr_file_socket_pipe_create(&wakeup_pipe[0], &wakeup_pipe[1], + pool)) != APR_SUCCESS) + return rv; + + pfd->reqevents = APR_POLLIN; + pfd->desc_type = APR_POLL_FILE; + pfd->desc.f = wakeup_pipe[0]; + return APR_SUCCESS; +} + +apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe) +{ + apr_status_t rv0 = APR_SUCCESS; + apr_status_t rv1 = APR_SUCCESS; + + /* Close both sides of the wakeup pipe */ + if (wakeup_pipe[0]) { + rv0 = apr_file_socket_pipe_close(wakeup_pipe[0]); + wakeup_pipe[0] = NULL; + } + if (wakeup_pipe[1]) { + rv1 = apr_file_socket_pipe_close(wakeup_pipe[1]); + wakeup_pipe[1] = NULL; + } + return rv0 ? rv0 : rv1; +} + +#else /* !WIN32 */ + +apr_status_t apr_poll_create_wakeup_pipe(apr_pollfd_t *pfd, apr_file_t **wakeup_pipe) +{ + return APR_ENOTIMPL; +} + +apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe) +{ + return APR_ENOTIMPL; +} + +#endif /* !WIN32 */ + +#else /* APR_FILES_AS_SOCKETS */ + +apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, + apr_file_t **wakeup_pipe) +{ + apr_status_t rv; + + if ((rv = apr_file_pipe_create(&wakeup_pipe[0], &wakeup_pipe[1], + pool)) != APR_SUCCESS) + return rv; + + pfd->p = pool; + pfd->reqevents = APR_POLLIN; + pfd->desc_type = APR_POLL_FILE; + pfd->desc.f = wakeup_pipe[0]; + + { + int flags; + + if ((flags = fcntl(wakeup_pipe[0]->filedes, F_GETFD)) == -1) + return errno; + + flags |= FD_CLOEXEC; + if (fcntl(wakeup_pipe[0]->filedes, F_SETFD, flags) == -1) + return errno; + } + { + int flags; + + if ((flags = fcntl(wakeup_pipe[1]->filedes, F_GETFD)) == -1) + return errno; + + flags |= FD_CLOEXEC; + if (fcntl(wakeup_pipe[1]->filedes, F_SETFD, flags) == -1) + return errno; + } + + return APR_SUCCESS; +} + +apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe) +{ + apr_status_t rv0 = APR_SUCCESS; + apr_status_t rv1 = APR_SUCCESS; + + /* Close both sides of the wakeup pipe */ + if (wakeup_pipe[0]) { + rv0 = apr_file_close(wakeup_pipe[0]); + wakeup_pipe[0] = NULL; + } + if (wakeup_pipe[1]) { + rv1 = apr_file_close(wakeup_pipe[1]); + wakeup_pipe[1] = NULL; + } + return rv0 ? rv0 : rv1; +} + +#endif /* APR_FILES_AS_SOCKETS */ + +/* Read and discard whatever is in the wakeup pipe. + */ +void apr_poll_drain_wakeup_pipe(apr_file_t **wakeup_pipe) +{ + char rb[512]; + apr_size_t nr = sizeof(rb); + + while (apr_file_read(wakeup_pipe[0], rb, &nr) == APR_SUCCESS) { + /* Although we write just one byte to the other end of the pipe + * during wakeup, multiple threads could call the wakeup. + * So simply drain out from the input side of the pipe all + * the data. + */ + if (nr != sizeof(rb)) + break; + } +} diff -Nru apr-1.5.2/poll/unix/z_asio.c apr-1.6.5/poll/unix/z_asio.c --- apr-1.5.2/poll/unix/z_asio.c 2015-03-20 01:34:07.000000000 +0000 +++ apr-1.6.5/poll/unix/z_asio.c 2017-09-11 15:23:23.000000000 +0000 @@ -247,9 +247,11 @@ int rv; DBG(4, "entered\n"); - rv = msgctl(pollset->p->msg_q, IPC_RMID, NULL); + if (pollset->flags & APR_POLLSET_THREADSAFE) { + rv = msgctl(pollset->p->msg_q, IPC_RMID, NULL); + DBG1(4, "asio_pollset_cleanup: msgctl(IPC_RMID) returned %d\n", rv); + } - DBG1(4, "exiting, msgctl(IPC_RMID) returned %d\n", rv); return rv; } @@ -264,13 +266,13 @@ DBG1(2, "entered, flags: %x\n", flags); - priv = pollset->p = apr_palloc(p, sizeof(*priv)); + priv = pollset->p = apr_pcalloc(p, sizeof(*priv)); if (flags & APR_POLLSET_THREADSAFE) { #if APR_HAS_THREADS - if (rv = apr_thread_mutex_create(&(priv->ring_lock), + if ((rv = apr_thread_mutex_create(&(priv->ring_lock), APR_THREAD_MUTEX_DEFAULT, - p) != APR_SUCCESS) { + p)) != APR_SUCCESS) { DBG1(1, "apr_thread_mutex_create returned %d\n", rv); pollset->p = NULL; return rv; @@ -481,7 +483,8 @@ asio_elem_t *elem; apr_status_t rv = APR_SUCCESS; apr_pollset_private_t *priv = pollset->p; - struct aiocb cancel_a; /* AIO_CANCEL is synchronous, so autodata works fine */ + /* AIO_CANCEL is synchronous, so autodata works fine. */ + struct aiocb cancel_a = {0}; int fd; @@ -765,7 +768,7 @@ return rv; } /* end of asio_pollset_poll */ -static apr_pollset_provider_t impl = { +static const apr_pollset_provider_t impl = { asio_pollset_create, asio_pollset_add, asio_pollset_remove, @@ -774,6 +777,6 @@ "asio" }; -apr_pollset_provider_t *apr_pollset_provider_aio_msgq = &impl; +const apr_pollset_provider_t *apr_pollset_provider_aio_msgq = &impl; #endif /* HAVE_AIO_MSGQ */ diff -Nru apr-1.5.2/shmem/beos/shm.c apr-1.6.5/shmem/beos/shm.c --- apr-1.5.2/shmem/beos/shm.c 2013-10-20 23:40:35.000000000 +0000 +++ apr-1.6.5/shmem/beos/shm.c 2014-04-28 13:15:03.000000000 +0000 @@ -100,6 +100,16 @@ return APR_SUCCESS; } +APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m) +{ + if (m->filename) { + return apr_shm_remove(m->filename, m->pool); + } + else { + return APR_ENOTIMPL; + } +} + APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m, const char *filename, apr_pool_t *pool) @@ -166,6 +176,8 @@ return m->reqsize; } +APR_PERMS_SET_ENOTIMPL(shm) + APR_POOL_IMPLEMENT_ACCESSOR(shm) APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm, diff -Nru apr-1.5.2/shmem/os2/shm.c apr-1.6.5/shmem/os2/shm.c --- apr-1.5.2/shmem/os2/shm.c 2013-10-20 23:40:35.000000000 +0000 +++ apr-1.6.5/shmem/os2/shm.c 2014-04-28 13:15:03.000000000 +0000 @@ -77,6 +77,11 @@ return APR_ENOTIMPL; } +APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m) +{ + return APR_ENOTIMPL; +} + APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m, const char *filename, apr_pool_t *pool) @@ -130,6 +135,8 @@ return size; } +APR_PERMS_SET_ENOTIMPL(shm) + APR_POOL_IMPLEMENT_ACCESSOR(shm) APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm, diff -Nru apr-1.5.2/shmem/unix/shm.c apr-1.6.5/shmem/unix/shm.c --- apr-1.5.2/shmem/unix/shm.c 2014-01-26 22:04:09.000000000 +0000 +++ apr-1.6.5/shmem/unix/shm.c 2014-05-14 20:25:41.000000000 +0000 @@ -15,6 +15,7 @@ */ #include "apr_arch_shm.h" +#include "apr_arch_file_io.h" #include "apr_general.h" #include "apr_errno.h" @@ -158,7 +159,6 @@ #endif #if APR_USE_SHMEM_SHMGET apr_size_t nbytes; - key_t shmkey; #endif #if APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_SHMGET || \ APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM @@ -231,8 +231,8 @@ new_m->reqsize = reqsize; new_m->realsize = reqsize; new_m->filename = NULL; - - if ((new_m->shmid = shmget(IPC_PRIVATE, new_m->realsize, + new_m->shmkey = IPC_PRIVATE; + if ((new_m->shmid = shmget(new_m->shmkey, new_m->realsize, SHM_R | SHM_W | IPC_CREAT)) < 0) { return errno; } @@ -371,13 +371,13 @@ /* ftok() (on solaris at least) requires that the file actually * exist before calling ftok(). */ - shmkey = our_ftok(filename); - if (shmkey == (key_t)-1) { + new_m->shmkey = our_ftok(filename); + if (new_m->shmkey == (key_t)-1) { apr_file_close(file); return errno; } - if ((new_m->shmid = shmget(shmkey, new_m->realsize, + if ((new_m->shmid = shmget(new_m->shmkey, new_m->realsize, SHM_R | SHM_W | IPC_CREAT | IPC_EXCL)) < 0) { apr_file_close(file); return errno; @@ -492,6 +492,16 @@ #endif } +APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m) +{ + if (m->filename) { + return apr_shm_remove(m->filename, m->pool); + } + else { + return APR_ENOTIMPL; + } +} + APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m) { return apr_pool_cleanup_run(m->pool, m, shm_cleanup_owner); @@ -611,7 +621,6 @@ apr_status_t status; apr_file_t *file; /* file where metadata is stored */ apr_size_t nbytes; - key_t shmkey; new_m = apr_palloc(pool, sizeof(apr_shm_t)); @@ -634,11 +643,11 @@ new_m->filename = apr_pstrdup(pool, filename); new_m->pool = pool; - shmkey = our_ftok(filename); - if (shmkey == (key_t)-1) { + new_m->shmkey = our_ftok(filename); + if (new_m->shmkey == (key_t)-1) { return errno; } - if ((new_m->shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) { + if ((new_m->shmid = shmget(new_m->shmkey, 0, SHM_R | SHM_W)) == -1) { return errno; } if ((new_m->base = shmat(new_m->shmid, NULL, 0)) == (void *)-1) { @@ -683,6 +692,28 @@ return m->reqsize; } +APR_PERMS_SET_IMPLEMENT(shm) +{ +#if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON + struct shmid_ds shmbuf; + int shmid; + apr_shm_t *m = (apr_shm_t *)theshm; + + if ((shmid = shmget(m->shmkey, 0, SHM_R | SHM_W)) == -1) { + return errno; + } + shmbuf.shm_perm.uid = uid; + shmbuf.shm_perm.gid = gid; + shmbuf.shm_perm.mode = apr_unix_perms2mode(perms); + if (shmctl(shmid, IPC_SET, &shmbuf) == -1) { + return errno; + } + return APR_SUCCESS; +#else + return APR_ENOTIMPL; +#endif +} + APR_POOL_IMPLEMENT_ACCESSOR(shm) APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm, diff -Nru apr-1.5.2/shmem/win32/shm.c apr-1.6.5/shmem/win32/shm.c --- apr-1.5.2/shmem/win32/shm.c 2013-10-20 23:40:35.000000000 +0000 +++ apr-1.6.5/shmem/win32/shm.c 2014-04-28 13:15:03.000000000 +0000 @@ -261,6 +261,16 @@ return apr_file_remove(filename, pool); } +APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m) +{ + if (m->filename) { + return apr_shm_remove(m->filename, m->pool); + } + else { + return APR_ENOTIMPL; + } +} + static apr_status_t shm_attach_internal(apr_shm_t **m, const char *file, apr_pool_t *pool, @@ -404,6 +414,8 @@ return m->length; } +APR_PERMS_SET_ENOTIMPL(shm) + APR_POOL_IMPLEMENT_ACCESSOR(shm) APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm, diff -Nru apr-1.5.2/strings/apr_cpystrn.c apr-1.6.5/strings/apr_cpystrn.c --- apr-1.5.2/strings/apr_cpystrn.c 2013-10-17 15:23:26.000000000 +0000 +++ apr-1.6.5/strings/apr_cpystrn.c 2014-05-10 10:28:48.000000000 +0000 @@ -235,6 +235,8 @@ size_t len = strlen(str) + 1; sdup = (char *) malloc(len); + if (sdup == NULL) + return NULL; memcpy(sdup, str, len); return sdup; diff -Nru apr-1.5.2/strings/apr_cstr.c apr-1.6.5/strings/apr_cstr.c --- apr-1.5.2/strings/apr_cstr.c 1970-01-01 00:00:00.000000000 +0000 +++ apr-1.6.5/strings/apr_cstr.c 2016-12-03 20:49:29.000000000 +0000 @@ -0,0 +1,403 @@ +/* Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#include "apr.h" +#include "apr_lib.h" +#include "apr_strings.h" +#include "apr_fnmatch.h" +#if 0 +#define APR_WANT_STDIO +#define APR_WANT_STRFUNC +#endif +#include "apr_want.h" +#include "apr_cstr.h" + +APR_DECLARE(void) apr_cstr_split_append(apr_array_header_t *array, + const char *input, + const char *sep_chars, + int chop_whitespace, + apr_pool_t *pool) +{ + char *pats; + char *p; + + pats = apr_pstrdup(pool, input); /* strtok wants non-const data */ + p = apr_cstr_tokenize(sep_chars, &pats); + + while (p) + { + if (chop_whitespace) + { + while (apr_isspace(*p)) + p++; + + { + char *e = p + (strlen(p) - 1); + while ((e >= p) && (apr_isspace(*e))) + e--; + *(++e) = '\0'; + } + } + + if (p[0] != '\0') + APR_ARRAY_PUSH(array, const char *) = p; + + p = apr_cstr_tokenize(sep_chars, &pats); + } + + return; +} + + +APR_DECLARE(apr_array_header_t *) apr_cstr_split(const char *input, + const char *sep_chars, + int chop_whitespace, + apr_pool_t *pool) +{ + apr_array_header_t *a = apr_array_make(pool, 5, sizeof(input)); + apr_cstr_split_append(a, input, sep_chars, chop_whitespace, pool); + return a; +} + + +APR_DECLARE(int) apr_cstr_match_glob_list(const char *str, + const apr_array_header_t *list) +{ + int i; + + for (i = 0; i < list->nelts; i++) + { + const char *this_pattern = APR_ARRAY_IDX(list, i, char *); + + if (apr_fnmatch(this_pattern, str, 0) == APR_SUCCESS) + return TRUE; + } + + return FALSE; +} + +APR_DECLARE(int) apr_cstr_match_list(const char *str, + const apr_array_header_t *list) +{ + int i; + + for (i = 0; i < list->nelts; i++) + { + const char *this_str = APR_ARRAY_IDX(list, i, char *); + + if (strcmp(this_str, str) == 0) + return TRUE; + } + + return FALSE; +} + +APR_DECLARE(char *) apr_cstr_tokenize(const char *sep, char **str) +{ + char *token; + char *next; + char csep; + + /* check parameters */ + if ((sep == NULL) || (str == NULL) || (*str == NULL)) + return NULL; + + /* let APR handle edge cases and multiple separators */ + csep = *sep; + if (csep == '\0' || sep[1] != '\0') + return apr_strtok(NULL, sep, str); + + /* skip characters in sep (will terminate at '\0') */ + token = *str; + while (*token == csep) + ++token; + + if (!*token) /* no more tokens */ + return NULL; + + /* skip valid token characters to terminate token and + * prepare for the next call (will terminate at '\0) + */ + next = strchr(token, csep); + if (next == NULL) + { + *str = token + strlen(token); + } + else + { + *next = '\0'; + *str = next + 1; + } + + return token; +} + +APR_DECLARE(int) apr_cstr_count_newlines(const char *msg) +{ + int count = 0; + const char *p; + + for (p = msg; *p; p++) + { + if (*p == '\n') + { + count++; + if (*(p + 1) == '\r') + p++; + } + else if (*p == '\r') + { + count++; + if (*(p + 1) == '\n') + p++; + } + } + + return count; +} + +#if 0 /* XXX: stringbuf logic is not present in APR */ +APR_DECLARE(char *) apr_cstr_join(const apr_array_header_t *strings, + const char *separator, + apr_pool_t *pool) +{ + svn_stringbuf_t *new_str = svn_stringbuf_create_empty(pool); + size_t sep_len = strlen(separator); + int i; + + for (i = 0; i < strings->nelts; i++) + { + const char *string = APR_ARRAY_IDX(strings, i, const char *); + svn_stringbuf_appendbytes(new_str, string, strlen(string)); + svn_stringbuf_appendbytes(new_str, separator, sep_len); + } + return new_str->data; +} +#endif + +#if !APR_CHARSET_EBCDIC +/* + * Our own known-fast translation table for casecmp by character. + * Only ASCII alpha characters 41-5A are folded to 61-7A, other + * octets (such as extended latin alphabetics) are never case-folded. + * NOTE: Other than Alpha A-Z/a-z, each code point is unique! + */ +static const short ucharmap[] = { + 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, + 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 'a', 'b', 'c', 'd', 'e', 'f', 'g', + 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', + 'x', 'y', 'z', 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + 0x60, 'a', 'b', 'c', 'd', 'e', 'f', 'g', + 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', + 'x', 'y', 'z', 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, + 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, + 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, + 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, + 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, + 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, + 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff +}; +#else /* APR_CHARSET_EBCDIC */ +/* + * Derived from apr-iconv/ccs/cp037.c for EBCDIC case comparison, + * provides unique identity of every char value (strict ISO-646 + * conformance, arbitrary election of an ISO-8859-1 ordering, and + * very arbitrary control code assignments into C1 to achieve + * identity and a reversible mapping of code points), + * then folding the equivalences of ASCII 41-5A into 61-7A, + * presenting comparison results in a somewhat ISO/IEC 10646 + * (ASCII-like) order, depending on the EBCDIC code page in use. + * + * NOTE: Other than Alpha A-Z/a-z, each code point is unique! + */ +static const short ucharmap[] = { + 0x00, 0x01, 0x02, 0x03, 0x9C, 0x09, 0x86, 0x7F, + 0x97, 0x8D, 0x8E, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x9D, 0x85, 0x08, 0x87, + 0x18, 0x19, 0x92, 0x8F, 0x1C, 0x1D, 0x1E, 0x1F, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x0A, 0x17, 0x1B, + 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x05, 0x06, 0x07, + 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, + 0x98, 0x99, 0x9A, 0x9B, 0x14, 0x15, 0x9E, 0x1A, + 0x20, 0xA0, 0xE2, 0xE4, 0xE0, 0xE1, 0xE3, 0xE5, + 0xE7, 0xF1, 0xA2, 0x2E, 0x3C, 0x28, 0x2B, 0x7C, + 0x26, 0xE9, 0xEA, 0xEB, 0xE8, 0xED, 0xEE, 0xEF, + 0xEC, 0xDF, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0xAC, + 0x2D, 0x2F, 0xC2, 0xC4, 0xC0, 0xC1, 0xC3, 0xC5, + 0xC7, 0xD1, 0xA6, 0x2C, 0x25, 0x5F, 0x3E, 0x3F, + 0xF8, 0xC9, 0xCA, 0xCB, 0xC8, 0xCD, 0xCE, 0xCF, + 0xCC, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22, + 0xD8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0xAB, 0xBB, 0xF0, 0xFD, 0xFE, 0xB1, + 0xB0, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, + 0x71, 0x72, 0xAA, 0xBA, 0xE6, 0xB8, 0xC6, 0xA4, + 0xB5, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, + 0x79, 0x7A, 0xA1, 0xBF, 0xD0, 0xDD, 0xDE, 0xAE, + 0x5E, 0xA3, 0xA5, 0xB7, 0xA9, 0xA7, 0xB6, 0xBC, + 0xBD, 0xBE, 0x5B, 0x5D, 0xAF, 0xA8, 0xB4, 0xD7, + 0x7B, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0xAD, 0xF4, 0xF6, 0xF2, 0xF3, 0xF5, + 0x7D, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, + 0x71, 0x72, 0xB9, 0xFB, 0xFC, 0xF9, 0xFA, 0xFF, + 0x5C, 0xF7, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, + 0x79, 0x7A, 0xB2, 0xD4, 0xD6, 0xD2, 0xD3, 0xD5, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0xB3, 0xDB, 0xDC, 0xD9, 0xDA, 0x9F +}; +#endif + +APR_DECLARE(int) apr_cstr_casecmp(const char *s1, const char *s2) +{ + const unsigned char *str1 = (const unsigned char *)s1; + const unsigned char *str2 = (const unsigned char *)s2; + for (;;) + { + const int c1 = (int)(*str1); + const int c2 = (int)(*str2); + const int cmp = ucharmap[c1] - ucharmap[c2]; + /* Not necessary to test for !c2, this is caught by cmp */ + if (cmp || !c1) + return cmp; + str1++; + str2++; + } +} + +APR_DECLARE(int) apr_cstr_casecmpn(const char *s1, const char *s2, apr_size_t n) +{ + const unsigned char *str1 = (const unsigned char *)s1; + const unsigned char *str2 = (const unsigned char *)s2; + while (n--) + { + const int c1 = (int)(*str1); + const int c2 = (int)(*str2); + const int cmp = ucharmap[c1] - ucharmap[c2]; + /* Not necessary to test for !c2, this is caught by cmp */ + if (cmp || !c1) + return cmp; + str1++; + str2++; + } + return 0; +} + +APR_DECLARE(apr_status_t) apr_cstr_strtoui64(apr_uint64_t *n, const char *str, + apr_uint64_t minval, apr_uint64_t maxval, + int base) +{ + apr_int64_t val; + char *endptr; + + /* We assume errno is thread-safe. */ + errno = 0; /* APR-0.9 doesn't always set errno */ + + /* ### We're throwing away half the number range here. + * ### APR needs a apr_strtoui64() function. */ + val = apr_strtoi64(str, &endptr, base); + if (errno == EINVAL || endptr == str || str[0] == '\0' || *endptr != '\0') + return APR_EINVAL; + if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) || + val < 0 || (apr_uint64_t)val < minval || (apr_uint64_t)val > maxval) + return APR_ERANGE; + *n = val; + return APR_SUCCESS; +} + +APR_DECLARE(apr_status_t) apr_cstr_atoui64(apr_uint64_t *n, const char *str) +{ + return apr_cstr_strtoui64(n, str, 0, APR_UINT64_MAX, 10); +} + +APR_DECLARE(apr_status_t) apr_cstr_atoui(unsigned int *n, const char *str) +{ + apr_uint64_t val; + apr_status_t rv = apr_cstr_strtoui64(&val, str, 0, APR_UINT32_MAX, 10); + if (rv == APR_SUCCESS) + *n = (unsigned int)val; + return rv; +} + +APR_DECLARE(apr_status_t) apr_cstr_strtoi64(apr_int64_t *n, const char *str, + apr_int64_t minval, apr_int64_t maxval, + int base) +{ + apr_int64_t val; + char *endptr; + + /* We assume errno is thread-safe. */ + errno = 0; /* APR-0.9 doesn't always set errno */ + + val = apr_strtoi64(str, &endptr, base); + if (errno == EINVAL || endptr == str || str[0] == '\0' || *endptr != '\0') + return APR_EINVAL; + if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) || + val < minval || val > maxval) + return APR_ERANGE; + *n = val; + return APR_SUCCESS; +} + +APR_DECLARE(apr_status_t) apr_cstr_atoi64(apr_int64_t *n, const char *str) +{ + return apr_cstr_strtoi64(n, str, APR_INT64_MIN, APR_INT64_MAX, 10); +} + +APR_DECLARE(apr_status_t) apr_cstr_atoi(int *n, const char *str) +{ + apr_int64_t val; + apr_status_t rv; + + rv = apr_cstr_strtoi64(&val, str, APR_INT32_MIN, APR_INT32_MAX, 10); + if (rv == APR_SUCCESS) + *n = (int)val; + return rv; +} + +APR_DECLARE(const char *) apr_cstr_skip_prefix(const char *str, + const char *prefix) +{ + apr_size_t len = strlen(prefix); + + if (strncmp(str, prefix, len) == 0) + { + return str + len; + } + else + { + return NULL; + } +} diff -Nru apr-1.5.2/strings/apr_fnmatch.c apr-1.6.5/strings/apr_fnmatch.c --- apr-1.5.2/strings/apr_fnmatch.c 2011-05-19 17:06:18.000000000 +0000 +++ apr-1.6.5/strings/apr_fnmatch.c 2015-10-24 05:45:35.000000000 +0000 @@ -462,7 +462,7 @@ path = "."; } else { - path = apr_pstrndup(p, pattern, idx - pattern); + path = apr_pstrmemdup(p, pattern, idx - pattern); pattern = idx + 1; } diff -Nru apr-1.5.2/strings/apr_snprintf.c apr-1.6.5/strings/apr_snprintf.c --- apr-1.5.2/strings/apr_snprintf.c 2011-07-29 17:30:07.000000000 +0000 +++ apr-1.6.5/strings/apr_snprintf.c 2015-06-03 04:24:40.000000000 +0000 @@ -1328,7 +1328,7 @@ */ if (print_something == YES) { for (i = s_len; i != 0; i--) { - INS_CHAR(*s, sp, bep, cc); + INS_CHAR(*s, sp, bep, cc); s++; } } diff -Nru apr-1.5.2/tables/apr_skiplist.c apr-1.6.5/tables/apr_skiplist.c --- apr-1.5.2/tables/apr_skiplist.c 2015-04-10 07:55:39.000000000 +0000 +++ apr-1.6.5/tables/apr_skiplist.c 2015-04-10 07:54:20.000000000 +0000 @@ -200,7 +200,7 @@ return m; } -static apr_status_t skiplist_free_node(apr_skiplist *sl, apr_skiplistnode *m) +static apr_status_t skiplist_put_node(apr_skiplist *sl, apr_skiplistnode *m) { return skiplist_qpush(&sl->nodes_q, m); } @@ -298,39 +298,45 @@ } static int skiplisti_find_compare(apr_skiplist *sl, void *data, - apr_skiplistnode **ret, - apr_skiplist_compare comp) + apr_skiplistnode **ret, + apr_skiplist_compare comp, + int last) { int count = 0; - apr_skiplistnode *m; - m = sl->top; - while (m) { + apr_skiplistnode *m, *found = NULL; + for (m = sl->top; m; count++) { if (m->next) { int compared = comp(data, m->next->data); if (compared == 0) { - m = m->next; - while (m->down) { - m = m->down; + found = m = m->next; + if (!last) { + break; } - *ret = m; - return count; + continue; } if (compared > 0) { m = m->next; - count++; continue; } } m = m->down; - count++; } - *ret = NULL; + if (found) { + while (found->down) { + found = found->down; + } + *ret = found; + } + else { + *ret = NULL; + } return count; } -APR_DECLARE(void *) apr_skiplist_find_compare(apr_skiplist *sli, void *data, - apr_skiplistnode **iter, - apr_skiplist_compare comp) +static void *find_compare(apr_skiplist *sli, void *data, + apr_skiplistnode **iter, + apr_skiplist_compare comp, + int last) { apr_skiplistnode *m; apr_skiplist *sl; @@ -353,16 +359,36 @@ } sl = (apr_skiplist *) m->data; } - skiplisti_find_compare(sl, data, &m, sl->comparek); + skiplisti_find_compare(sl, data, &m, sl->comparek, last); if (iter) { *iter = m; } return (m) ? m->data : NULL; } +APR_DECLARE(void *) apr_skiplist_find_compare(apr_skiplist *sl, void *data, + apr_skiplistnode **iter, + apr_skiplist_compare comp) +{ + return find_compare(sl, data, iter, comp, 0); +} + APR_DECLARE(void *) apr_skiplist_find(apr_skiplist *sl, void *data, apr_skiplistnode **iter) { - return apr_skiplist_find_compare(sl, data, iter, sl->compare); + return find_compare(sl, data, iter, sl->compare, 0); +} + +APR_DECLARE(void *) apr_skiplist_last_compare(apr_skiplist *sl, void *data, + apr_skiplistnode **iter, + apr_skiplist_compare comp) +{ + return find_compare(sl, data, iter, comp, 1); +} + +APR_DECLARE(void *) apr_skiplist_last(apr_skiplist *sl, void *data, + apr_skiplistnode **iter) +{ + return find_compare(sl, data, iter, sl->compare, 1); } @@ -392,6 +418,15 @@ return (*iter) ? ((*iter)->data) : NULL; } +APR_DECLARE(void *) apr_skiplist_element(apr_skiplistnode *iter) +{ + return (iter) ? iter->data : NULL; +} + +/* forward declared */ +static int skiplisti_remove(apr_skiplist *sl, apr_skiplistnode *m, + apr_skiplist_freefunc myfree); + static APR_INLINE int skiplist_height(const apr_skiplist *sl) { /* Skiplists (even empty) always have a top node, although this @@ -401,15 +436,12 @@ return sl->height ? sl->height : 1; } -APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert_compare(apr_skiplist *sl, void *data, - apr_skiplist_compare comp) +static apr_skiplistnode *insert_compare(apr_skiplist *sl, void *data, + apr_skiplist_compare comp, int add, + apr_skiplist_freefunc myfree) { apr_skiplistnode *m, *p, *tmp, *ret = NULL; - int ch, nh = 1; - - if (!comp) { - return NULL; - } + int ch, top_nh, nh = 1; ch = skiplist_height(sl); if (sl->preheight) { @@ -422,6 +454,7 @@ nh++; } } + top_nh = nh; /* Now we have in nh the height at which we wish to insert our new node, * and in ch the current height: don't create skip paths to the inserted @@ -432,14 +465,34 @@ */ m = sl->top; while (m) { + /* + * To maintain stability, dups (compared == 0) must be added + * AFTER each other. + */ if (m->next) { int compared = comp(data, m->next->data); if (compared == 0) { - /* Keep the existing element(s) */ - skiplist_qclear(&sl->stack_q); - return NULL; + if (!add) { + /* Keep the existing element(s) */ + skiplist_qclear(&sl->stack_q); + return NULL; + } + if (add < 0) { + /* Remove this element and continue with the next node + * or the new top if the current one is also removed. + */ + apr_skiplistnode *top = sl->top; + skiplisti_remove(sl, m->next, myfree); + if (top != sl->top) { + m = sl->top; + skiplist_qclear(&sl->stack_q); + ch = skiplist_height(sl); + nh = top_nh; + } + continue; + } } - if (compared > 0) { + if (compared >= 0) { m = m->next; continue; } @@ -514,7 +567,7 @@ li = ret; for (p = apr_skiplist_getlist(sl->index); p; apr_skiplist_next(sl->index, &p)) { apr_skiplist *sli = (apr_skiplist *)p->data; - ni = apr_skiplist_insert_compare(sli, ret->data, sli->compare); + ni = insert_compare(sli, ret->data, sli->compare, 1, NULL); li->nextindex = ni; ni->previndex = li; li = ni; @@ -524,11 +577,50 @@ return ret; } +APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert_compare(apr_skiplist *sl, void *data, + apr_skiplist_compare comp) +{ + if (!comp) { + return NULL; + } + return insert_compare(sl, data, comp, 0, NULL); +} + APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert(apr_skiplist *sl, void *data) { return apr_skiplist_insert_compare(sl, data, sl->compare); } +APR_DECLARE(apr_skiplistnode *) apr_skiplist_add_compare(apr_skiplist *sl, void *data, + apr_skiplist_compare comp) +{ + if (!comp) { + return NULL; + } + return insert_compare(sl, data, comp, 1, NULL); +} + +APR_DECLARE(apr_skiplistnode *) apr_skiplist_add(apr_skiplist *sl, void *data) +{ + return apr_skiplist_add_compare(sl, data, sl->compare); +} + +APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace_compare(apr_skiplist *sl, + void *data, apr_skiplist_freefunc myfree, + apr_skiplist_compare comp) +{ + if (!comp) { + return NULL; + } + return insert_compare(sl, data, comp, -1, myfree); +} + +APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace(apr_skiplist *sl, + void *data, apr_skiplist_freefunc myfree) +{ + return apr_skiplist_replace_compare(sl, data, myfree, sl->compare); +} + #if 0 void skiplist_print_struct(apr_skiplist * sl, char *prefix) { @@ -548,7 +640,8 @@ } #endif -static int skiplisti_remove(apr_skiplist *sl, apr_skiplistnode *m, apr_skiplist_freefunc myfree) +static int skiplisti_remove(apr_skiplist *sl, apr_skiplistnode *m, + apr_skiplist_freefunc myfree) { apr_skiplistnode *p; if (!m) { @@ -560,19 +653,20 @@ while (m->up) { m = m->up; } - while (m) { + do { p = m; - p->prev->next = p->next;/* take me out of the list */ + /* take me out of the list */ + p->prev->next = p->next; if (p->next) { - p->next->prev = p->prev; /* take me out of the list */ + p->next->prev = p->prev; } m = m->down; /* This only frees the actual data in the bottom one */ if (!m && myfree && p->data) { myfree(p->data); } - skiplist_free_node(sl, p); - } + skiplist_put_node(sl, p); + } while (m); sl->size--; while (sl->top && sl->top->next == NULL) { /* While the row is empty and we are not on the bottom row */ @@ -581,7 +675,7 @@ if (sl->top) { sl->top->up = NULL; /* Make it think its the top */ } - skiplist_free_node(sl, p); + skiplist_put_node(sl, p); sl->height--; } if (!sl->top) { @@ -591,6 +685,23 @@ return skiplist_height(sl); } +APR_DECLARE(int) apr_skiplist_remove_node(apr_skiplist *sl, + apr_skiplistnode *iter, + apr_skiplist_freefunc myfree) +{ + apr_skiplistnode *m = iter; + if (!m) { + return 0; + } + while (m->down) { + m = m->down; + } + while (m->previndex) { + m = m->previndex; + } + return skiplisti_remove(sl, m, myfree); +} + APR_DECLARE(int) apr_skiplist_remove_compare(apr_skiplist *sli, void *data, apr_skiplist_freefunc myfree, apr_skiplist_compare comp) @@ -610,7 +721,7 @@ } sl = (apr_skiplist *) m->data; } - skiplisti_find_compare(sl, data, &m, comp); + skiplisti_find_compare(sl, data, &m, comp, 0); if (!m) { return 0; } @@ -641,7 +752,7 @@ } do { u = m->up; - skiplist_free_node(sl, m); + skiplist_put_node(sl, m); m = u; } while (m); m = p; @@ -674,6 +785,26 @@ return NULL; } +APR_DECLARE(size_t) apr_skiplist_size(const apr_skiplist *sl) +{ + return sl->size; +} + +APR_DECLARE(int) apr_skiplist_height(const apr_skiplist *sl) +{ + return skiplist_height(sl); +} + +APR_DECLARE(int) apr_skiplist_preheight(const apr_skiplist *sl) +{ + return sl->preheight; +} + +APR_DECLARE(void) apr_skiplist_set_preheight(apr_skiplist *sl, int to) +{ + sl->preheight = (to > 0) ? to : 0; +} + static void skiplisti_destroy(void *vsl) { apr_skiplist_destroy(vsl, NULL); diff -Nru apr-1.5.2/tables/apr_tables.c apr-1.6.5/tables/apr_tables.c --- apr-1.5.2/tables/apr_tables.c 2013-10-03 14:25:00.000000000 +0000 +++ apr-1.6.5/tables/apr_tables.c 2016-03-07 23:36:40.000000000 +0000 @@ -1103,6 +1103,10 @@ int i; int dups_found; + if (flags == APR_OVERLAP_TABLES_ADD) { + return; + } + if (t->a.nelts <= 1) { return; } diff -Nru apr-1.5.2/test/sockchild.c apr-1.6.5/test/sockchild.c --- apr-1.5.2/test/sockchild.c 2013-12-17 19:48:05.000000000 +0000 +++ apr-1.6.5/test/sockchild.c 2014-04-28 17:24:21.000000000 +0000 @@ -30,11 +30,11 @@ atexit(apr_terminate); apr_pool_create(&p, NULL); - if (argc < 2) { + if (argc < 3) { exit(-1); } - rv = apr_sockaddr_info_get(&remote_sa, "127.0.0.1", APR_UNSPEC, 8021, 0, p); + rv = apr_sockaddr_info_get(&remote_sa, argv[2], APR_UNSPEC, 8021, 0, p); if (rv != APR_SUCCESS) { exit(-1); } diff -Nru apr-1.5.2/test/sockperf.c apr-1.6.5/test/sockperf.c --- apr-1.5.2/test/sockperf.c 2013-03-30 14:22:35.000000000 +0000 +++ apr-1.6.5/test/sockperf.c 2018-08-25 13:40:26.000000000 +0000 @@ -183,7 +183,7 @@ apr_pool_t *pool) { char *buffer; - apr_status_t rv; + apr_status_t rv = APR_SUCCESS; int i; apr_size_t sz = ts->size * TEST_SIZE; diff -Nru apr-1.5.2/test/testdll.dsp apr-1.6.5/test/testdll.dsp --- apr-1.5.2/test/testdll.dsp 2014-06-27 18:14:20.000000000 +0000 +++ apr-1.6.5/test/testdll.dsp 2007-10-18 03:31:20.000000000 +0000 @@ -311,10 +311,6 @@ # End Source File # Begin Source File -SOURCE=.\testskiplist.c -# End Source File -# Begin Source File - SOURCE=.\testsleep.c # End Source File # Begin Source File diff -Nru apr-1.5.2/test/testescape.c apr-1.6.5/test/testescape.c --- apr-1.5.2/test/testescape.c 2013-12-21 00:34:10.000000000 +0000 +++ apr-1.6.5/test/testescape.c 2014-04-25 10:39:23.000000000 +0000 @@ -262,6 +262,42 @@ apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, (apr_size_t)4), (len == 4)); + src = "Parens R Us (for all your parenthetical needs) plus asterisk* \"+,;<>\\"; + target = "Parens R Us (for all your parenthetical needs) plus asterisk* \\22\\2b\\2c\\3b\\3c\\3e\\5c"; + dest = apr_pescape_ldap(pool, src, APR_ESCAPE_STRING, APR_ESCAPE_LDAP_DN); + ABTS_ASSERT(tc, + apr_psprintf(pool, "ldap escaped (%s) does not match expected output (%s)", + dest, target), + (strcmp(dest, target) == 0)); + apr_escape_ldap(NULL, src, APR_ESCAPE_STRING, APR_ESCAPE_LDAP_DN, &len); + ABTS_ASSERT(tc, + apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1), + (len == strlen(dest) + 1)); + + src = "Parens R Us (for all your parenthetical needs) plus asterisk* \"+,;<>\\"; + target = "Parens R Us \\28for all your parenthetical needs\\29 plus asterisk\\2a \"+,;<>\\5c"; + dest = apr_pescape_ldap(pool, src, APR_ESCAPE_STRING, APR_ESCAPE_LDAP_FILTER); + ABTS_ASSERT(tc, + apr_psprintf(pool, "ldap escaped (%s) does not match expected output (%s)", + dest, target), + (strcmp(dest, target) == 0)); + apr_escape_ldap(NULL, src, APR_ESCAPE_STRING, APR_ESCAPE_LDAP_FILTER, &len); + ABTS_ASSERT(tc, + apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1), + (len == strlen(dest) + 1)); + + src = "Parens R Us (for all your parenthetical needs) plus asterisk* \"+,;<>\\"; + target = "Parens R Us \\28for all your parenthetical needs\\29 plus asterisk\\2a \\22\\2b\\2c\\3b\\3c\\3e\\5c"; + dest = apr_pescape_ldap(pool, src, APR_ESCAPE_STRING, APR_ESCAPE_LDAP_ALL); + ABTS_ASSERT(tc, + apr_psprintf(pool, "ldap escaped (%s) does not match expected output (%s)", + dest, target), + (strcmp(dest, target) == 0)); + apr_escape_ldap(NULL, src, APR_ESCAPE_STRING, APR_ESCAPE_LDAP_ALL, &len); + ABTS_ASSERT(tc, + apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1), + (len == strlen(dest) + 1)); + apr_pool_destroy(pool); } diff -Nru apr-1.5.2/test/testfile.c apr-1.6.5/test/testfile.c --- apr-1.5.2/test/testfile.c 2013-03-30 13:54:42.000000000 +0000 +++ apr-1.6.5/test/testfile.c 2017-06-30 21:12:31.000000000 +0000 @@ -811,6 +811,253 @@ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); } +static void test_file_trunc(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_file_t *f; + const char *fname = "data/testtruncate.dat"; + const char *s; + apr_size_t nbytes; + apr_finfo_t finfo; + + apr_file_remove(fname, p); + + /* Test unbuffered */ + rv = apr_file_open(&f, fname, + APR_FOPEN_CREATE | APR_FOPEN_READ | + APR_FOPEN_WRITE, + APR_FPROT_UREAD | APR_FPROT_UWRITE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + s = "some data"; + nbytes = strlen(s); + rv = apr_file_write(f, s, &nbytes); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_SIZE_EQUAL(tc, strlen(s), nbytes); + rv = apr_file_trunc(f, 4); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_file_close(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_stat(&finfo, fname, APR_FINFO_SIZE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_ASSERT(tc, "File size mismatch, expected 4", finfo.size == 4); + + rv = apr_file_remove(fname, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + /* Test buffered */ + rv = apr_file_open(&f, fname, + APR_FOPEN_CREATE | APR_FOPEN_READ | + APR_FOPEN_WRITE | APR_FOPEN_BUFFERED, + APR_FPROT_UREAD | APR_FPROT_UWRITE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + nbytes = strlen(s); + rv = apr_file_write(f, s, &nbytes); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_SIZE_EQUAL(tc, strlen(s), nbytes); + rv = apr_file_trunc(f, 4); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_file_close(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_stat(&finfo, fname, APR_FINFO_SIZE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_ASSERT(tc, "File size mismatch, expected 4", finfo.size == 4); + + rv = apr_file_remove(fname, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); +} + +static void test_file_trunc2(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_file_t *f; + const char *fname = "data/testtruncate.dat"; + const char *s; + apr_size_t nbytes; + apr_finfo_t finfo; + char c; + + apr_file_remove(fname, p); + + rv = apr_file_open(&f, fname, + APR_FOPEN_CREATE | APR_FOPEN_READ | + APR_FOPEN_WRITE, + APR_FPROT_UREAD | APR_FPROT_UWRITE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + s = "some data"; + nbytes = strlen(s); + rv = apr_file_write(f, s, &nbytes); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_SIZE_EQUAL(tc, strlen(s), nbytes); + rv = apr_file_trunc(f, 4); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + /* Test apr_file_info_get(). */ + rv = apr_file_info_get(&finfo, APR_FINFO_SIZE, f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_INT_EQUAL(tc, 4, (int)finfo.size); + /* EOF is not reported until the next read. */ + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_file_getc(&c, f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + + rv = apr_file_close(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_stat(&finfo, fname, APR_FINFO_SIZE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_INT_EQUAL(tc, 4, (int)finfo.size); + + rv = apr_file_remove(fname, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); +} + +static void test_file_trunc_buffered_write(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_file_t *f; + const char *fname = "data/testtruncate_buffered_write.dat"; + const char *s; + apr_size_t nbytes; + apr_finfo_t finfo; + char c; + + apr_file_remove(fname, p); + + rv = apr_file_open(&f, fname, + APR_FOPEN_CREATE | APR_FOPEN_READ | + APR_FOPEN_WRITE | APR_FOPEN_BUFFERED, + APR_FPROT_UREAD | APR_FPROT_UWRITE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + s = "some data"; + nbytes = strlen(s); + rv = apr_file_write(f, s, &nbytes); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_SIZE_EQUAL(tc, strlen(s), nbytes); + rv = apr_file_trunc(f, 4); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + /* Test apr_file_info_get(). */ + rv = apr_file_info_get(&finfo, APR_FINFO_SIZE, f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_INT_EQUAL(tc, 4, (int)finfo.size); + /* EOF is not reported until the next read. */ + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_file_getc(&c, f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + + rv = apr_file_close(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_stat(&finfo, fname, APR_FINFO_SIZE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + ABTS_INT_EQUAL(tc, 4, (int)finfo.size); + + rv = apr_file_remove(fname, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); +} + +static void test_file_trunc_buffered_write2(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_file_t *f; + const char *fname = "data/testtruncate_buffered_write2.dat"; + apr_finfo_t finfo; + char c; + + apr_file_remove(fname, p); + + rv = apr_file_open(&f, fname, + APR_FOPEN_CREATE | APR_FOPEN_READ | + APR_FOPEN_WRITE | APR_FOPEN_BUFFERED, + APR_FPROT_OS_DEFAULT, p); + APR_ASSERT_SUCCESS(tc, "open test file", rv); + + rv = apr_file_puts("abc", f); + APR_ASSERT_SUCCESS(tc, "write first string", rv); + rv = apr_file_flush(f); + APR_ASSERT_SUCCESS(tc, "flush", rv); + rv = apr_file_puts("def", f); + APR_ASSERT_SUCCESS(tc, "write second string", rv); + /* Truncate behind the write buffer. */ + rv = apr_file_trunc(f, 2); + APR_ASSERT_SUCCESS(tc, "truncate the file", rv); + /* Test apr_file_info_get(). */ + rv = apr_file_info_get(&finfo, APR_FINFO_SIZE, f); + APR_ASSERT_SUCCESS(tc, "get file info", rv); + ABTS_INT_EQUAL(tc, 2, (int)finfo.size); + /* EOF is not reported until the next read. */ + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_file_getc(&c, f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + + apr_file_close(f); + + rv = apr_stat(&finfo, fname, APR_FINFO_SIZE, p); + APR_ASSERT_SUCCESS(tc, "stat file", rv); + ABTS_INT_EQUAL(tc, 2, (int)finfo.size); + + apr_file_remove(fname, p); +} + +static void test_file_trunc_buffered_read(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_file_t *f; + const char *fname = "data/testtruncate_buffered_read.dat"; + apr_finfo_t finfo; + char c; + + apr_file_remove(fname, p); + + rv = apr_file_open(&f, fname, + APR_FOPEN_CREATE | APR_FOPEN_READ | + APR_FOPEN_WRITE, APR_FPROT_OS_DEFAULT, p); + APR_ASSERT_SUCCESS(tc, "open test file", rv); + + rv = apr_file_puts("abc", f); + APR_ASSERT_SUCCESS(tc, "write test data", rv); + apr_file_close(f); + + rv = apr_file_open(&f, fname, + APR_FOPEN_READ | APR_FOPEN_WRITE | + APR_FOPEN_BUFFERED, APR_FPROT_OS_DEFAULT, p); + APR_ASSERT_SUCCESS(tc, "re-open test file", rv); + + /* Read to fill in the buffer. */ + rv = apr_file_getc(&c, f); + APR_ASSERT_SUCCESS(tc, "read char", rv); + /* Truncate the file. */ + rv = apr_file_trunc(f, 1); + APR_ASSERT_SUCCESS(tc, "truncate the file", rv); + /* Test apr_file_info_get(). */ + rv = apr_file_info_get(&finfo, APR_FINFO_SIZE, f); + APR_ASSERT_SUCCESS(tc, "get file info", rv); + ABTS_INT_EQUAL(tc, 1, (int)finfo.size); + /* EOF is not reported until the next read. */ + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + rv = apr_file_getc(&c, f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + rv = apr_file_eof(f); + ABTS_INT_EQUAL(tc, APR_EOF, rv); + + apr_file_close(f); + + rv = apr_stat(&finfo, fname, APR_FINFO_SIZE, p); + APR_ASSERT_SUCCESS(tc, "stat file", rv); + ABTS_INT_EQUAL(tc, 1, (int)finfo.size); + + apr_file_remove(fname, p); +} + static void test_bigfprintf(abts_case *tc, void *data) { apr_file_t *f; @@ -1006,6 +1253,11 @@ abts_run_test(suite, test_bigread, NULL); abts_run_test(suite, test_mod_neg, NULL); abts_run_test(suite, test_truncate, NULL); + abts_run_test(suite, test_file_trunc, NULL); + abts_run_test(suite, test_file_trunc2, NULL); + abts_run_test(suite, test_file_trunc_buffered_write, NULL); + abts_run_test(suite, test_file_trunc_buffered_write2, NULL); + abts_run_test(suite, test_file_trunc_buffered_read, NULL); abts_run_test(suite, test_bigfprintf, NULL); abts_run_test(suite, test_fail_write_flush, NULL); abts_run_test(suite, test_fail_read_flush, NULL); diff -Nru apr-1.5.2/test/testipsub.c apr-1.6.5/test/testipsub.c --- apr-1.5.2/test/testipsub.c 2012-12-11 12:00:26.000000000 +0000 +++ apr-1.6.5/test/testipsub.c 2017-10-25 13:26:42.000000000 +0000 @@ -45,6 +45,7 @@ ,{"127.0.0.1.2", NULL, APR_EBADIP} ,{"127.0.0.1.2", "8", APR_EBADIP} ,{"127", "255.0.0.0", APR_EBADIP} /* either EBADIP or EBADMASK seems fine */ + ,{"", NULL, APR_EINVAL} #if APR_HAVE_IPV6 ,{"::1", NULL, APR_SUCCESS} ,{"::1", "20", APR_SUCCESS} @@ -164,6 +165,52 @@ "The specified IP address is invalid."); } +static void test_parse_addr_port(abts_case *tc, void *data) +{ + const struct { + const char *input; + apr_status_t rv; + const char *addr, *scope_id; + apr_port_t port; + } *test, testcases[] = { + { "localhost:80", APR_SUCCESS, "localhost", NULL, 80 } + ,{ "www.example.com:8080", APR_SUCCESS, "www.example.com", NULL, 8080 } + ,{ "w:1", APR_SUCCESS, "w", NULL, 1 } + ,{ "127.0.0.1:80", APR_SUCCESS, "127.0.0.1", NULL, 80 } + ,{ "[::]:80", APR_SUCCESS, "::", NULL, 80 } + ,{ "localhost:999999", APR_EINVAL, NULL, NULL, 0 } + ,{ "localhost:0", APR_EINVAL, NULL, NULL, 0 } + ,{ "[::]z:80", APR_EINVAL, NULL, NULL, 0 } + ,{ "[:::80", APR_EINVAL, NULL, NULL, 0 } + ,{ "[zzzz]:80", APR_EINVAL, NULL, NULL, 0 } + ,{ "[::%]:80", APR_EINVAL, NULL, NULL, 0 } + ,{ "[::%eth0]:80", APR_SUCCESS, "::", "eth0", 80 } +/* ,{ "127.0.0.1:80x", APR_EINVAL, NULL, NULL, 0 } <- should fail, doesn't */ +/* ,{ "127.0.0.1x:80", APR_EINVAL, NULL, NULL, 0 } <- maybe should fail?, doesn't */ +/* ,{ "localhost:-1", APR_EINVAL, NULL, NULL, 0 } <- should fail, doesn't */ + }; + unsigned i; + + for (i = 0; i < (sizeof testcases / sizeof testcases[0]); i++) { + char *addr, *scope_id; + apr_port_t port; + apr_status_t rv; + + test = &testcases[i]; + + rv = apr_parse_addr_port(&addr, &scope_id, &port, test->input, p); + ABTS_INT_EQUAL(tc, test->rv, rv); + + if (test->rv != APR_SUCCESS) continue; + + APR_ASSERT_SUCCESS(tc, "parse address", test->rv); + + ABTS_STR_EQUAL(tc, test->addr, addr); + ABTS_STR_EQUAL(tc, test->scope_id, scope_id); + ABTS_INT_EQUAL(tc, test->port, port); + } +} + abts_suite *testipsub(abts_suite *suite) { suite = ADD_SUITE(suite) @@ -173,6 +220,7 @@ abts_run_test(suite, test_interesting_subnets, NULL); abts_run_test(suite, test_badmask_str, NULL); abts_run_test(suite, test_badip_str, NULL); + abts_run_test(suite, test_parse_addr_port, NULL); return suite; } diff -Nru apr-1.5.2/test/testlfs.c apr-1.6.5/test/testlfs.c --- apr-1.5.2/test/testlfs.c 2008-06-18 08:36:17.000000000 +0000 +++ apr-1.6.5/test/testlfs.c 2017-04-01 23:13:06.000000000 +0000 @@ -342,7 +342,12 @@ static void test_nolfs(abts_case *tc, void *data) { - ABTS_NOT_IMPL(tc, "Large Files not supported"); + if (sizeof(off_t) < 8) { + ABTS_NOT_IMPL(tc, "Large Files not supported"); + } + else { + ABTS_NOT_IMPL(tc, "LFS support a no-op in 64-bit builds"); + } } #endif diff -Nru apr-1.5.2/test/testlib.dsp apr-1.6.5/test/testlib.dsp --- apr-1.5.2/test/testlib.dsp 2014-06-27 18:14:20.000000000 +0000 +++ apr-1.6.5/test/testlib.dsp 2007-10-18 03:31:20.000000000 +0000 @@ -311,10 +311,6 @@ # End Source File # Begin Source File -SOURCE=.\testskiplist.c -# End Source File -# Begin Source File - SOURCE=.\testsleep.c # End Source File # Begin Source File diff -Nru apr-1.5.2/test/testmutexscope.c apr-1.6.5/test/testmutexscope.c --- apr-1.5.2/test/testmutexscope.c 2013-10-10 20:50:08.000000000 +0000 +++ apr-1.6.5/test/testmutexscope.c 2017-05-24 15:21:43.000000000 +0000 @@ -143,7 +143,7 @@ if (test_mode == TEST_PROC) { printf(" Mutex mechanism `%s' is %sglobal in scope on this platform.\n", - mech_name, counter == 1 ? "" : "not "); + mech_name, counter == 1 ? "" : "*NOT* "); } else { if (counter != 1) { diff -Nru apr-1.5.2/test/testnames.c apr-1.6.5/test/testnames.c --- apr-1.5.2/test/testnames.c 2013-10-03 10:33:51.000000000 +0000 +++ apr-1.6.5/test/testnames.c 2015-06-18 08:42:20.000000000 +0000 @@ -214,6 +214,39 @@ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); } + +static void merge_shortname(abts_case *tc, void *data) +{ + apr_status_t rv; + char *long_path; + char short_path[MAX_PATH+1]; + DWORD short_len; + char *result_path; + + /* 'A b.c' is not a valid short path, so will have multiple representations + when short path name generation is enabled... but its 'short' path will + most likely be longer than the long path */ + rv = apr_dir_make_recursive("C:/data/short/A b.c", + APR_UREAD | APR_UWRITE | APR_UEXECUTE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + rv = apr_filepath_merge(&long_path, NULL, "C:/data/short/A b.c", + APR_FILEPATH_NOTRELATIVE, p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + short_len = GetShortPathName(long_path, short_path, sizeof(short_path)); + if (short_len > MAX_PATH) + return; /* Unable to test. Impossible shortname */ + + if (! strcmp(long_path, short_path)) + return; /* Unable to test. 8dot3name option is probably not enabled */ + + rv = apr_filepath_merge(&result_path, "", short_path, APR_FILEPATH_TRUENAME, + p); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + ABTS_STR_EQUAL(tc, long_path, result_path); +} #endif static void root_absolute(abts_case *tc, void *data) @@ -341,6 +374,7 @@ abts_run_test(suite, merge_dotdot_dotdot_dotdot, NULL); #if defined(WIN32) abts_run_test(suite, merge_lowercasedrive, NULL); + abts_run_test(suite, merge_shortname, NULL); #endif abts_run_test(suite, root_absolute, NULL); diff -Nru apr-1.5.2/test/testpipe.c apr-1.6.5/test/testpipe.c --- apr-1.5.2/test/testpipe.c 2009-08-03 23:47:07.000000000 +0000 +++ apr-1.6.5/test/testpipe.c 2016-03-25 01:28:13.000000000 +0000 @@ -56,7 +56,7 @@ apr_status_t rv; apr_interval_time_t timeout; - rv = apr_file_pipe_create_ex(&readp, &writep, APR_WRITE_BLOCK, p); + rv = apr_file_pipe_create_pools(&readp, &writep, APR_WRITE_BLOCK, p, p); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); ABTS_PTR_NOTNULL(tc, readp); ABTS_PTR_NOTNULL(tc, writep); @@ -83,7 +83,7 @@ nbytes = strlen("this is a test"); buf = (char *)apr_palloc(p, nbytes + 1); - rv = apr_file_pipe_create_ex(&readp, &writep, APR_WRITE_BLOCK, p); + rv = apr_file_pipe_create_pools(&readp, &writep, APR_WRITE_BLOCK, p, p); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); ABTS_PTR_NOTNULL(tc, readp); ABTS_PTR_NOTNULL(tc, writep); @@ -129,7 +129,7 @@ int iterations = 1000; int i; int bytes_per_iteration = 8000; - char *buf = (char *)malloc(bytes_per_iteration); + char *buf = (char *)calloc(bytes_per_iteration, 1); char responsebuf[128]; apr_size_t nbytes; int bytes_processed; diff -Nru apr-1.5.2/test/testpoll.c apr-1.6.5/test/testpoll.c --- apr-1.5.2/test/testpoll.c 2015-04-07 22:32:35.000000000 +0000 +++ apr-1.6.5/test/testpoll.c 2018-01-03 09:50:41.000000000 +0000 @@ -593,9 +593,9 @@ int count; } pollcb_baton_t; -static apr_status_t trigger_pollcb_cb(void* baton, apr_pollfd_t *descriptor) +static apr_status_t trigger_pollcb_cb(void *baton, apr_pollfd_t *descriptor) { - pollcb_baton_t* pcb = (pollcb_baton_t*) baton; + pollcb_baton_t *pcb = (pollcb_baton_t *) baton; ABTS_PTR_EQUAL(pcb->tc, s[0], descriptor->desc.s); ABTS_PTR_EQUAL(pcb->tc, s[0], descriptor->client_data); pcb->count++; @@ -783,6 +783,7 @@ apr_pollset_t *pollset; apr_int32_t num; const apr_pollfd_t *descriptors; + int i; rv = apr_pollset_create_ex(&pollset, 1, p, APR_POLLSET_WAKEABLE, default_pollset_impl); @@ -792,12 +793,18 @@ } ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - /* send wakeup but no data; apr_pollset_poll() should return APR_EINTR */ - rv = apr_pollset_wakeup(pollset); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + /* Send wakeup but no data; apr_pollset_poll() should return APR_EINTR. + * Do it twice to test implementations that need to re-arm the events after + * poll()ing (e.g. APR_POLLSET_PORT), hence verify that the wakeup pipe is + * still in the place afterward. + */ + for (i = 0; i < 2; ++i) { + rv = apr_pollset_wakeup(pollset); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - rv = apr_pollset_poll(pollset, -1, &num, &descriptors); - ABTS_INT_EQUAL(tc, APR_EINTR, rv); + rv = apr_pollset_poll(pollset, -1, &num, &descriptors); + ABTS_INT_EQUAL(tc, APR_EINTR, rv); + } /* send wakeup and data; apr_pollset_poll() should return APR_SUCCESS */ socket_pollfd.desc_type = APR_POLL_SOCKET; @@ -807,7 +814,7 @@ rv = apr_pollset_add(pollset, &socket_pollfd); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - send_msg(s, sa, 0, tc); + send_msg(s, sa, 0, tc); apr_sleep(1000); rv = apr_pollset_wakeup(pollset); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); @@ -817,6 +824,36 @@ ABTS_INT_EQUAL(tc, 1, num); } +/* Should never be invoked */ +static apr_status_t wakeup_pollcb_cb(void *baton, apr_pollfd_t *descriptor) +{ + abts_case *tc = (abts_case *) baton; + + ABTS_FAIL(tc, "pollcb callback invoked on apr_pollcb_wakeup()"); + return APR_SUCCESS; +} + +static void pollcb_wakeup(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_pollcb_t *pcb; + + rv = apr_pollcb_create(&pcb, 1, p, APR_POLLSET_WAKEABLE); + if (rv == APR_ENOTIMPL) { + ABTS_NOT_IMPL(tc, "pollcb interface not supported"); + return; + } + else { + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + } + + rv = apr_pollcb_wakeup(pcb); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + + rv = apr_pollcb_poll(pcb, -1, wakeup_pollcb_cb, tc); + ABTS_INT_EQUAL(tc, APR_EINTR, rv); +} + static void justsleep(abts_case *tc, void *data) { apr_int32_t nsds; @@ -917,10 +954,12 @@ abts_run_test(suite, timeout_pollcb, NULL); abts_run_test(suite, timeout_pollin_pollcb, NULL); abts_run_test(suite, pollset_wakeup, NULL); + abts_run_test(suite, pollcb_wakeup, NULL); abts_run_test(suite, close_all_sockets, NULL); abts_run_test(suite, pollset_default, NULL); abts_run_test(suite, pollcb_default, NULL); abts_run_test(suite, justsleep, NULL); + return suite; } diff -Nru apr-1.5.2/test/testprocmutex.c apr-1.6.5/test/testprocmutex.c --- apr-1.5.2/test/testprocmutex.c 2006-08-03 10:55:31.000000000 +0000 +++ apr-1.6.5/test/testprocmutex.c 2017-05-24 15:21:43.000000000 +0000 @@ -148,11 +148,9 @@ ABTS_ASSERT(tc, "Locks don't appear to work with trylock", *x == MAX_COUNTER); } -#endif static void proc_mutex(abts_case *tc, void *data) { -#if APR_HAS_FORK apr_status_t rv; const char *shmname = "tpm.shm"; apr_shm_t *shm; @@ -173,9 +171,6 @@ test_exclusive(tc, NULL, *mech); rv = apr_shm_destroy(shm); APR_ASSERT_SUCCESS(tc, "Error destroying shared memory block", rv); -#else - ABTS_NOT_IMPL(tc, "APR lacks fork() support"); -#endif } @@ -208,3 +203,18 @@ return suite; } + +#else /* APR_HAS_FORK */ + +static void proc_mutex(abts_case *tc, void *data) +{ + ABTS_NOT_IMPL(tc, "APR lacks fork() support"); +} + +abts_suite *testprocmutex(abts_suite *suite) +{ + suite = ADD_SUITE(suite); + abts_run_test(suite, proc_mutex, NULL); + return suite; +} +#endif /* APR_HAS_FORK */ diff -Nru apr-1.5.2/test/testshm.c apr-1.6.5/test/testshm.c --- apr-1.5.2/test/testshm.c 2011-03-21 16:55:11.000000000 +0000 +++ apr-1.6.5/test/testshm.c 2014-04-28 13:15:03.000000000 +0000 @@ -268,6 +268,46 @@ ABTS_TRUE(tc, rv != 0); } +static void test_named_delete(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_shm_t *shm, *shm2; + + apr_shm_remove(SHARED_FILENAME, p); + + rv = apr_shm_create(&shm, SHARED_SIZE, SHARED_FILENAME, p); + APR_ASSERT_SUCCESS(tc, "Error allocating shared memory block", rv); + if (rv != APR_SUCCESS) { + return; + } + ABTS_PTR_NOTNULL(tc, shm); + + rv = apr_shm_delete(shm); + + /* On platforms which acknowledge the removal of the shared resource, + * ensure another of the same name may be created after removal; + */ + if (rv == APR_SUCCESS) + { + rv = apr_shm_create(&shm2, SHARED_SIZE, SHARED_FILENAME, p); + APR_ASSERT_SUCCESS(tc, "Error allocating shared memory block", rv); + if (rv != APR_SUCCESS) { + return; + } + ABTS_PTR_NOTNULL(tc, shm2); + + rv = apr_shm_destroy(shm2); + APR_ASSERT_SUCCESS(tc, "Error destroying shared memory block", rv); + } + + rv = apr_shm_destroy(shm); + APR_ASSERT_SUCCESS(tc, "Error destroying shared memory block", rv); + + /* Now ensure no named resource remains which we may attach to */ + rv = apr_shm_attach(&shm, SHARED_FILENAME, p); + ABTS_TRUE(tc, rv != 0); +} + #endif abts_suite *testshm(abts_suite *suite) @@ -283,6 +323,7 @@ #endif abts_run_test(suite, test_named, NULL); abts_run_test(suite, test_named_remove, NULL); + abts_run_test(suite, test_named_delete, NULL); #endif return suite; diff -Nru apr-1.5.2/test/testskiplist.c apr-1.6.5/test/testskiplist.c --- apr-1.5.2/test/testskiplist.c 2015-04-23 15:42:40.000000000 +0000 +++ apr-1.6.5/test/testskiplist.c 2016-09-26 12:11:16.000000000 +0000 @@ -33,28 +33,6 @@ static apr_pool_t *ptmp = NULL; static apr_skiplist *skiplist = NULL; -/* apr_skiplist_add[_compare]() are missing in 1.5.x, - * so emulate them (not thread-safe!)... - */ -static apr_skiplist_compare current_comp; -static int add_comp(void *a, void *b) -{ - return current_comp(a, b) < 0 ? -1 : +1; -} -static apr_skiplistnode *apr_skiplist_add_compare(apr_skiplist *sl, void *data, - apr_skiplist_compare comp) -{ - current_comp = comp; - return apr_skiplist_insert_compare(sl, data, add_comp); -} -static apr_skiplistnode *apr_skiplist_add(apr_skiplist *sl, void *data) -{ - /* Ugly, really, but should work *as long as* the compare function is the - * first field of the (opaque) skiplist struct, this is the case for now :p - */ - return apr_skiplist_add_compare(sl, data, *(apr_skiplist_compare*)sl); -} - static int skiplist_get_size(abts_case *tc, apr_skiplist *sl) { size_t size = 0; @@ -62,6 +40,7 @@ for (n = apr_skiplist_getlist(sl); n; apr_skiplist_next(sl, &n)) { ++size; } + ABTS_TRUE(tc, size == apr_skiplist_size(sl)); return size; } @@ -97,7 +76,7 @@ static void skiplist_insert(abts_case *tc, void *data) { const char *val; - int i; + int i, height = 0; for (i = 0; i < 10; ++i) { ABTS_PTR_EQUAL(tc, NULL, apr_skiplist_insert(skiplist, "baton")); @@ -105,6 +84,13 @@ val = apr_skiplist_find(skiplist, "baton", NULL); ABTS_PTR_NOTNULL(tc, val); ABTS_STR_EQUAL(tc, "baton", val); + + if (height == 0) { + height = apr_skiplist_height(skiplist); + } + else { + ABTS_INT_EQUAL(tc, height, apr_skiplist_height(skiplist)); + } } ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(skiplist, "foo")); @@ -120,12 +106,16 @@ ABTS_STR_EQUAL(tc, "atfirst", val); } +#define NUM_ADDS 100 static void skiplist_add(abts_case *tc, void *data) { const char *val; - size_t i, n = skiplist_get_size(tc, skiplist); + size_t i, n = 0; + + apr_skiplist_remove_all(skiplist, NULL); + ABTS_TRUE(tc, 0 == skiplist_get_size(tc, skiplist)); - for (i = 0; i < 100; ++i) { + for (i = 0; i < NUM_ADDS; ++i) { n++; ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "daton")); ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist)); @@ -156,10 +146,48 @@ } } +static void skiplist_replace(abts_case *tc, void *data) +{ + const char *val; + size_t n = skiplist_get_size(tc, skiplist); + + n -= NUM_ADDS - 1; + apr_skiplist_replace(skiplist, "daton", NULL); + ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist)); + val = apr_skiplist_find(skiplist, "daton", NULL); + ABTS_PTR_NOTNULL(tc, val); + ABTS_STR_EQUAL(tc, "daton", val); + + n -= NUM_ADDS - 1; + apr_skiplist_replace(skiplist, "baton", NULL); + ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist)); + val = apr_skiplist_find(skiplist, "baton", NULL); + ABTS_PTR_NOTNULL(tc, val); + ABTS_STR_EQUAL(tc, "baton", val); + + n -= NUM_ADDS - 1; + apr_skiplist_replace(skiplist, "caton", NULL); + ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist)); + val = apr_skiplist_find(skiplist, "caton", NULL); + ABTS_PTR_NOTNULL(tc, val); + ABTS_STR_EQUAL(tc, "caton", val); + + n -= NUM_ADDS - 1; + apr_skiplist_replace(skiplist, "aaton", NULL); + ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist)); + val = apr_skiplist_find(skiplist, "aaton", NULL); + ABTS_PTR_NOTNULL(tc, val); + ABTS_STR_EQUAL(tc, "aaton", val); + + ABTS_TRUE(tc, n == 4); +} + static void skiplist_destroy(abts_case *tc, void *data) { apr_skiplist_destroy(skiplist, NULL); - ABTS_TRUE(tc, 0 == skiplist_get_size(tc, skiplist)); + ABTS_TRUE(tc, 0 == apr_skiplist_size(skiplist)); + ABTS_TRUE(tc, 1 == apr_skiplist_height(skiplist)); + ABTS_TRUE(tc, NULL == apr_skiplist_getlist(skiplist)); } static void skiplist_size(abts_case *tc, void *data) @@ -235,6 +263,8 @@ ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&sl, ptmp)); apr_skiplist_set_compare(sl, (apr_skiplist_compare)strcmp, (apr_skiplist_compare)strcmp); + apr_skiplist_set_preheight(sl, 7); + ABTS_INT_EQUAL(tc, 7, apr_skiplist_preheight(sl)); batons = apr_palloc(ptmp, NUM_FIND * sizeof(char*)); @@ -263,21 +293,21 @@ static void add_int_to_skiplist(abts_case *tc, apr_skiplist *list, int n){ int* a = apr_skiplist_alloc(list, sizeof(int)); *a = n; - ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(list, a)); + ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list, a)); } static void add_elem_to_skiplist(abts_case *tc, apr_skiplist *list, elem n){ elem* a = apr_skiplist_alloc(list, sizeof(elem)); *a = n; - ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(list, a)); + ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list, a)); } static int comp(void *a, void *b){ - return (*((int*) a) < *((int*) b)) ? -1 : 1; + return *((int*) a) - *((int*) b); } static int scomp(void *a, void *b){ - return (((elem*) a)->a < ((elem*) b)->a) ? -1 : 1; + return ((elem*) a)->a - ((elem*) b)->a; } static int ecomp(void *a, void *b) @@ -301,6 +331,39 @@ } } +/* Some tests below add multiple duplicates and then try to remove each one + * individually, in arbitrary order. + * + * Using apr_skiplist_remove_compare(..., scomp, NULL) would not work because + * it will likely remove any duplicate (the first one) encountered on the path, + * hence possibly not the expected one. + * + * Using apr_skiplist_remove_compare(..., ecomp, NULL) works provided all the + * duplicates (same a) don't also have the same b (which is the case in the + * test below), hence uniqueness is cooked in the elem itself. + * + * Another possibility is to rely on unique pointers, and then cook a remove + * function, like the following skiplist_remove_scomp(), which will go straight + * to the last duplicate (using scomp) and then iterate on the previous elems + * until pointers match. + * + * Providing uniqueness in the elem itself is the more clean/efficient option, + * but if all you have is a unique pointer the pattern in the function may be + * worth it ( or it's just a way to test several skiplist functionalities :) + */ +static void skiplist_remove_scomp(abts_case *tc, apr_skiplist *list, elem *n) +{ + elem *e; + apr_skiplistnode *iter = NULL; + e = apr_skiplist_last(list, n, &iter); + while (e && e != n) { + ABTS_INT_EQUAL(tc, 0, scomp(n, e)); + e = apr_skiplist_previous(list, &iter); + } + ABTS_PTR_EQUAL(tc, n, apr_skiplist_element(iter)); + apr_skiplist_remove_node(list, iter, NULL); +} + static void skiplist_test(abts_case *tc, void *data) { int test_elems = 10; int i = 0, j = 0; @@ -309,6 +372,7 @@ apr_skiplist * list = NULL; apr_skiplist * list2 = NULL; apr_skiplist * list3 = NULL; + apr_skiplist * list4 = NULL; int first_forty_two = 42, second_forty_two = 42; apr_array_header_t *array; @@ -419,6 +483,39 @@ ABTS_TRUE(tc, apr_skiplist_remove(list3, e, NULL) != 0); } + ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&list4, ptmp)); + apr_skiplist_set_compare(list4, scomp, scomp); + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t1); + } + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t2); + } + apr_skiplist_add(list4, &t2); + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t2); + } + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t3); + } + apr_skiplist_add(list4, &t3); + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t3); + } + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t4); + } + apr_skiplist_add(list4, &t4); + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t4); + } + for (i = 0; i < 5; ++i){ + add_elem_to_skiplist(tc, list4, t5); + } + skiplist_remove_scomp(tc, list4, &t2); + skiplist_remove_scomp(tc, list4, &t3); + skiplist_remove_scomp(tc, list4, &t4); + apr_pool_clear(ptmp); } @@ -434,6 +531,7 @@ abts_run_test(suite, skiplist_dontfind, NULL); abts_run_test(suite, skiplist_insert, NULL); abts_run_test(suite, skiplist_add, NULL); + abts_run_test(suite, skiplist_replace, NULL); abts_run_test(suite, skiplist_destroy, NULL); abts_run_test(suite, skiplist_size, NULL); abts_run_test(suite, skiplist_remove, NULL); diff -Nru apr-1.5.2/test/testsock.c apr-1.6.5/test/testsock.c --- apr-1.5.2/test/testsock.c 2013-12-21 00:15:27.000000000 +0000 +++ apr-1.6.5/test/testsock.c 2016-03-03 12:03:43.000000000 +0000 @@ -26,10 +26,15 @@ #define APR_WANT_BYTEFUNC #include "apr_want.h" +#define UNIX_SOCKET_NAME "/tmp/apr-socket" +#define IPV4_SOCKET_NAME "127.0.0.1" +static char *socket_name = NULL; +static int socket_type = APR_INET; + static void launch_child(abts_case *tc, apr_proc_t *proc, const char *arg1, apr_pool_t *p) { apr_procattr_t *procattr; - const char *args[3]; + const char *args[4]; apr_status_t rv; rv = apr_procattr_create(&procattr, p); @@ -47,7 +52,8 @@ args[0] = "sockchild" EXTENSION; args[1] = arg1; - args[2] = NULL; + args[2] = socket_name; + args[3] = NULL; rv = apr_proc_create(proc, TESTBINPATH "sockchild" EXTENSION, args, NULL, procattr, p); APR_ASSERT_SUCCESS(tc, "Couldn't launch program", rv); @@ -91,6 +97,56 @@ ABTS_INT_EQUAL(tc, 0, ntohs(sa->sa.sin.sin_port)); } +static void test_addr_copy(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_sockaddr_t *sa1, *sa2; + int rc; + const char *hosts[] = { + "127.0.0.1", +#if APR_HAVE_IPV6 + "::1", +#endif + NULL + }, **host = hosts; + + /* Loop up to and including NULL */ + do { + rv = apr_sockaddr_info_get(&sa1, *host, APR_UNSPEC, 80, 0, p); + APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv); + + rv = apr_sockaddr_info_copy(&sa2, sa1, p); + APR_ASSERT_SUCCESS(tc, "Problem copying sockaddr", rv); + + ABTS_PTR_NOTNULL(tc, sa1); + do { + ABTS_PTR_NOTNULL(tc, sa2); + + rc = apr_sockaddr_equal(sa2, sa1); + ABTS_INT_NEQUAL(tc, 0, rc); + ABTS_INT_EQUAL(tc, 80, sa1->port); + ABTS_INT_EQUAL(tc, sa2->port, sa1->port); + ABTS_INT_EQUAL(tc, 80, ntohs(sa1->sa.sin.sin_port)); + ABTS_INT_EQUAL(tc, ntohs(sa2->sa.sin.sin_port), ntohs(sa1->sa.sin.sin_port)); + + if (*host) { + ABTS_PTR_NOTNULL(tc, sa1->hostname); + ABTS_PTR_NOTNULL(tc, sa2->hostname); + ABTS_STR_EQUAL(tc, *host, sa1->hostname); + ABTS_STR_EQUAL(tc, sa1->hostname, sa2->hostname); + ABTS_TRUE(tc, sa1->hostname != sa2->hostname); + } + else { + ABTS_PTR_EQUAL(tc, NULL, sa1->hostname); + ABTS_PTR_EQUAL(tc, NULL, sa2->hostname); + } + + } while ((sa2 = sa2->next, sa1 = sa1->next)); + ABTS_PTR_EQUAL(tc, NULL, sa2); + + } while (*host++); +} + static void test_serv_by_name(abts_case *tc, void *data) { apr_status_t rv; @@ -117,7 +173,7 @@ apr_sockaddr_t *sa; apr_socket_t *sock; - rv = apr_sockaddr_info_get(&sa, "127.0.0.1", APR_INET, 8021, 0, p); + rv = apr_sockaddr_info_get(&sa, socket_name, socket_type, 8021, 0, p); APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv); rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, APR_PROTO_TCP, p); @@ -488,11 +544,45 @@ APR_ASSERT_SUCCESS(tc, "Problem closing socket", rv); } +static void test_freebind(abts_case *tc, void *data) +{ +#ifdef IP_FREEBIND + apr_status_t rv; + apr_socket_t *sock; + apr_sockaddr_t *sa; + apr_int32_t on; + + /* RFC 5737 address */ + rv = apr_sockaddr_info_get(&sa, "192.0.2.1", APR_INET, 8080, 0, p); + APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv); + + rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, APR_PROTO_TCP, p); + APR_ASSERT_SUCCESS(tc, "Problem creating socket", rv); + + rv = apr_socket_opt_set(sock, APR_SO_REUSEADDR, 1); + APR_ASSERT_SUCCESS(tc, "Could not set REUSEADDR on socket", rv); + + rv = apr_socket_opt_set(sock, APR_SO_FREEBIND, 1); + APR_ASSERT_SUCCESS(tc, "Could not enable FREEBIND option", rv); + + rv = apr_socket_opt_get(sock, APR_SO_FREEBIND, &on); + APR_ASSERT_SUCCESS(tc, "Could not retrieve FREEBIND option", rv); + ABTS_INT_EQUAL(tc, 1, on); + + rv = apr_socket_bind(sock, sa); + APR_ASSERT_SUCCESS(tc, "Problem binding to port with FREEBIND", rv); + + rv = apr_socket_close(sock); + APR_ASSERT_SUCCESS(tc, "Problem closing socket", rv); +#endif +} + abts_suite *testsock(abts_suite *suite) { suite = ADD_SUITE(suite) - + socket_name = IPV4_SOCKET_NAME; abts_run_test(suite, test_addr_info, NULL); + abts_run_test(suite, test_addr_copy, NULL); abts_run_test(suite, test_serv_by_name, NULL); abts_run_test(suite, test_create_bind_listen, NULL); abts_run_test(suite, test_send, NULL); @@ -502,7 +592,16 @@ abts_run_test(suite, test_print_addr, NULL); abts_run_test(suite, test_get_addr, NULL); abts_run_test(suite, test_nonblock_inheritance, NULL); + abts_run_test(suite, test_freebind, NULL); +#if APR_HAVE_SOCKADDR_UN + socket_name = UNIX_SOCKET_NAME; + socket_type = APR_UNIX; + abts_run_test(suite, test_create_bind_listen, NULL); + abts_run_test(suite, test_send, NULL); + abts_run_test(suite, test_recv, NULL); + abts_run_test(suite, test_timeout, NULL); +#endif return suite; } diff -Nru apr-1.5.2/test/teststr.c apr-1.6.5/test/teststr.c --- apr-1.5.2/test/teststr.c 2013-10-10 20:50:08.000000000 +0000 +++ apr-1.6.5/test/teststr.c 2018-08-25 13:36:20.000000000 +0000 @@ -26,6 +26,7 @@ #include "apr_general.h" #include "apr_strings.h" +#include "apr_cstr.h" #include "apr_errno.h" /* I haven't bothered to check for APR_ENOTIMPL here, AFAIK, all string @@ -306,7 +307,7 @@ for (; off < 999999999; off += 999) { apr_strfsize(off, buf); } - for (off = 1; off < LONG_MAX && off > 0; off *= 2) { + for (off = LONG_MAX; off > 1; off /= 2) { apr_strfsize(off, buf); apr_strfsize(off + 1, buf); apr_strfsize(off - 1, buf); @@ -382,6 +383,17 @@ ABTS_TRUE(tc, buf[2] == '4' && buf[3] == '2'); } +static void skip_prefix(abts_case *tc, void *data) +{ + ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("12345", "12345"), ""); + ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("12345", "123"), "45"); + ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("12345", ""), "12345"); + ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("12345", "23"), NULL); + ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("1", "12"), NULL); + ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("", ""), ""); + ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("", "12"), NULL); +} + abts_suite *teststr(abts_suite *suite) { suite = ADD_SUITE(suite) @@ -399,6 +411,7 @@ abts_run_test(suite, string_strfsize, NULL); abts_run_test(suite, string_cpystrn, NULL); abts_run_test(suite, snprintf_overflow, NULL); + abts_run_test(suite, skip_prefix, NULL); return suite; } diff -Nru apr-1.5.2/test/testtable.c apr-1.6.5/test/testtable.c --- apr-1.5.2/test/testtable.c 2013-05-07 20:52:42.000000000 +0000 +++ apr-1.6.5/test/testtable.c 2016-03-07 23:36:40.000000000 +0000 @@ -199,6 +199,29 @@ } +static void table_overlap3(abts_case *tc, void *data) +{ + apr_pool_t *subp; + apr_table_t *t1, *t2; + + apr_pool_create(&subp, p); + + t1 = apr_table_make(subp, 1); + t2 = apr_table_make(p, 1); + apr_table_addn(t1, "t1", "one"); + apr_table_addn(t1, "t1", "overlay"); + apr_table_addn(t2, "t2", "two"); + apr_table_addn(t2, "t2", "overlay"); + + apr_table_overlap(t1, t2, APR_OVERLAP_TABLES_ADD); + + ABTS_INT_EQUAL(tc, 4, apr_table_elts(t1)->nelts); + + ABTS_STR_EQUAL(tc, "one", apr_table_get(t1, "t1")); + ABTS_STR_EQUAL(tc, "two", apr_table_get(t1, "t2")); + +} + abts_suite *testtable(abts_suite *suite) { suite = ADD_SUITE(suite) @@ -215,6 +238,7 @@ abts_run_test(suite, table_unset, NULL); abts_run_test(suite, table_overlap, NULL); abts_run_test(suite, table_overlap2, NULL); + abts_run_test(suite, table_overlap3, NULL); return suite; } diff -Nru apr-1.5.2/threadproc/beos/proc.c apr-1.6.5/threadproc/beos/proc.c --- apr-1.5.2/threadproc/beos/proc.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/threadproc/beos/proc.c 2014-04-28 12:08:38.000000000 +0000 @@ -444,3 +444,11 @@ { return APR_ENOTIMPL; } + +APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr, + apr_perms_setfn_t *perms_set_fn, + void *data, + apr_fileperms_t perms) +{ + return APR_ENOTIMPL; +} diff -Nru apr-1.5.2/threadproc/netware/proc.c apr-1.6.5/threadproc/netware/proc.c --- apr-1.5.2/threadproc/netware/proc.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/threadproc/netware/proc.c 2014-04-28 12:08:38.000000000 +0000 @@ -505,3 +505,11 @@ /* Always return SUCCESS because NetWare threads don't run within a group */ return APR_SUCCESS; } + +APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr, + apr_perms_setfn_t *perms_set_fn, + void *data, + apr_fileperms_t perms) +{ + return APR_ENOTIMPL; +} diff -Nru apr-1.5.2/threadproc/os2/proc.c apr-1.6.5/threadproc/os2/proc.c --- apr-1.5.2/threadproc/os2/proc.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/threadproc/os2/proc.c 2014-04-28 12:08:38.000000000 +0000 @@ -662,3 +662,11 @@ { return APR_ENOTIMPL; } + +APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr, + apr_perms_setfn_t *perms_set_fn, + void *data, + apr_fileperms_t perms) +{ + return APR_ENOTIMPL; +} diff -Nru apr-1.5.2/threadproc/unix/proc.c apr-1.6.5/threadproc/unix/proc.c --- apr-1.5.2/threadproc/unix/proc.c 2013-10-17 15:14:27.000000000 +0000 +++ apr-1.6.5/threadproc/unix/proc.c 2014-05-14 19:55:17.000000000 +0000 @@ -461,7 +461,19 @@ _exit(-1); /* We have big problems, the child should exit. */ } } + if (!geteuid()) { + apr_procattr_pscb_t *c = attr->perms_set_callbacks; + while (c) { + apr_status_t r; + r = (*c->perms_set_fn)((void *)c->data, c->perms, + attr->uid, attr->gid); + if (r != APR_SUCCESS && r != APR_ENOTIMPL) { + _exit(-1); + } + c = c->next; + } + } /* Only try to switch if we are running as root */ if (attr->gid != -1 && !geteuid()) { if (setgid(attr->gid)) { @@ -709,3 +721,19 @@ } #endif /* APR_HAVE_STRUCT_RLIMIT */ +APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr, + apr_perms_setfn_t *perms_set_fn, + void *data, + apr_fileperms_t perms) +{ + apr_procattr_pscb_t *c; + + c = apr_palloc(attr->pool, sizeof(apr_procattr_pscb_t)); + c->data = data; + c->perms = perms; + c->perms_set_fn = perms_set_fn; + c->next = attr->perms_set_callbacks; + attr->perms_set_callbacks = c; + + return APR_SUCCESS; +} diff -Nru apr-1.5.2/threadproc/win32/proc.c apr-1.6.5/threadproc/win32/proc.c --- apr-1.5.2/threadproc/win32/proc.c 2013-10-21 11:48:25.000000000 +0000 +++ apr-1.6.5/threadproc/win32/proc.c 2015-10-24 05:45:35.000000000 +0000 @@ -486,7 +486,7 @@ * XXX progname must be NULL if this is a 16 bit app running in WOW */ if (progname[0] == '\"') { - progname = apr_pstrndup(pool, progname + 1, strlen(progname) - 2); + progname = apr_pstrmemdup(pool, progname + 1, strlen(progname) - 2); } if (attr->cmdtype == APR_PROGRAM || attr->cmdtype == APR_PROGRAM_ENV) { @@ -546,7 +546,7 @@ return APR_EINVAL; } if (shellcmd[0] == '"') { - progname = apr_pstrndup(pool, shellcmd + 1, strlen(shellcmd) - 2); + progname = apr_pstrmemdup(pool, shellcmd + 1, strlen(shellcmd) - 2); } else { progname = shellcmd; @@ -588,7 +588,7 @@ return APR_EINVAL; } if (shellcmd[0] == '"') { - progname = apr_pstrndup(pool, shellcmd + 1, strlen(shellcmd) - 2); + progname = apr_pstrmemdup(pool, shellcmd + 1, strlen(shellcmd) - 2); } else { progname = shellcmd; @@ -1148,3 +1148,11 @@ { return APR_ENOTIMPL; } + +APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr, + apr_perms_setfn_t *perms_set_fn, + void *data, + apr_fileperms_t perms) +{ + return APR_ENOTIMPL; +} diff -Nru apr-1.5.2/time/unix/time.c apr-1.6.5/time/unix/time.c --- apr-1.5.2/time/unix/time.c 2006-08-03 10:55:31.000000000 +0000 +++ apr-1.6.5/time/unix/time.c 2017-09-10 22:30:34.000000000 +0000 @@ -142,6 +142,9 @@ static const int dayoffset[12] = {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + if (xt->tm_mon < 0 || xt->tm_mon >= 12) + return APR_EBADDATE; + /* shift new year to 1st March in order to make leap year calc easy */ if (xt->tm_mon < 2) diff -Nru apr-1.5.2/time/win32/time.c apr-1.6.5/time/win32/time.c --- apr-1.5.2/time/win32/time.c 2012-08-11 21:04:05.000000000 +0000 +++ apr-1.6.5/time/win32/time.c 2018-09-08 18:09:00.000000000 +0000 @@ -108,6 +108,7 @@ FileTimeToSystemTime(&ft, &st); /* The Platform SDK documents that SYSTEMTIME/FILETIME are * generally UTC, so no timezone info needed + * The time value makes a roundtrip, st cannot be invalid below. */ SystemTimeToAprExpTime(result, &st); result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC); @@ -124,6 +125,7 @@ FileTimeToSystemTime(&ft, &st); /* The Platform SDK documents that SYSTEMTIME/FILETIME are * generally UTC, so we will simply note the offs used. + * The time value makes a roundtrip, st cannot be invalid below. */ SystemTimeToAprExpTime(result, &st); result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC); @@ -155,6 +157,7 @@ * because FileTimeToLocalFileFime is documented that the * resulting time local file time would have DST relative * to the *present* date, not the date converted. + * The time value makes a roundtrip, localst cannot be invalid below. */ SystemTimeToTzSpecificLocalTime(tz, &st, &localst); SystemTimeToAprExpTime(result, &localst); @@ -184,6 +187,7 @@ TIME_ZONE_INFORMATION tz; /* XXX: This code is simply *wrong*. The time converted will always * map to the *now current* status of daylight savings time. + * The time value makes a roundtrip, st cannot be invalid below. */ FileTimeToLocalFileTime(&ft, &localft); @@ -224,6 +228,9 @@ static const int dayoffset[12] = {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + if (xt->tm_mon < 0 || xt->tm_mon >= 12) + return APR_EBADDATE; + /* shift new year to 1st March in order to make leap year calc easy */ if (xt->tm_mon < 2) @@ -292,6 +299,9 @@ /* The Platform SDK documents that SYSTEMTIME/FILETIME are * generally UTC, so no timezone info needed */ + if ((*ostime)->wMonth < 1 || (*ostime)->wMonth > 12) + return APR_EBADDATE; + SystemTimeToAprExpTime(aprtime, *ostime); return APR_SUCCESS; } diff -Nru apr-1.5.2/tools/gen_test_char.c apr-1.6.5/tools/gen_test_char.c --- apr-1.5.2/tools/gen_test_char.c 2013-11-07 12:04:28.000000000 +0000 +++ apr-1.6.5/tools/gen_test_char.c 2014-04-25 10:39:23.000000000 +0000 @@ -32,6 +32,8 @@ #define T_ESCAPE_ECHO (0x08) #define T_ESCAPE_URLENCODED (0x10) #define T_ESCAPE_XML (0x20) +#define T_ESCAPE_LDAP_DN (0x40) +#define T_ESCAPE_LDAP_FILTER (0x80) int main(int argc, char *argv[]) { @@ -46,6 +48,8 @@ "#define T_ESCAPE_ECHO (%u)\n" "#define T_ESCAPE_URLENCODED (%u)\n" "#define T_ESCAPE_XML (%u)\n" + "#define T_ESCAPE_LDAP_DN (%u)\n" + "#define T_ESCAPE_LDAP_FILTER (%u)\n" "\n" "static const unsigned char test_char_table[256] = {", T_ESCAPE_SHELL_CMD, @@ -53,7 +57,9 @@ T_OS_ESCAPE_PATH, T_ESCAPE_ECHO, T_ESCAPE_URLENCODED, - T_ESCAPE_XML); + T_ESCAPE_XML, + T_ESCAPE_LDAP_DN, + T_ESCAPE_LDAP_FILTER); for (c = 0; c < 256; ++c) { flags = 0; @@ -106,6 +112,16 @@ flags |= T_ESCAPE_XML; } + /* LDAP DN escaping (RFC4514) */ + if (!isprint(c) || strchr("\"+,;<>\\", c)) { + flags |= T_ESCAPE_LDAP_DN; + } + + /* LDAP filter escaping (RFC4515) */ + if (!isprint(c) || strchr("*()\\", c)) { + flags |= T_ESCAPE_LDAP_FILTER; + } + printf("%u%c", flags, (c < 255) ? ',' : ' '); } diff -Nru apr-1.5.2/user/win32/groupinfo.c apr-1.6.5/user/win32/groupinfo.c --- apr-1.5.2/user/win32/groupinfo.c 2011-03-21 16:55:11.000000000 +0000 +++ apr-1.6.5/user/win32/groupinfo.c 2015-10-24 05:45:35.000000000 +0000 @@ -37,11 +37,11 @@ char *pos; if ((pos = strchr(groupname, '/'))) { - domain = apr_pstrndup(p, groupname, pos - groupname); + domain = apr_pstrmemdup(p, groupname, pos - groupname); groupname = pos + 1; } else if ((pos = strchr(groupname, '\\'))) { - domain = apr_pstrndup(p, groupname, pos - groupname); + domain = apr_pstrmemdup(p, groupname, pos - groupname); groupname = pos + 1; } else { diff -Nru apr-1.5.2/user/win32/userinfo.c apr-1.6.5/user/win32/userinfo.c --- apr-1.5.2/user/win32/userinfo.c 2011-03-21 16:55:11.000000000 +0000 +++ apr-1.6.5/user/win32/userinfo.c 2015-10-24 05:45:35.000000000 +0000 @@ -212,11 +212,11 @@ char *pos; if ((pos = strchr(username, '/'))) { - domain = apr_pstrndup(p, username, pos - username); + domain = apr_pstrmemdup(p, username, pos - username); username = pos + 1; } else if ((pos = strchr(username, '\\'))) { - domain = apr_pstrndup(p, username, pos - username); + domain = apr_pstrmemdup(p, username, pos - username); username = pos + 1; } else {