--- ./configure.orig	Fri Mar 24 20:30:47 2006
+++ ./configure	Sat Mar 25 00:29:38 2006
@@ -21675,6 +21675,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -21999,10 +22000,10 @@
 
   case "${host}" in
     *-*-freebsd* )
-      THREAD_LIB=""
-      THREAD_INC="-pthread -D_REENTRANT"
-      GBX_THREAD_LIB=""
-      GBX_THREAD_INC="-pthread -D_REENTRANT"
+      THREAD_LIB="${PTHREAD_LIBS}"
+      THREAD_INC="${PTHREAD_CFLAGS}"
+      GBX_THREAD_LIB="${PTHREAD_LIBS}"
+      GBX_THREAD_INC="${PTHREAD_CFLAGS}"
       ;;
     *)
       THREAD_LIB="-lpthread"
@@ -24556,7 +24557,7 @@
 
 fi;
 
-  if test "$gb_use_qt_translation" == "yes"; then
+  if test "$gb_use_qt_translation" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_QT_TRANSLATION 1
@@ -26064,7 +26065,7 @@
       fi
     done
 
-    SQLITE_LIB="$SQLITE_LIB $C_LIB -lsqlite -lc -lstdc++"
+    SQLITE_LIB="$SQLITE_LIB $C_LIB -lsqlite -lc -lstdc++ -lpub"
 
   fi
 
@@ -26195,20 +26196,7 @@
     echo "$as_me:$LINENO: result: $gb_cv_header_sdl" >&5
 echo "${ECHO_T}$gb_cv_header_sdl" >&6
 
-    SDL_INC=""
-
-    for gb_dir in $gb_cv_header_sdl; do
-      if test "$gb_dir" != "/usr/include"; then
-        if test "$gb_dir" != "/usr/include/"; then
-          SDL_INC="$SDL_INC -I$gb_dir"
-        fi
-      fi
-    done
-
-    if test "x$THREAD_INC" != "x"; then
-      SDL_INC="$SDL_INC $THREAD_INC"
-    fi
-
+    SDL_INC="`$SDL_CONFIG --cflags`"
     if test "$gb_cv_header_sdl" = no; then
       have_inc_sdl="no"
       SDL_INC=""
@@ -26312,16 +26300,7 @@
     SDL_LIB=""
     SDL_PATH=""
 
-    for gb_dir in $gb_cv_lib_sdl; do
-      if test "x$SDL_PATH" = "x"; then
-        SDL_PATH="$gb_dir/.."
-      fi
-      if test "$gb_dir" != "/lib"  && test "$gb_dir" != "/lib/"&& test "$gb_dir" != "/usr/lib" && test "$gb_dir" != "/usr/lib/"; then
-        SDL_LIB="$SDL_LIB -L$gb_dir"
-      fi
-    done
-
-    SDL_LIB="$SDL_LIB $C_LIB $THREAD_LIB -lSDL -lSDL_mixer -lm"
+    SDL_LIB="`$SDL_CONFIG --libs` -lSDL_mixer"
 
   fi
 
@@ -27598,8 +27577,8 @@
 fi
 
 
-CFLAGS="$CFLAGS -pipe -Wall -fno-strict-aliasing"
-CXXFLAGS="$CXXFLAGS -pipe -Wall -fno-exceptions"
+CFLAGS="$CFLAGS -Wall -fno-strict-aliasing"
+CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions"
 
 if test "$gambas_prof" = "yes"; then
   CFLAGS="$CFLAGS -pg"
@@ -27629,8 +27608,8 @@
   CFLAGS="$CFLAGS -Os"
   CXXFLAGS="$CXXFLAGS -Os -fno-omit-frame-pointer"
 else
-  CFLAGS="$CFLAGS -O0"
-  CXXFLAGS="$CXXFLAGS -O0"
+  CFLAGS="$CFLAGS"
+  CXXFLAGS="$CXXFLAGS"
 fi