2000-05-20 13:35:35 +00:00
|
|
|
--- configure.in.orig Sun Apr 23 07:59:54 2000
|
|
|
|
+++ configure.in Sun Apr 23 08:04:06 2000
|
|
|
|
@@ -1974,16 +1974,12 @@
|
|
|
|
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
|
1999-06-26 19:33:20 +00:00
|
|
|
|
2000-01-16 19:13:32 +00:00
|
|
|
dnl the name of the shared library
|
|
|
|
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
2000-05-20 13:35:35 +00:00
|
|
|
-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
2000-01-16 19:13:32 +00:00
|
|
|
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
|
2000-05-20 13:35:35 +00:00
|
|
|
+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
|
1999-09-19 20:05:41 +00:00
|
|
|
|
2000-01-16 19:13:32 +00:00
|
|
|
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"
|
2000-05-20 13:35:35 +00:00
|
|
|
-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"
|
2000-01-16 19:13:32 +00:00
|
|
|
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
|
2000-05-20 13:35:35 +00:00
|
|
|
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
|
1999-09-19 20:05:41 +00:00
|
|
|
|
2000-01-16 19:13:32 +00:00
|
|
|
dnl shared library settings
|
1999-09-19 20:05:41 +00:00
|
|
|
SHARED_LD=
|
2000-05-20 13:35:35 +00:00
|
|
|
@@ -3645,8 +3641,6 @@
|
2000-01-16 19:13:32 +00:00
|
|
|
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)
|
|
|
|
|
2000-05-20 13:35:35 +00:00
|
|
|
dnl global gl options
|
|
|
|
@@ -3656,8 +3650,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)
|
|
|
|
|
2000-01-16 19:13:32 +00:00
|
|
|
dnl are we supposed to create the links?
|
2000-05-20 13:35:35 +00:00
|
|
|
AC_SUBST(WX_ALL)
|