X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f3b7908d381ecb39f101fb4d2886bb8dae1ecd7..57bff99cf406cace309b47d406b7307bc7ef1f3a:/configure.in

diff --git a/configure.in b/configure.in
index f39220a044..1bbbe16d09 100644
--- a/configure.in
+++ b/configure.in
@@ -464,11 +464,16 @@ dnl #######################
 dnl # check for functions #
 dnl #######################
 
-WCHAR_LINK=
 dnl check for wcslen
-AC_CHECK_LIB(c,wcslen,,
-	AC_CHECK_LIB(w,wcslen,
-	WCHAR_LINK="-lw" ,AC_MSG_ERROR("Cannot find wcslen function.")))
+AC_CHECK_LIB(c, wcslen, [
+            AC_DEFINE(HAVE_WCSLEN)
+            WCHAR_LINK=""
+        ], [
+            AC_CHECK_LIB(w, wcslen, [
+                AC_DEFINE(HAVE_WCSLEN)
+                WCHAR_LINK="-lw"
+            ])
+        ])
 AC_SUBST(WCHAR_LINK)
 
 dnl check for vprintf/vsprintf() which are GNU extensions
@@ -868,6 +873,7 @@ DEFAULT_wxUSE_RESOURCES=1
 DEFAULT_wxUSE_CLIPBOARD=1
 DEFAULT_wxUSE_TOOLTIPS=1
 DEFAULT_wxUSE_DRAG_AND_DROP=1
+DEFAULT_wxUSE_SPLINE=1
 
 DEFAULT_wxUSE_MDI_ARCHITECTURE=1
 DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
@@ -1061,6 +1067,10 @@ AC_OVERRIDES(dnd,dnd,
 **--with-dnd              use Drag'n'Drop classes,
 wxUSE_DRAG_AND_DROP)
 
+AC_OVERRIDES(spline,spline,
+**--with-spline              use Spline drawing code,
+wxUSE_SPLINE)
+
 dnl ----------------------------------------------------------------
 dnl user options for architectures
 dnl ----------------------------------------------------------------
@@ -1124,7 +1134,7 @@ if test "$wxUSE_GTK" = 1; then
   MAKEINCLUDE=../gtk.inc
   AM_PATH_GTK(1.2.0, [
        WXGTK12=1
-  ], AC_MSG_RESULT(no))
+  ])
 fi
 
 if test "$wxUSE_QT" = 1; then
@@ -1427,6 +1437,18 @@ if test "$wxUSE_THREADS" = "1"; then
                AC_DEFINE(HAVE_PTHREAD_CANCEL),
                AC_MSG_WARN(wxThread::Kill() will not work properly))
 
+  AC_MSG_CHECKING([for pthread_cleanup_push/pop])
+  AC_TRY_COMPILE([#include <pthread.h>],
+                 [
+                    pthread_cleanup_push(NULL, NULL);
+                    pthread_cleanup_pop(0);
+                 ],
+                   [AC_MSG_RESULT(yes)
+                    AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
+                 ],
+                   [AC_MSG_RESULT(no)]
+                 )
+
   THREADS_LINK="-l$THREADS_LINK"
 fi
 
@@ -1609,6 +1631,10 @@ if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
     fi
 fi
 
+if test "$wxUSE_SPLINE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_SPLINE,$wxUSE_SPLINE)
+fi
+
 dnl ----------------------------------------------------------------
 dnl No effect yet
 dnl ----------------------------------------------------------------