VC++ compilation correction; doc file corrections

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 419be3c0b66b72a2f1c696becb3814284388d0e6..3a2e876435b8347d212b302f33f4195ecde79d71 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -916,6 +916,13 @@ if test "$wxUSE_UNIX" = 1 ; then
   AC_DEFINE(__UNIX__)
 fi
 
   AC_DEFINE(__UNIX__)
 fi
 

+dnl ----------------------------------------------------------------
+dnl Linux: test for libc5/glibc2: glibc2 has gettext() included
+dnl ----------------------------------------------------------------
+if test "$USE_LINUX" = 1; then
+       AC_CHECK_LIB(c,gettext,AC_DEFINE(wxHAVE_GLIBC2))
+fi
+

 dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------


@@ -1006,11 +1013,11 @@ if test "$wxUSE_MOTIF" = 1; then
      AC_MSG_ERROR(no)
   fi
   
      AC_MSG_ERROR(no)
   fi
   

-  GUI_TK_LINK="-lXm -lXmu -lXt -lXpm -lX11 -lm"
-  GUI_TK_LINK="$CHECK_LINK $GUI_TK_LINK"
+  GUI_TK_LINK="-lXm -lXpm -lXmu -lXt -lX11 -lm"
+  GUI_TK_LIBRARY="$CHECK_LIB $GUI_TK_LINK"

   TOOLKIT=MOTIF
   TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"
   TOOLKIT=MOTIF
   TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"

-  WX_LINK=-lwx_motif
+  WX_LINK=-lwx_motif2

   MAKEINCLUDE=../motif.inc
 fi
 
   MAKEINCLUDE=../motif.inc
 fi
 


@@ -1033,6 +1040,8 @@ dnl ----------------------------------------------------------------
 dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 

+EXTRA_LINK=
+

 WXDEBUG=
 if test "$wxUSE_DEBUG_GDB" = 1 ; then
   wxUSE_DEBUG_INFO=1
 WXDEBUG=
 if test "$wxUSE_DEBUG_GDB" = 1 ; then
   wxUSE_DEBUG_INFO=1


@@ -1043,7 +1052,7 @@ else
     WXDEBUG="-g"
     wxUSE_OPTIMISE=0
   else
     WXDEBUG="-g"
     wxUSE_OPTIMISE=0
   else

-    WX_LINK="-s $WX_LINK"
+    EXTRA_LINK="-s $EXTRA_LINK"

   fi
 fi
 AC_SUBST(WXDEBUG)
   fi
 fi
 AC_SUBST(WXDEBUG)


@@ -1062,7 +1071,6 @@ if test "$wxUSE_MEM_TRACING" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_GLOBAL_MEMORY_OPERATORS,$wxUSE_MEM_TRACING)
 fi
 
   AC_DEFINE_UNQUOTED(wxUSE_GLOBAL_MEMORY_OPERATORS,$wxUSE_MEM_TRACING)
 fi
 

-EXTRA_LINK=

 if test "$wxUSE_DMALLOC" = 1 ; then
   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 if test "$wxUSE_DMALLOC" = 1 ; then
   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi