--- acinclude.m4.orig	2008-07-10
+++ acinclude.m4	2008-07-10
@@ -58,6 +58,7 @@
 
 AC_DEFUN([GB_INIT_SHORT],
 [
+  LT_INIT
   AM_MAINTAINER_MODE
 
   COMPONENT=$1
@@ -82,10 +83,8 @@
 
 AC_DEFUN([GB_LIBTOOL],
 [
-  AC_LIBTOOL_DLOPEN
-  AC_LIBLTDL_CONVENIENCE
-  AC_LIBTOOL_WIN32_DLL
-  AC_DISABLE_STATIC
+  LT_INIT([dlopen], [win32-dll], [disable-static])
+  LTDL_INIT([convenience])
 
   AC_SUBST(INCLTDL)
   AC_SUBST(LIBLTDL)
@@ -187,15 +186,6 @@
 
   AM_CONDITIONAL(DEBUG, test "$gambas_debug" = yes)
 
-  AC_ARG_ENABLE(
-    optimization,
-    [  --enable-optimization          compile with optimizations (default: yes)],
-    gambas_optimization=$enableval,
-    gambas_optimization=yes
-  )
-
-  AM_CONDITIONAL(OPTIMIZE, test "$gambas_optimization" = yes)
-
   AM_CFLAGS="$AM_CFLAGS -pipe -Wall -Wno-unused-value -fsigned-char"
   AM_CXXFLAGS="$AM_CXXFLAGS -pipe -Wall -fno-exceptions -Wno-unused-value -fsigned-char"
 
@@ -219,17 +209,6 @@
 dnl  # gambas_flags="$gambas_flags -falign-functions=2 -ffast-math"
 dnl  # gambas_flags="$gambas_flags -fomit-frame-pointer"
 
-  if test "x$gambas_optimization" = "xyes"; then
-    AM_CFLAGS="$AM_CFLAGS -Os"
-    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
-  else
-    AM_CFLAGS="$AM_CFLAGS -O0"
-    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
-  fi
-
-  CFLAGS=""
-  CXXFLAGS=""
-  
   AC_SUBST(AM_CFLAGS)
   AC_SUBST(AM_CXXFLAGS)