67 lines
2.0 KiB
Plaintext
67 lines
2.0 KiB
Plaintext
--- configure.in.orig Sun Aug 20 17:52:52 2000
|
|
+++ configure.in Sat Aug 26 02:03:38 2000
|
|
@@ -1999,16 +1999,12 @@
|
|
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
|
|
|
|
dnl the name of the shared library
|
|
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
|
-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
|
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
|
|
+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
|
|
|
|
dnl the name of the links to the shared library
|
|
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
|
|
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
|
|
-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
|
|
-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
|
|
-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
|
|
-WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
|
|
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
|
|
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
|
|
|
|
dnl shared library settings
|
|
SHARED_LD=
|
|
@@ -2742,24 +2738,6 @@
|
|
fi
|
|
fi
|
|
|
|
-
|
|
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
|
|
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
|
|
-if test "$wxUSE_OPTIMISE" = "no" ; then
|
|
- OPTIMISE=
|
|
-else
|
|
- if test "$GCC" = yes ; then
|
|
- OPTIMISE="-O2"
|
|
- case "${host}" in
|
|
- i586-*-*|i686-*-* )
|
|
- OPTIMISE="${OPTIMISE} "
|
|
- ;;
|
|
- esac
|
|
- else
|
|
- OPTIMISE="-O"
|
|
- fi
|
|
-fi
|
|
-
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl Optional libraries
|
|
dnl ---------------------------------------------------------------------------
|
|
@@ -3784,8 +3762,6 @@
|
|
AC_SUBST(WX_LIBRARY)
|
|
AC_SUBST(WX_TARGET_LIBRARY)
|
|
AC_SUBST(WX_LIBRARY_LINK1)
|
|
-AC_SUBST(WX_LIBRARY_LINK2)
|
|
-AC_SUBST(WX_LIBRARY_LINK3)
|
|
AC_SUBST(PROGRAM_EXT)
|
|
|
|
dnl global gl options
|
|
@@ -3795,8 +3771,6 @@
|
|
AC_SUBST(WX_LIBRARY_GL)
|
|
AC_SUBST(WX_TARGET_LIBRARY_GL)
|
|
AC_SUBST(WX_LIBRARY_LINK1_GL)
|
|
-AC_SUBST(WX_LIBRARY_LINK2_GL)
|
|
-AC_SUBST(WX_LIBRARY_LINK3_GL)
|
|
|
|
dnl are we supposed to create the links?
|
|
AC_SUBST(WX_ALL)
|