Make new version of libgd work with Windows.

 - HAVE_LIBFREETYPE -> HAVE_FREETYPE2 in config.h
 - Since #include <config.h> was removed from many of the .c files,
add -DNONDLL to make file.
 - Revert to old gdhelpers.h. I don't know how libgd is built on Windows
by others, but we need to disable threads to prevent <windows.h> from
being included.

diff --git a/lib/gd/gdhelpers.h b/lib/gd/gdhelpers.h
index 0c45ad35b53f04bb329ed0469c5a9f136f57deba..dfe5b4b1e8c3b574805c784c649076cbf7657e0c 100644 (file)
--- a/lib/gd/gdhelpers.h
+++ b/lib/gd/gdhelpers.h
@@ -29,30 +29,38 @@ int overflow2(int a, int b);
 
 /* 2.0.16: portable mutex support for thread safety. */
 
-#ifdef WIN32
-/* 2.0.18: must include windows.h to get CRITICAL_SECTION. */
-#include <windows.h>
-#define gdMutexDeclare(x) CRITICAL_SECTION x
-#define gdMutexSetup(x) InitializeCriticalSection(&x)
-#define gdMutexShutdown(x) DeleteCriticalSection(&x)
-#define gdMutexLock(x) EnterCriticalSection(&x)
-#define gdMutexUnlock(x) LeaveCriticalSection(&x)
-#else
-#ifdef HAVE_PTHREAD
-#include <pthread.h>
-#define gdMutexDeclare(x) pthread_mutex_t x
-#define gdMutexSetup(x) pthread_mutex_init(&x, 0)
-#define gdMutexShutdown(x) pthread_mutex_destroy(&x)
-#define gdMutexLock(x) pthread_mutex_lock(&x)
-#define gdMutexUnlock(x) pthread_mutex_unlock(&x)
+#ifdef DISABLE_THREADS
+#  define gdMutexDeclare(x)
+#  define gdMutexSetup(x)
+#  define gdMutexShutdown(x)
+#  define gdMutexLock(x)
+#  define gdMutexUnlock(x)
 #else
-#define gdMutexDeclare(x)
-#define gdMutexSetup(x) 
-#define gdMutexShutdown(x) 
-#define gdMutexLock(x) 
-#define gdMutexUnlock(x) 
-#endif /* HAVE_PTHREAD */
-#endif /* WIN32 */
+#  ifdef WIN32
+/* 2.0.18: must include windows.h to get CRITICAL_SECTION. */
+#    include <windows.h>
+#    define gdMutexDeclare(x) CRITICAL_SECTION x
+#    define gdMutexSetup(x) InitializeCriticalSection(&x)
+#    define gdMutexShutdown(x) DeleteCriticalSection(&x)
+#    define gdMutexLock(x) EnterCriticalSection(&x)
+#    define gdMutexUnlock(x) LeaveCriticalSection(&x)
+#  else
+#    ifdef HAVE_PTHREAD
+#      include <pthread.h>
+#      define gdMutexDeclare(x) pthread_mutex_t x
+#      define gdMutexSetup(x) pthread_mutex_init(&x, 0)
+#      define gdMutexShutdown(x) pthread_mutex_destroy(&x)
+#      define gdMutexLock(x) pthread_mutex_lock(&x)
+#      define gdMutexUnlock(x) pthread_mutex_unlock(&x)
+#    else
+#      define gdMutexDeclare(x)
+#      define gdMutexSetup(x) 
+#      define gdMutexShutdown(x) 
+#      define gdMutexLock(x) 
+#      define gdMutexUnlock(x) 
+#    endif /* HAVE_PTHREAD */
+#  endif /* WIN32 */
+#endif /* DISABLE_THREADS */
 
 #endif /* GDHELPERS_H */