X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..04f2e9905093281a35ce10b40366ab6047a313c2:/samples/configure.in diff --git a/samples/configure.in b/samples/configure.in index 94f8876d06..e412e8d77b 100644 --- a/samples/configure.in +++ b/samples/configure.in @@ -3,19 +3,30 @@ 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_samplesubdirs" = "x"; then + AC_MSG_ERROR([Please run configure from the top level directory.]) +fi + SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs AC_SUBST(SAMPLES_SUBDIRS) +IF_GNU_MAKE=$wx_cv_if_gnu_make PATH_IFS=$wx_cv_path_ifs PROGRAM_EXT=$wx_cv_program_ext WX_TARGET_LIBRARY=$wx_cv_target_library +WX_TARGET_LIBRARY_GL=$wx_cv_target_library_gl +AC_SUBST(IF_GNU_MAKE) AC_SUBST(PATH_IFS) AC_SUBST(PROGRAM_EXT) AC_SUBST(WX_TARGET_LIBRARY) +AC_SUBST(WX_TARGET_LIBRARY_GL) AC_OUTPUT([ Makefile + artprov/Makefile caret/Makefile calendar/Makefile checklst/Makefile @@ -31,6 +42,8 @@ AC_OUTPUT([ dragimag/Makefile drawing/Makefile dynamic/Makefile + erase/Makefile + event/Makefile exec/Makefile font/Makefile grid/Makefile @@ -39,27 +52,37 @@ AC_OUTPUT([ internat/Makefile ipc/Makefile joytest/Makefile + keyboard/Makefile layout/Makefile listctrl/Makefile mdi/Makefile menu/Makefile + memcheck/Makefile minifram/Makefile minimal/Makefile + mobile/Makefile + mobile/wxedit/Makefile + mobile/styles/Makefile + multimon/Makefile + nativedlg/Makefile newgrid/Makefile notebook/Makefile - plot/Makefile + oleauto/Makefile + ownerdrw/Makefile png/Makefile printing/Makefile proplist/Makefile propsize/Makefile - richedit/Makefile + regtest/Makefile resource/Makefile rotate/Makefile sashtest/Makefile scroll/Makefile scrollsub/Makefile + sockets/Makefile splitter/Makefile statbar/Makefile + taskbar/Makefile text/Makefile thread/Makefile toolbar/Makefile @@ -67,7 +90,7 @@ AC_OUTPUT([ treelay/Makefile typetest/Makefile validate/Makefile - sockets/Makefile + widgets/Makefile wizard/Makefile html/Makefile html/about/Makefile