compilation fix

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index d3f5bdc94a7ec77ff564245a58f60ab33d42af97..9a9b0e2c882eb9376b00fe92dd1e22b7fcfb24c8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1522,7 +1522,12 @@ if test "$wxUSE_GTK" = 1; then
     COMMONDEPS="\$(GTK_COMMONDEPS)"
     GENERICDEPS="\$(GTK_GENERICDEPS)"
     UNIXOBJS="\$(UNIX_OBJS)"
     COMMONDEPS="\$(GTK_COMMONDEPS)"
     GENERICDEPS="\$(GTK_GENERICDEPS)"
     UNIXOBJS="\$(UNIX_OBJS)"

+    UNIXDEPS="\$(UNIX_DEPS)"

     GUIDIST=GTK_DIST
     GUIDIST=GTK_DIST

+
+dnl test for XIM support in libgdk
+AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
+

 fi
 
 if test "$wxUSE_WINE" = 1; then
 fi
 
 if test "$wxUSE_WINE" = 1; then


@@ -1573,6 +1578,7 @@ if test "$wxUSE_WINE" = 1; then
     COMMONDEPS="\$(MSW_COMMONDEPS)"
     GENERICDEPS="\$(MSW_GENERICDEPS)"
     UNIXOBJS="\$(UNIX_OBJS)"
     COMMONDEPS="\$(MSW_COMMONDEPS)"
     GENERICDEPS="\$(MSW_GENERICDEPS)"
     UNIXOBJS="\$(UNIX_OBJS)"

+    UNIXDEPS="\$(UNIX_DEPS)"

     GUIDIST=MSW_DIST
 fi
 
     GUIDIST=MSW_DIST
 fi
 


@@ -1673,6 +1679,7 @@ if test "$wxUSE_MOTIF" = 1; then
     COMMONDEPS="\$(MOTIF_COMMONDEPS)"
     GENERICDEPS="\$(MOTIF_GENERICDEPS)"
     UNIXOBJS="\$(UNIX_OBJS)"
     COMMONDEPS="\$(MOTIF_COMMONDEPS)"
     GENERICDEPS="\$(MOTIF_GENERICDEPS)"
     UNIXOBJS="\$(UNIX_OBJS)"

+    UNIXDEPS="\$(UNIX_DEPS)"

     GUIDIST=MOTIF_DIST
 fi
 
     GUIDIST=MOTIF_DIST
 fi
 


@@ -1686,7 +1693,19 @@ dnl the name of the (libtool) library
 WX_LIBRARY="wx_${TOOLKIT_DIR}"
 
     dnl the sources, their dependenices and the headers
 WX_LIBRARY="wx_${TOOLKIT_DIR}"
 
     dnl the sources, their dependenices and the headers

-    ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(TIFFOBJS) \$(PNGOBJS) \$(ZLIBOBJS) \$(IODBCOBJS)"
+    ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)"
+    if test "$wxUSE_LIBJPEG" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"  
+    fi
+    if test "$wxUSE_LIBTIFF" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
+    fi
+    if test "$wxUSE_LIBPNG" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
+    fi
+    if test "$wxUSE_ZLIB" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+    fi

     ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
     ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
 else
     ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
     ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
 else


@@ -1720,6 +1739,7 @@ SHARED_LD=
 PIC_FLAG=
 WX_ALL=
 WX_ALL_INSTALLED=
 PIC_FLAG=
 WX_ALL=
 WX_ALL_INSTALLED=

+BURNT_LIBRARY_NAME=

 
 if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in
 
 if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in


@@ -1739,6 +1759,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         PIC_FLAG="-fPIC"
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
         PIC_FLAG="-fPIC"
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"

+       dnl BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}"

       ;;
       *-*-irix5* | *-*-irix6* )
         if test "$GCC" = yes ; then
       ;;
       *-*-irix5* | *-*-irix6* )
         if test "$GCC" = yes ; then


