From 0f1bc9c21b3b72f2bf3deb6276c3480e452804eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 10 Aug 2003 16:17:55 +0000 Subject: [PATCH] wxMac compilation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 176 ++++++++++++++++++++++++++++------------------------ configure | 22 ++++++- 2 files changed, 116 insertions(+), 82 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2d273b0165..fc9f5fd1dd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -298,7 +298,8 @@ BASEDLL_OBJECTS = \ basedll_fs_mem.o \ basedll_msgout.o \ basedll_utilscmn.o \ - $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) + $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \ + $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2) BASELIB_CFLAGS = $(__baselib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ @@ -363,7 +364,8 @@ BASELIB_OBJECTS = \ baselib_fs_mem.o \ baselib_msgout.o \ baselib_utilscmn.o \ - $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) + $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \ + $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3) COREDLL_CFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ @@ -380,6 +382,7 @@ COREDLL_OBJECTS = \ coredll_msgout.o \ coredll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \ + $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \ $(__CORE_SRC_OBJECTS_2) CORELIB_CFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ @@ -395,6 +398,7 @@ CORELIB_OBJECTS = \ corelib_msgout.o \ corelib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \ + $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \ $(__CORE_SRC_OBJECTS_3) DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ @@ -545,6 +549,7 @@ MONODLL_OBJECTS = \ monodll_msgout.o \ monodll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) \ + $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS) \ monodll_fs_inet.o \ monodll_ftp.o \ monodll_http.o \ @@ -623,6 +628,7 @@ MONOLIB_OBJECTS = \ monolib_msgout.o \ monolib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) \ + $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1) \ monolib_fs_inet.o \ monolib_ftp.o \ monolib_http.o \ @@ -1973,6 +1979,18 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_UNIX_1@ = corelib_utilsunx.o @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \ @COND_PLATFORM_WIN32_1@ = corelib_main.o corelib_mslu.o corelib_volume.o +@COND_TOOLKIT_MSW@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = \ +@COND_TOOLKIT_MSW@ monodll_utils.o monodll_utilsexc.o +@COND_TOOLKIT_MSW@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_MSW@ monolib_utils.o monolib_utilsexc.o +@COND_TOOLKIT_MSW@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_MSW@ basedll_utils.o basedll_utilsexc.o +@COND_TOOLKIT_MSW@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_MSW@ baselib_utils.o baselib_utilsexc.o +@COND_TOOLKIT_MSW@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = \ +@COND_TOOLKIT_MSW@ coredll_utils.o coredll_utilsexc.o +@COND_TOOLKIT_MSW@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = \ +@COND_TOOLKIT_MSW@ corelib_utils.o corelib_utilsexc.o COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dir.o \ @@ -1987,13 +2005,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \ monodll_snglinst.o \ monodll_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS) -COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \ - monodll_dirmac.o \ - monodll_mimetmac.o \ - monodll_utils.o \ - monodll_utilsexc.o \ - monodll_baseunix.o -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS) +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = \ +@COND_TOOLKIT_MAC@ monodll_dirmac.o monodll_mimetmac.o monodll_baseunix.o COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dir.o \ @@ -2008,13 +2021,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_snglinst.o \ monolib_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1) -COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \ - monolib_dirmac.o \ - monolib_mimetmac.o \ - monolib_utils.o \ - monolib_utilsexc.o \ - monolib_baseunix.o -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1) +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_MAC@ monolib_dirmac.o monolib_mimetmac.o monolib_baseunix.o COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dir.o \ @@ -2029,13 +2037,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_snglinst.o \ basedll_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2) -COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \ - basedll_dirmac.o \ - basedll_mimetmac.o \ - basedll_utils.o \ - basedll_utilsexc.o \ - basedll_baseunix.o -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2) +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_MAC@ basedll_dirmac.o basedll_mimetmac.o basedll_baseunix.o COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dir.o \ @@ -2050,13 +2053,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_snglinst.o \ baselib_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3) -COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \ - baselib_dirmac.o \ - baselib_mimetmac.o \ - baselib_utils.o \ - baselib_utilsexc.o \ - baselib_baseunix.o -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3) +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_MAC@ baselib_dirmac.o baselib_mimetmac.o baselib_baseunix.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ @@ -5783,16 +5781,20 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_odbcdll @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_odbclib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ = install_odbclib -@COND_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname = install_wxexpat -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = install_wxjpeg -@COND_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname = install_wxodbc -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = install_wxpng -@COND_WXUSE_REGEX_BUILTIN@__install_wxregex___depname = install_wxregex -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = install_wxtiff -@COND_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname = install_wxzlib +@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \ +@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ = install_wxexpat +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \ +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = install_wxjpeg +@COND_SHARED_0_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname \ +@COND_SHARED_0_WXUSE_ODBC_BUILTIN@ = install_wxodbc +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname \ +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = install_wxpng +@COND_SHARED_0_WXUSE_REGEX_BUILTIN@__install_wxregex___depname \ +@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ = install_wxregex +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \ +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = install_wxtiff +@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname \ +@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ = install_wxzlib @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll @COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib @COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r @@ -6487,8 +6489,8 @@ basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp basedll_unzip.o: $(srcdir)/src/common/unzip.c $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utils.o: $(srcdir)/src/mac/utils.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW@basedll_utils.o: $(srcdir)/src/mac/utils.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6499,8 +6501,8 @@ basedll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_PLATFORM_WIN32_1@basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW@basedll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6762,8 +6764,8 @@ baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp baselib_unzip.o: $(srcdir)/src/common/unzip.c $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utils.o: $(srcdir)/src/mac/utils.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW@baselib_utils.o: $(srcdir)/src/mac/utils.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6774,8 +6776,8 @@ baselib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_PLATFORM_WIN32_1@baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW@baselib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -8808,6 +8810,9 @@ coredll_uma.o: $(srcdir)/src/mac/uma.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/motif/utils.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW@coredll_utils.o: $(srcdir)/src/mac/utils.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/cocoa/utils.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8817,8 +8822,11 @@ coredll_uma.o: $(srcdir)/src/mac/uma.cpp coredll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@coredll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -10868,6 +10876,9 @@ corelib_uma.o: $(srcdir)/src/mac/uma.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/motif/utils.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW@corelib_utils.o: $(srcdir)/src/mac/utils.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/cocoa/utils.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10877,8 +10888,11 @@ corelib_uma.o: $(srcdir)/src/mac/uma.cpp corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@corelib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11310,33 +11324,33 @@ install-wxconfig: @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir) -@COND_WXUSE_EXPAT_BUILTIN@install_wxexpat: -@COND_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@install_wxexpat: +@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) -@COND_WXUSE_ODBC_BUILTIN@install_wxodbc: -@COND_WXUSE_ODBC_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_WXUSE_ODBC_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_ODBC_BUILTIN@install_wxodbc: +@COND_SHARED_0_WXUSE_ODBC_BUILTIN@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0_WXUSE_ODBC_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng: -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng: +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) -@COND_WXUSE_REGEX_BUILTIN@install_wxregex: -@COND_WXUSE_REGEX_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_WXUSE_REGEX_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_REGEX_BUILTIN@install_wxregex: +@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff: -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff: +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) -@COND_WXUSE_ZLIB_BUILTIN@install_wxzlib: -@COND_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@install_wxzlib: +@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) @COND_MONOLITHIC_0_SHARED_1@install_xmldll: @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(libdir) @@ -13718,8 +13732,8 @@ monodll_url.o: $(srcdir)/src/common/url.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utils.o: $(srcdir)/src/mac/utils.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW@monodll_utils.o: $(srcdir)/src/mac/utils.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13736,8 +13750,8 @@ monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW@monodll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -16237,8 +16251,8 @@ monolib_url.o: $(srcdir)/src/common/url.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utils.o: $(srcdir)/src/mac/utils.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW@monolib_utils.o: $(srcdir)/src/mac/utils.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16255,8 +16269,8 @@ monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW@monolib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< diff --git a/configure b/configure index 0fcf7af82d..7b021e92bd 100755 --- a/configure +++ b/configure @@ -312,7 +312,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all src/expat" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1661,6 +1661,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0 PROGRAM_EXT= SO_SUFFIX=so SAMPLES_RPATH_FLAG= +SAMPLES_RPATH_POSTLINK= case "${host}" in *-hp-hpux* ) @@ -25345,6 +25346,13 @@ echo "${ECHO_T}$wx_cv_version_script" >&6 case "${host}" in *-*-linux* | *-*-gnu* ) SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" + SAMPLES_RPATH_POSTLINK="\"libnames=\`cd \$(LIBDIRNAME) ; ls -1 | grep '\.so\.[0-9][0-9]*\$'\` ; \\\\ +inst_cmd='install_name_tool ' ; \\\\ +for i in \$libnames ; do \\\\ + inst_cmd=\"\$inst_cmd -change \$(prefix)/lib/\\$i \$(LIBDIRNAME)/\\$i\" ; \\\\ +done ; \\\\ +echo \$inst_cmd\"" + ;; *-*-solaris2* ) @@ -25450,6 +25458,16 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; + + powerpc-*-darwin* ) + SAMPLES_RPATH_POSTLINK="libnames=\`cd \$(LIBDIRNAME) ; ls -1 | grep '\.so\.0-90-9*\$'\` ; \\ +inst_cmd='install_name_tool ' ; \\ +for i in \$libnames ; do \\ + inst_cmd=\"\$inst_cmd -change \$(prefix)/lib/\\$i \$(LIBDIRNAME)/\\$i\" ; \\ +done ; \\ +echo \$inst_cmd " + ;; + esac if test "x$WX_TARGET_LIBRARY" = "x"; then @@ -33950,6 +33968,7 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]` + if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then if test -n "$ac_tool_prefix"; then @@ -36326,6 +36345,7 @@ s,@SHARED@,$SHARED,;t t s,@TOOLKIT_LOWERCASE@,$TOOLKIT_LOWERCASE,;t t s,@TOOLKIT_VERSION@,$TOOLKIT_VERSION,;t t s,@SAMPLES_RPATH_FLAG@,$SAMPLES_RPATH_FLAG,;t t +s,@SAMPLES_RPATH_POSTLINK@,$SAMPLES_RPATH_POSTLINK,;t t s,@HOST_SUFFIX@,$HOST_SUFFIX,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@MAKE_SET@,$MAKE_SET,;t t -- 2.45.2