diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2005-04-24 18:33:26 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2005-04-24 18:33:26 +0000 |
| commit | 7cc2635652835ac44b980dfa16b14ab7215b5eec (patch) | |
| tree | ced666e637d98d6f00cbdc9cdf3516431cdeebc6 | |
| parent | df2f164ffcb82612341fff2545879c5aefcf05b8 (diff) | |
| download | weechat-7cc2635652835ac44b980dfa16b14ab7215b5eec.zip | |
wxWidgets CFLAGS & libs are used for wxWidgets GUI only
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | weechat/configure.in | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 18efaa9b7..ff7c9b288 100644 --- a/configure.in +++ b/configure.in @@ -39,11 +39,6 @@ AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0) AM_OPTIONS_WXCONFIG AM_PATH_WXCONFIG(2.3.4, wxWin=1) -CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" -CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" -CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" -LDFLAGS="$LDFLAGS $WX_LIBS" - # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h]) @@ -102,6 +97,12 @@ if test "x$enable_wxwidgets" = "xyes" ; then equivalent variable and wxWindows version is 2.3.4 or above. ]) fi + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + LDFLAGS="$LDFLAGS $WX_LIBS" + WXWIDGETS_CFLAGS="" WXWIDGETS_LIBS="" fi diff --git a/weechat/configure.in b/weechat/configure.in index 18efaa9b7..ff7c9b288 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -39,11 +39,6 @@ AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0) AM_OPTIONS_WXCONFIG AM_PATH_WXCONFIG(2.3.4, wxWin=1) -CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" -CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" -CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" -LDFLAGS="$LDFLAGS $WX_LIBS" - # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h]) @@ -102,6 +97,12 @@ if test "x$enable_wxwidgets" = "xyes" ; then equivalent variable and wxWindows version is 2.3.4 or above. ]) fi + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + LDFLAGS="$LDFLAGS $WX_LIBS" + WXWIDGETS_CFLAGS="" WXWIDGETS_LIBS="" fi |