Extension are compiled now as MODULE without the 'lib' prefix. This is necessary to make them compatible with the existing libtool naming scheme. All test cases involving extensions pass now.

1 files changed, 30 insertions, 12 deletions

diff --git a/extension/CMakeLists.txt b/extension/CMakeLists.txt
index 61f407a9..bb8b51f3 100644
--- a/extension/CMakeLists.txt
+++ b/extension/CMakeLists.txt
@@ -26,55 +26,73 @@
 
 remove_definitions(-DGAWK)
 
-add_library (filefuncs SHARED filefuncs.c stack.c gawkfts.c)
+add_library (filefuncs MODULE filefuncs.c stack.c gawkfts.c)
 target_link_libraries (filefuncs)
+set_target_properties(filefuncs PROPERTIES PREFIX "")
 
 DefineFunctionIfAvailable(fnmatch HAVE_FNMATCH)
 DefineHFileIfAvailable(fnmatch.h HAVE_FNMATCH_H)
 if (${HAVE_FNMATCH} AND ${HAVE_FNMATCH_H})
-  add_library (fnmatch SHARED fnmatch.c)
+  add_library (fnmatch MODULE fnmatch.c)
   target_link_libraries (fnmatch)
+  set_target_properties(fnmatch PROPERTIES PREFIX "")
 else()
   message(WARNING "extension fnmatch cannot be built because function fnmatch or fnmatch.h is missing")
 endif()
 
-add_library (fork SHARED fork.c)
+add_library (fork MODULE fork.c)
 target_link_libraries (fork)
+set_target_properties(fork PROPERTIES PREFIX "")
 
-add_library (inplace SHARED inplace.c)
+add_library (inplace MODULE inplace.c)
 target_link_libraries (inplace)
+set_target_properties(inplace PROPERTIES PREFIX "")
 
-add_library (ordchr SHARED ordchr.c)
+add_library (ordchr MODULE ordchr.c)
 target_link_libraries (ordchr)
+set_target_properties(ordchr PROPERTIES PREFIX "")
 
 DefineHFileIfAvailable(dirent.h HAVE_DIRENT_H)
 if (${HAVE_DIRENT_H})
-  add_library (readdir SHARED readdir.c)
+  add_library (readdir MODULE readdir.c)
   target_link_libraries (readdir)
+set_target_properties(readdir PROPERTIES PREFIX "")
 else()
   message(WARNING "extension readdir cannot be built because function readdir is missing")
 endif()
 
-add_library (readfile SHARED readfile.c)
+add_library (readfile MODULE readfile.c)
 target_link_libraries (readfile)
+set_target_properties(readfile PROPERTIES PREFIX "")
 
-add_library (revoutput SHARED revoutput.c)
+add_library (revoutput MODULE revoutput.c)
 target_link_libraries (revoutput)
+set_target_properties(revoutput PROPERTIES PREFIX "")
 
 DefineFunctionIfAvailable(getdtablesize HAVE_GETDTABLESIZE)
 if (${HAVE_GETDTABLESIZE})
-  add_library (revtwoway SHARED revtwoway.c)
+  add_library (revtwoway MODULE revtwoway.c)
   target_link_libraries (revtwoway)
+  set_target_properties(revtwoway PROPERTIES PREFIX "")
 else()
   message(WARNING "extension revtwoway cannot be built because function getdtablesize is missing")
 endif()
 
-add_library (rwarray SHARED rwarray.c)
+add_library (rwarray MODULE rwarray.c)
 target_link_libraries (rwarray)
+set_target_properties(rwarray PROPERTIES PREFIX "")
 
-add_library (time SHARED time.c)
+DefineFunctionIfAvailable(select HAVE_SELECT)
+DefineFunctionIfAvailable(gettimeofday HAVE_GETTIMEOFDAY)
+DefineHFileIfAvailable(sys/select.h HAVE_SYS_SELECT_H)
+DefineFunctionIfAvailable(nanosleep HAVE_NANOSLEEP)
+DefineHFileIfAvailable(time.h HAVE_TIME_H)
+DefineFunctionIfAvailable(GetSystemTimeAsFileTime HAVE_GETSYSTEMTIMEASFILETIME)
+add_library (time MODULE time.c)
 target_link_libraries (time)
+set_target_properties(time PROPERTIES PREFIX "")
 
-add_library (testext SHARED testext.c)
+add_library (testext MODULE testext.c)
 target_link_libraries (testext)
+set_target_properties(testext PROPERTIES PREFIX "")