Commit dc650bdd authored by Sam Lantinga's avatar Sam Lantinga

Updated libtool from version 1.5.22 to 2.2.6a, so it works on current QNX

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403551
parent 160fe5bc
...@@ -139,7 +139,7 @@ clean: ...@@ -139,7 +139,7 @@ clean:
distclean: clean distclean: clean
rm -f Makefile include/SDL_config.h sdl-config rm -f Makefile include/SDL_config.h sdl-config
rm -f SDL.qpg rm -f SDL.qpg
rm -f config.status config.cache config.log libtool $(depend) rm -f config.status config.cache config.log $(LIBTOOL) $(depend)
rm -rf $(srcdir)/autom4te* rm -rf $(srcdir)/autom4te*
find $(srcdir) \( \ find $(srcdir) \( \
-name '*~' -o \ -name '*~' -o \
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(README) AC_INIT(README)
AC_CONFIG_HEADER(include/SDL_config.h) AC_CONFIG_HEADER(include/SDL_config.h)
AC_GNU_SOURCE AC_GNU_SOURCE
AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
dnl Set various version strings - taken gratefully from the GTk sources dnl Set various version strings - taken gratefully from the GTk sources
# #
...@@ -29,6 +30,8 @@ AC_SUBST(SDL_BINARY_AGE) ...@@ -29,6 +30,8 @@ AC_SUBST(SDL_BINARY_AGE)
AC_SUBST(SDL_VERSION) AC_SUBST(SDL_VERSION)
# libtool versioning # libtool versioning
LT_INIT([win32-dll])
LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE` LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
LT_REVISION=$SDL_INTERFACE_AGE LT_REVISION=$SDL_INTERFACE_AGE
...@@ -40,7 +43,6 @@ AC_SUBST(LT_REVISION) ...@@ -40,7 +43,6 @@ AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE) AC_SUBST(LT_AGE)
dnl Detect the canonical build and host environments dnl Detect the canonical build and host environments
AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_C_BIGENDIAN AC_C_BIGENDIAN
if test x$ac_cv_c_bigendian = xyes; then if test x$ac_cv_c_bigendian = xyes; then
...@@ -90,7 +92,6 @@ CFLAGS="$CFLAGS $EXTRA_CFLAGS" ...@@ -90,7 +92,6 @@ CFLAGS="$CFLAGS $EXTRA_CFLAGS"
LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
dnl Check for tools dnl Check for tools
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment