removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor

[wxWidgets.git] / contrib / configure.in

diff --git a/contrib/configure.in b/contrib/configure.in
index c35f135d478b61f7d75f8461d100cef91d35897d..6f4a0d0b82c424a67eafd811b3afa8eba68cd3fb 100644 (file)
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -3,6 +3,12 @@ AC_REVISION($Id$)dnl
 
 AC_INIT(Makefile.in)
 
+dnl we need the values the main configure determined for us, so refuse
+dnl to run if we don't have them
+if test "x$wx_cv_path_ifs" = "x"; then
+    AC_MSG_ERROR([Please run configure from the top level directory.])
+fi
+
 dnl ---------------
 dnl MMedia specific
 dnl ---------------
@@ -26,11 +32,21 @@ dnl Final subst
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
 WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
+WX_LIBRARY_BASENAME=$wx_cv_library_basename
+WX_RELEASE=$wx_cv_release
+WX_CURRENT=$wx_cv_current
+WX_REVISION=$wx_cv_revision
+WX_AGE=$wx_cv_age
 
 AC_SUBST(PATH_IFS)
 AC_SUBST(ESD_LINK)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_TARGET_LIBRARY_TYPE)
+AC_SUBST(WX_LIBRARY_BASENAME)
+AC_SUBST(WX_RELEASE)
+AC_SUBST(WX_CURRENT)
+AC_SUBST(WX_REVISION)
+AC_SUBST(WX_AGE)
 
 dnl -----------
 dnl File output
@@ -38,31 +54,35 @@ dnl File output
 
 AC_OUTPUT([
             src/Makefile
+            src/deprecated/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
+            src/svg/Makefile       
             src/xrc/Makefile
-            src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
             src/applet/Makefile
             src/fl/Makefile
             src/net/Makefile
             samples/Makefile
+            samples/deprecated/Makefile
+            samples/deprecated/proplist/Makefile
+            samples/deprecated/resource/Makefile
+            samples/deprecated/treelay/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
+            samples/svg/Makefile
             samples/gizmos/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
             samples/gizmos/editlbox/Makefile
             samples/gizmos/dynsash/Makefile
             samples/gizmos/dynsash_switch/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
+            samples/gizmos/led/Makefile
             samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile