Author: dylan
Date: 2004-10-10 12:36:51 -0400 (Sun, 10 Oct 2004)
New Revision: 370
Added:
branches/wxhaver-autotools/Makefile.am
branches/wxhaver-autotools/aclocal/
branches/wxhaver-autotools/aclocal/wxwin.m4
branches/wxhaver-autotools/configure.ac
branches/wxhaver-autotools/src/Makefile.am
Modified:
branches/wxhaver-autotools/
branches/wxhaver-autotools/src/wxHaver.h
Log:
build system seems to work.
Had to remove a comma at the end of an enumeration in
wxHaver.h
Property changes on: branches/wxhaver-autotools
___________________________________________________________________
Name: svn:ignore
- configure
Makefile.in
config.log
config.status
autom4te.cache
aclocal.m4
Makefile
+
Added: branches/wxhaver-autotools/Makefile.am
===================================================================
--- branches/wxhaver-autotools/Makefile.am 2004-10-10 16:00:57 UTC (rev
369)
+++ branches/wxhaver-autotools/Makefile.am 2004-10-10 16:36:51 UTC (rev
370)
@@ -0,0 +1,5 @@
+
+
+AUTOMAKE_OPTIONS = 1.7
+SUBDIRS = src
+EXTRA_DIST = config aclocal
Added: branches/wxhaver-autotools/aclocal/wxwin.m4
===================================================================
--- branches/wxhaver-autotools/aclocal/wxwin.m4 2004-10-10 16:00:57 UTC (rev
369)
+++ branches/wxhaver-autotools/aclocal/wxwin.m4 2004-10-10 16:36:51 UTC (rev
370)
@@ -0,0 +1,200 @@
+dnl ---------------------------------------------------------------------------
+dnl Macros for wxWindows detection. Typically used in configure.in as:
+dnl
+dnl AC_ARG_ENABLE(...)
+dnl AC_ARG_WITH(...)
+dnl ...
+dnl AM_OPTIONS_WXCONFIG
+dnl ...
+dnl ...
+dnl AM_PATH_WXCONFIG(2.3.4, wxWin=1)
+dnl if test "$wxWin" != 1; then
+dnl AC_MSG_ERROR([
+dnl wxWindows must be installed on your system
+dnl but wx-config script couldn't be found.
+dnl
+dnl Please check that wx-config is in path, the directory
+dnl where wxWindows libraries are installed (returned by
+dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl equivalent variable and wxWindows version is 2.3.4 or above.
+dnl ])
+dnl fi
+dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl ---------------------------------------------------------------------------
+
+dnl ---------------------------------------------------------------------------
+dnl AM_OPTIONS_WXCONFIG
+dnl
+dnl adds support for --wx-prefix, --wx-exec-prefix and --wx-config
+dnl command line options
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AM_OPTIONS_WXCONFIG,
+[
+ AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWindows
is installed (optional)],
+ wx_config_prefix="$withval", wx_config_prefix="")
+ AC_ARG_WITH(wx-exec-prefix,[ --with-wx-exec-prefix=PREFIX Exec prefix
where wxWindows is installed (optional)],
+ wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
+ AC_ARG_WITH(wx-config,[ --with-wx-config=CONFIG wx-config script to use
(optional)],
+ wx_config_name="$withval", wx_config_name="")
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Test for wxWindows, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
+dnl (the latter is for static linking against wxWindows). Set WX_CONFIG_NAME
+dnl environment variable to override the default name of the wx-config script
+dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
+dnl case the macro won't even waste time on tests for its existence.
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl Get the cflags and libraries from the wx-config script
+dnl
+AC_DEFUN(AM_PATH_WXCONFIG,
+[
+ dnl do we have wx-config name: it can be wx-config or wxd-config or ...
+ if test x${WX_CONFIG_NAME+set} != xset ; then
+ WX_CONFIG_NAME=wx-config
+ fi
+ if test "x$wx_config_name" != x ; then
+ WX_CONFIG_NAME="$wx_config_name"
+ fi
+
+ dnl deal with optional prefixes
+ if test x$wx_config_exec_prefix != x ; then
+ wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
+ WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
+ fi
+ if test x$wx_config_prefix != x ; then
+ wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
+ WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
+ fi
+
+ dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
+ if test -x "$WX_CONFIG_NAME" ; then
+ AC_MSG_CHECKING(for wx-config)
+ WX_CONFIG_PATH="$WX_CONFIG_NAME"
+ AC_MSG_RESULT($WX_CONFIG_PATH)
+ else
+ AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
+ fi
+
+ if test "$WX_CONFIG_PATH" != "no" ; then
+ WX_VERSION=""
+ no_wx=""
+
+ min_wx_version=ifelse([$1], ,2.2.1,$1)
+ AC_MSG_CHECKING(for wxWindows version >= $min_wx_version)
+
+ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
+
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version`
+ wx_config_major_version=`echo $WX_VERSION | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ wx_config_minor_version=`echo $WX_VERSION | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ wx_config_micro_version=`echo $WX_VERSION | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+ wx_requested_major_version=`echo $min_wx_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ wx_requested_minor_version=`echo $min_wx_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ wx_requested_micro_version=`echo $min_wx_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+ wx_ver_ok=""
+ if test $wx_config_major_version -gt $wx_requested_major_version; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_major_version -eq $wx_requested_major_version; then
+ if test $wx_config_minor_version -gt $wx_requested_minor_version; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_minor_version -eq $wx_requested_minor_version;
then
+ if test $wx_config_micro_version -ge
$wx_requested_micro_version; then
+ wx_ver_ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+
+ if test "x$wx_ver_ok" = x ; then
+ no_wx=yes
+ else
+ WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+ WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
+
+ dnl starting with version 2.2.6 wx-config has --cppflags argument
+ wx_has_cppflags=""
+ if test $wx_config_major_version -gt 2; then
+ wx_has_cppflags=yes
+ else
+ if test $wx_config_major_version -eq 2; then
+ if test $wx_config_minor_version -gt 2; then
+ wx_has_cppflags=yes
+ else
+ if test $wx_config_minor_version -eq 2; then
+ if test $wx_config_micro_version -ge 6; then
+ wx_has_cppflags=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+
+ if test "x$wx_has_cppflags" = x ; then
+ dnl no choice but to define all flags like CFLAGS
+ WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+ WX_CPPFLAGS=$WX_CFLAGS
+ WX_CXXFLAGS=$WX_CFLAGS
+
+ WX_CFLAGS_ONLY=$WX_CFLAGS
+ WX_CXXFLAGS_ONLY=$WX_CFLAGS
+ else
+ dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
+ WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
+ WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
+ WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+
+ WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "[EMAIL PROTECTED] *@@"`
+ WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "[EMAIL PROTECTED] *@@"`
+ fi
+ fi
+
+ if test "x$no_wx" = x ; then
+ AC_MSG_RESULT(yes (version $WX_VERSION))
+ ifelse([$2], , :, [$2])
+ else
+ if test "x$WX_VERSION" = x; then
+ dnl no wx-config at all
+ AC_MSG_RESULT(no)
+ else
+ AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
+ fi
+
+ WX_CFLAGS=""
+ WX_CPPFLAGS=""
+ WX_CXXFLAGS=""
+ WX_LIBS=""
+ WX_LIBS_STATIC=""
+ ifelse([$3], , :, [$3])
+ fi
+ fi
+
+ AC_SUBST(WX_CPPFLAGS)
+ AC_SUBST(WX_CFLAGS)
+ AC_SUBST(WX_CXXFLAGS)
+ AC_SUBST(WX_CFLAGS_ONLY)
+ AC_SUBST(WX_CXXFLAGS_ONLY)
+ AC_SUBST(WX_LIBS)
+ AC_SUBST(WX_LIBS_STATIC)
+ AC_SUBST(WX_VERSION)
+])
Added: branches/wxhaver-autotools/configure.ac
===================================================================
--- branches/wxhaver-autotools/configure.ac 2004-10-10 16:00:57 UTC (rev
369)
+++ branches/wxhaver-autotools/configure.ac 2004-10-10 16:36:51 UTC (rev
370)
@@ -0,0 +1,53 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.56)
+
+AC_INIT(wxhaver, 0.01)
+AC_CONFIG_AUX_DIR(config)
+AM_INIT_AUTOMAKE(1.7)
+AC_CONFIG_SRCDIR(src/wxHaver.cpp)
+AM_CONFIG_HEADER(src/config.h)
+
+# Checks for programs.
+AC_PROG_CXX
+
+
+
+# Checks for libraries.
+
+AM_OPTIONS_WXCONFIG
+AM_PATH_WXCONFIG(2.3.4, wxWin=1)
+if test "$wxWin" != 1; then
+ AC_MSG_ERROR([
+ wxWindows must be installed on your system
+ but wx-config script couldn't be found.
+
+ Please check that wx-config is in path, the directory
+ where wxWindows libraries are installed (returned by
+ 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+ equivalent variable and wxWindows version is 2.3.4 or above.
+ ])
+fi
+
+
+CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS -Wall -pedantic"
+CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -Wall -pedantic"
+CFLAGS="$CFLAGS $WX_CFLAGS_ONLY -Wall -pedantic"
+
+LDFLAGS="$LDFLAGS $WX_LIBS"
+
+
+# Checks for header files.
+#AC_HEADER_STDBOOL
+
+# Checks for typedefs, structures, and compiler characteristics.
+#AC_C_CONST
+
+
+# Checks for library functions.
+
+# Fin
+
+AC_OUTPUT([Makefile src/Makefile])
+
Added: branches/wxhaver-autotools/src/Makefile.am
===================================================================
--- branches/wxhaver-autotools/src/Makefile.am 2004-10-10 16:00:57 UTC (rev
369)
+++ branches/wxhaver-autotools/src/Makefile.am 2004-10-10 16:36:51 UTC (rev
370)
@@ -0,0 +1,2 @@
+bin_PROGRAMS = wxhaver
+wxhaver_SOURCES = wxHaver.cpp wxHaver.h wxh_includes.h
Modified: branches/wxhaver-autotools/src/wxHaver.h
===================================================================
--- branches/wxhaver-autotools/src/wxHaver.h 2004-10-10 16:00:57 UTC (rev
369)
+++ branches/wxhaver-autotools/src/wxHaver.h 2004-10-10 16:36:51 UTC (rev
370)
@@ -38,5 +38,5 @@
enum {
WH_ID_Quit = 1,
- WH_CTRL_ServerSplitter,
+ WH_CTRL_ServerSplitter /* Must not have comma at end of enum. */
};
