103 lines
2.3 KiB
Text
103 lines
2.3 KiB
Text
--- configure.orig Sat May 15 15:46:47 2004
|
|
+++ configure Sun May 16 21:24:50 2004
|
|
@@ -6889,6 +6889,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'
|
|
@@ -7080,10 +7081,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"
|
|
@@ -10234,7 +10235,7 @@
|
|
fi
|
|
done
|
|
|
|
- SQLITE_LIB="$SQLITE_LIB $C_LIB -lsqlite -lc -lstdc++"
|
|
+ SQLITE_LIB="$SQLITE_LIB $C_LIB -lsqlite -lc -lstdc++ -lpub"
|
|
|
|
fi
|
|
|
|
@@ -10358,26 +10359,13 @@
|
|
fi
|
|
|
|
gb_cv_header_sdl=$gb_inc_sdl
|
|
-
|
|
+
|
|
fi
|
|
|
|
|
|
echo "$ac_t""$gb_cv_header_sdl" 1>&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=""
|
|
@@ -10480,16 +10468,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"
|
|
+ SDL_LIB="`$SDL_CONFIG --libs` -lSDL_mixer"
|
|
|
|
fi
|
|
|
|
@@ -11246,8 +11225,8 @@
|
|
fi
|
|
|
|
|
|
-CFLAGS="$CFLAGS -pipe -Wall"
|
|
-CXXFLAGS="$CXXFLAGS -pipe -Wall -fno-exceptions"
|
|
+CFLAGS="$CFLAGS -Wall"
|
|
+CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions"
|
|
|
|
if test "$gambas_prof" = "yes"; then
|
|
CFLAGS="$CFLAGS -pg"
|
|
@@ -11277,8 +11256,8 @@
|
|
CFLAGS="$CFLAGS -Os"
|
|
CXXFLAGS="$CXXFLAGS -Os"
|
|
else
|
|
- CFLAGS="$CFLAGS -O0"
|
|
- CXXFLAGS="$CXXFLAGS -O0"
|
|
+ CFLAGS="$CFLAGS"
|
|
+ CXXFLAGS="$CXXFLAGS"
|
|
fi
|
|
|
|
|