@@ -1960,6 +1981,9 @@ if test "$USE_UNIX" = 1; then
 dnl check for vfork() (even if it's the same as fork() in modern Unices)
 AC_CHECK_FUNCS(vfork)
 
 dnl check for vfork() (even if it's the same as fork() in modern Unices)
 AC_CHECK_FUNCS(vfork)
 

+dnl check for timegm() used by datetime.cpp
+AC_CHECK_FUNCS(timegm)
+

 POSIX4_LINK=
 AC_CHECK_FUNCS(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), [
     AC_CHECK_LIB(posix4, nanosleep, [
 POSIX4_LINK=
 AC_CHECK_FUNCS(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), [
     AC_CHECK_LIB(posix4, nanosleep, [


@@ -1985,7 +2009,7 @@ AC_CHECK_FUNCS(inet_addr,
     AC_DEFINE(HAVE_INET_ADDR),
     [
         AC_CHECK_LIB(nsl, inet_addr,
     AC_DEFINE(HAVE_INET_ADDR),
     [
         AC_CHECK_LIB(nsl, inet_addr,

-            INET_LINK="nsl",          
+            INET_LINK="nsl",

             AC_CHECK_LIB(resolv, inet_addr,
                 INET_LINK="resolv"
             )
             AC_CHECK_LIB(resolv, inet_addr,
                 INET_LINK="resolv"
             )


@@ -2066,6 +2090,8 @@ fi
 
 dnl do other tests only if we are using threads
 if test "$wxUSE_THREADS" = "yes" ; then
 
 dnl do other tests only if we are using threads
 if test "$wxUSE_THREADS" = "yes" ; then

+  AC_CHECK_FUNCS(thr_setconcurrency)
+

   dnl define autoconf macro to check for given function in both pthread and
   dnl posix4 libraries
   dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)
   dnl define autoconf macro to check for given function in both pthread and
   dnl posix4 libraries
   dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)


@@ -2942,6 +2968,14 @@ if test "$wxUSE_PNM" = "yes" ; then
   AC_DEFINE(wxUSE_PNM)
 fi
 
   AC_DEFINE(wxUSE_PNM)
 fi
 

+dnl ---------------------------------------------------------------------------
+dnl get the string with OS info - used by wxGetOsDescription()
+dnl ---------------------------------------------------------------------------
+
+OSINFO=`uname -s -r -m`
+OSINFO="\"$OSINFO\""
+AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
+

 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------


@@ -2974,6 +3008,8 @@ EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
 CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
 CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
 CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
 CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 

+LDFLAGS="$LDFLAGS $PROFILE"
+

 if test "$wxUSE_GUI" = "yes"; then
     dnl TODO add checks that these samples will really compile (i.e. all the
     dnl      library features they need are present)
 if test "$wxUSE_GUI" = "yes"; then
     dnl TODO add checks that these samples will really compile (i.e. all the
     dnl      library features they need are present)


@@ -3013,6 +3049,7 @@ AC_SUBST(WX_ALL_INSTALLED)
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
 AC_SUBST(DEP_INFO_FLAGS)
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
 AC_SUBST(DEP_INFO_FLAGS)

+AC_SUBST(BURNT_LIBRARY_NAME)

 
 dnl debugging options
 AC_SUBST(WXDEBUG_DEFINE)
 
 dnl debugging options
 AC_SUBST(WXDEBUG_DEFINE)


@@ -3047,7 +3084,8 @@ AC_SUBST(DOCS_SUBDIRS)
 AC_SUBST(SAMPLES_SUBDIRS)
 AC_SUBST(USER_SUBDIRS)
 
 AC_SUBST(SAMPLES_SUBDIRS)
 AC_SUBST(USER_SUBDIRS)
 

-dnl additional libraries
+dnl additional libraries and linker settings
+AC_SUBST(LDFLAGS)

 AC_SUBST(EXTRA_LIBS)
 AC_SUBST(LIBS)
 AC_SUBST(LD_LIBS)
 AC_SUBST(EXTRA_LIBS)
 AC_SUBST(LIBS)
 AC_SUBST(LD_LIBS)