Build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index ca32d8ec6461a703bd795084baa93b437d82adff..5bc44734581e56cf16c0c5751c7bfd8a40fd7709 100755 (executable)
--- a/configure
+++ b/configure
@@ -6222,7 +6222,7 @@ fi
 
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__
-  WX_LINK=-lwx_gtk
+  WX_LINK=-lwx_gtk_1_0
   MAKEINCLUDE=../gtk.inc
 fi
 

diff --git a/configure.in b/configure.in
index 485adf3890ba95260845c31e6ea9d1b2defe23d6..1969a7a14120fb8ee5d52371a4f1012732a0465e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1021,7 +1021,7 @@ if test "$wxUSE_GTK" = 1; then
   ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4?))
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__
-  WX_LINK=-lwx_gtk
+  WX_LINK=-lwx_gtk_1_0
   MAKEINCLUDE=../gtk.inc
 fi
 

diff --git a/wx-config.in b/wx-config.in
index 824644d48b9739d0f927456b7ef5617a723c8588..601f173a5080fb7fa1e08fd20a20b388adf8533f 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -46,7 +46,7 @@ while test $# -gt 0; do
       echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@
       ;;
     --libs)
-      echo -L@libdir@ -lwx_gtk @DL_LIBRARY@ @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@
+      echo -L@libdir@ -lwx_gtk_1_0 @DL_LIBRARY@ @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@
       ;;
     *)
       echo "${usage}" 1>&2