projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed DoInit() straggler from appbase mods.
[wxWidgets.git]
/
samples
/
configure.in
diff --git
a/samples/configure.in
b/samples/configure.in
index cdc5666e245040c8beb1be9fc4ec397af2f426d2..46bb5016efbb46d32fc093fe2d04834507275332 100644
(file)
--- a/
samples/configure.in
+++ b/
samples/configure.in
@@
-3,19
+3,30
@@
AC_REVISION($Id$)dnl
AC_INIT(Makefile.in)
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)
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
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(PATH_IFS)
AC_SUBST(PROGRAM_EXT)
AC_SUBST(WX_TARGET_LIBRARY)
+AC_SUBST(WX_TARGET_LIBRARY_GL)
AC_OUTPUT([
Makefile
AC_OUTPUT([
Makefile
+ artprov/Makefile
caret/Makefile
calendar/Makefile
checklst/Makefile
caret/Makefile
calendar/Makefile
checklst/Makefile
@@
-31,6
+42,8
@@
AC_OUTPUT([
dragimag/Makefile
drawing/Makefile
dynamic/Makefile
dragimag/Makefile
drawing/Makefile
dynamic/Makefile
+ erase/Makefile
+ event/Makefile
exec/Makefile
font/Makefile
grid/Makefile
exec/Makefile
font/Makefile
grid/Makefile
@@
-39,6
+52,7
@@
AC_OUTPUT([
internat/Makefile
ipc/Makefile
joytest/Makefile
internat/Makefile
ipc/Makefile
joytest/Makefile
+ keyboard/Makefile
layout/Makefile
listctrl/Makefile
mdi/Makefile
layout/Makefile
listctrl/Makefile
mdi/Makefile
@@
-46,21
+60,24
@@
AC_OUTPUT([
memcheck/Makefile
minifram/Makefile
minimal/Makefile
memcheck/Makefile
minifram/Makefile
minimal/Makefile
+ mobile/Makefile
+ mobile/wxedit/Makefile
+ mobile/styles/Makefile
newgrid/Makefile
notebook/Makefile
newgrid/Makefile
notebook/Makefile
- plot/Makefile
png/Makefile
printing/Makefile
proplist/Makefile
propsize/Makefile
png/Makefile
printing/Makefile
proplist/Makefile
propsize/Makefile
- richedit/Makefile
resource/Makefile
rotate/Makefile
sashtest/Makefile
scroll/Makefile
scrollsub/Makefile
resource/Makefile
rotate/Makefile
sashtest/Makefile
scroll/Makefile
scrollsub/Makefile
+ sockets/Makefile
splitter/Makefile
statbar/Makefile
splitter/Makefile
statbar/Makefile
+ taskbar/Makefile
text/Makefile
thread/Makefile
toolbar/Makefile
text/Makefile
thread/Makefile
toolbar/Makefile
@@
-68,7
+85,7
@@
AC_OUTPUT([
treelay/Makefile
typetest/Makefile
validate/Makefile
treelay/Makefile
typetest/Makefile
validate/Makefile
-
sock
ets/Makefile
+
widg
ets/Makefile
wizard/Makefile
html/Makefile
html/about/Makefile
wizard/Makefile
html/Makefile
html/about/Makefile