Whole lot of stuff for new wxFileDialog

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 8726cdcf41dd568f18f7fd32df6a82b499a373a5..361250ba45c4bbc49550d98ad864493adc887ca2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1378,25 +1378,32 @@ WXGTK12=
 WXWINE=
 
 if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
-  AC_MSG_CHECKING(for Windows headers)
-  WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
-  INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+    AC_MSG_CHECKING(for Windows headers)
+    WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
   
-  dnl --- Quick & Dirty ; link against most/all libraries
-  dnl --- This will bloat the executable, but it'll work for now...
-  LIBS="$LIBS  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+    dnl --- Quick & Dirty ; link against most/all libraries
+    dnl --- This will bloat the executable, but it'll work for now...
+    LIBS="$LIBS  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
 
-  if test "$ac_find_includes" != "" ; then
-    AC_MSG_RESULT(found $ac_find_includes)
-    TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
-  else
-    AC_MSG_RESULT(no)
-    if test "$cross_compiling" != "yes" ; then
-      AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
-    fi  
-  fi
+    if test "$ac_find_includes" != "" ; then
+        AC_MSG_RESULT(found $ac_find_includes)
+        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+    else
+        AC_MSG_RESULT(no)
+        if test "$cross_compiling" != "yes" ; then
+            AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
+        fi  
+    fi
 
-  TOOLKIT=MSW
+    TOOLKIT=MSW
+    
+    GUIOBJS=MSW_GUIOBJS
+    GUIHEADERS=MSW_HEADERS
+    COMMONOBJS=MSW_COMMONOBJS
+    GENERICOBJS=MSW_GENERICOBJS
+    UNIXOBJS=
+    GUIDIST=MSW_DIST
 fi
 
 if test "$wxUSE_GTK" = 1; then
@@ -1408,13 +1415,15 @@ if test "$wxUSE_GTK" = 1; then
     fi
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
-    GUI_TK_LIBRARY="$GTK_LIBS"
+    GUI_TK_LIBRARY="$GTK_LIBS -ldl"
     TOOLKIT=GTK
   
     GUIOBJS=GTK_GUIOBJS
     GUIHEADERS=GTK_HEADERS
     COMMONOBJS=GTK_COMMONOBJS
     GENERICOBJS=GTK_GENERICOBJS
+    UNIXOBJS=UNIXOBJS
+    GUIDIST=GTK_DIST
 fi
 
 if test "$wxUSE_WINE" = 1; then
@@ -1456,6 +1465,13 @@ if test "$wxUSE_WINE" = 1; then
     GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
     WXWINE=1
     TOOLKIT=MSW
+    
+    GUIOBJS=MSW_GUIOBJS
+    GUIHEADERS=MSW_HEADERS
+    COMMONOBJS=MSW_COMMONOBJS
+    GENERICOBJS=MSW_GENERICOBJS
+    UNIXOBJS=UNIXOBJS
+    GUIDIST=MSW_DIST
 fi
 
 if test "$wxUSE_MOTIF" = 1; then
@@ -1526,6 +1542,8 @@ if test "$wxUSE_MOTIF" = 1; then
     GUIHEADERS=MOTIF_HEADERS
     COMMONOBJS=MOTIF_COMMONOBJS
     GENERICOBJS=MOTIF_GENERICOBJS
+    UNIXOBJS=UNIXOBJS
+    GUIDIST=MOTIF_DIST
 fi
 
 dnl the name of the directory where the files for this toolkit live
@@ -1617,8 +1635,12 @@ case "${host}" in
     SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
   ;;
   *-*-cygwin32* )
+    dnl only static for now
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
   ;;
   *-*-mingw32* )
+    dnl only static for now
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
   ;;
   *-pc-os2_emx )
   ;;
@@ -1772,6 +1794,7 @@ AC_CHECK_FUNCS(uname gethostname, break)
 dnl check for inet_addr, inet_aton, ...
 AC_CHECK_FUNCS(inet_addr)
 AC_CHECK_FUNCS(inet_aton)
+AC_CHECK_LIB(resolv, inet_aton)
 
 dnl ===========================================================================
 dnl Now we have all the info we need - use it!
@@ -2324,7 +2347,7 @@ fi
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
     if test "$wxUSE_GTK" = 1; then
         if test "$WXGTK12" != 1; then
-            AC_MSG_WARN([Drag and drop is only supported under wxGTK 2.1])
+            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
            wxUSE_DRAG_AND_DROP=no
         fi
     fi
@@ -2642,6 +2665,8 @@ AC_SUBST(GUIOBJS)
 AC_SUBST(GUIHEADERS)
 AC_SUBST(COMMONOBJS)
 AC_SUBST(GENERICOBJS)
+AC_SUBST(UNIXOBJS)
+AC_SUBST(GUIDIST)
 
 dnl additional subdirectories where we will build
 AC_SUBST(SRC_SUBDIRS)
@@ -2679,6 +2704,44 @@ AC_OUTPUT([
             samples/checklst/Makefile
             samples/config/Makefile
             samples/controls/Makefile
+           samples/dialogs/Makefile
+           samples/docview/Makefile
+           samples/docvwmdi/Makefile
+           samples/dnd/Makefile
+           samples/drawing/Makefile
+           samples/dynamic/Makefile
+           samples/image/Makefile
+           samples/layout/Makefile
+           samples/listctrl/Makefile
+           samples/mdi/Makefile
+           samples/minifram/Makefile
+           samples/minimal/Makefile
+           samples/notebook/Makefile
+            samples/printing/Makefile
+            samples/proplist/Makefile
+           samples/sashtest/Makefile
+           samples/scroll/Makefile
+           samples/splitter/Makefile
+           samples/text/Makefile
+           samples/thread/Makefile
+           samples/toolbar/Makefile
+           samples/treectrl/Makefile
+           samples/typetest/Makefile
+           samples/validate/Makefile
+           samples/wxpoem/Makefile
+           samples/wxsocket/Makefile
+           samples/html/Makefile
+           samples/html/about/Makefile
+           samples/html/help/Makefile
+           samples/html/printing/Makefile
+           samples/html/test/Makefile
+           samples/html/zip/Makefile
+           samples/html/virtual/Makefile
+           samples/html/widget/Makefile
+           utils/Makefile
+           utils/wxMMedia2/Makefile
+           utils/wxMMedia2/lib/Makefile
+           utils/wxMMedia2/sample/Makefile
           ],
           [
             chmod +x wx-config