summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2005-04-24 12:01:23 +0000
committerSebastien Helleu <flashcode@flashtux.org>2005-04-24 12:01:23 +0000
commitdf2f164ffcb82612341fff2545879c5aefcf05b8 (patch)
tree86c8c225ce1b16885152f1359438db068f0b3f1e
parenteb0b722ee54515405b7810e3f1e8c8b4c76c0501 (diff)
downloadweechat-df2f164ffcb82612341fff2545879c5aefcf05b8.zip
wxWidgets missing error is now displayed only if this frontend is selected with --enable-wxwidgets switch
-rw-r--r--configure.in27
-rw-r--r--weechat/configure.in27
2 files changed, 26 insertions, 28 deletions
diff --git a/configure.in b/configure.in
index c88a47bca..18efaa9b7 100644
--- a/configure.in
+++ b/configure.in
@@ -37,19 +37,7 @@ AM_GNU_GETTEXT
AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
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"
CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
@@ -103,8 +91,19 @@ if test "x$enable_ncurses" = "xyes" ; then
fi
if test "x$enable_wxwidgets" = "xyes" ; then
- WXWIDGETS_CFLAGS=""
- WXWIDGETS_LIBS=""
+ 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
+ WXWIDGETS_CFLAGS=""
+ WXWIDGETS_LIBS=""
fi
if test "x$enable_gtk" = "xyes" ; then
diff --git a/weechat/configure.in b/weechat/configure.in
index c88a47bca..18efaa9b7 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -37,19 +37,7 @@ AM_GNU_GETTEXT
AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
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"
CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
@@ -103,8 +91,19 @@ if test "x$enable_ncurses" = "xyes" ; then
fi
if test "x$enable_wxwidgets" = "xyes" ; then
- WXWIDGETS_CFLAGS=""
- WXWIDGETS_LIBS=""
+ 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
+ WXWIDGETS_CFLAGS=""
+ WXWIDGETS_LIBS=""
fi
if test "x$enable_gtk" = "xyes" ; then