[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
-AC_ARG_WITH(gtk-prefix,[**--with-gtk-prefix=PFX Prefix where GTK is installed],
+AC_ARG_WITH(gtk-prefix,[**--with-gtk-prefix=PFX Prefix where GTK is installed],
gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[**--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed],
+AC_ARG_WITH(gtk-exec-prefix,[**--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed],
gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
if test x$gtk_config_exec_prefix != x ; then
DEFAULT_USE_LIBPNG=1
DEFAULT_USE_ODBC=1
+DEFAULT_USE_COMBOBOX=1
DEFAULT_USE_GAUGE=1
DEFAULT_USE_SCROLLBAR=1
DEFAULT_USE_LISTCTRL=1
**--with-gauge use wxGauge class,
USE_GAUGE)
+AC_OVERRIDES(combobox,combobox,
+**--with-combobox use wxComboBox class,
+USE_COMBOBOX)
+
AC_OVERRIDES(scrollbar,scrollbar,
**--with-scrollbar use wxScrollbar class,
USE_SCROLLBAR)
AC_DEFINE_UNQUOTED(USE_GAUGE,$USE_GAUGE)
fi
+if test "$USE_COMBOBOX" = 1 ; then
+ AC_DEFINE_UNQUOTED(USE_COMBOBOX,$USE_COMBOBOX)
+fi
+
if test "$USE_SCROLLBAR" = 1 ; then
AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
fi
echo $OS >> system.list
AC_CONFIG_HEADER(./include/wx/gtk/setup.h:./setup/setup.hin)
-AC_OUTPUT(./setup/substit,./setup/general/createall)
+AC_OUTPUT(./setup/substit ./wx-config:./wx-config.in,./setup/general/createall)
AC_OVERRIDES_DONE