1. make install/uninstall seems to work

2. setup.h will be automatically updated/recreated when needed (due to
   automake stupidness I have to create the real setup.h in the top level
   build directory now)
3. wx-config --cflags gives -I@prefix@/include only once, not twice

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index fea2eb04d0fea4df155823683052bc9612660713..b0fa21b776bb1e3d1075608c941053a4511812b7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -752,10 +752,6 @@ dnl install checks
 dnl   defines INSTALL with the appropriate command
 AC_PROG_INSTALL
 
 dnl   defines INSTALL with the appropriate command
 AC_PROG_INSTALL
 

-dnl does ln -s works
-dnl   defines LN_S with the appropriate command
-AC_PROG_LN_S
-

 dnl strip command
 dnl   defines STRIP as strip or nothing if not found
 AC_CHECK_PROG(STRIP, strip, strip, true)
 dnl strip command
 dnl   defines STRIP as strip or nothing if not found
 AC_CHECK_PROG(STRIP, strip, strip, true)


@@ -807,6 +803,9 @@ dnl   defines LEX_OUTPUT_ROOT as to the base of the
 dnl                           filename output by the lexer
 AM_PROG_LEX
 
 dnl                           filename output by the lexer
 AM_PROG_LEX
 

+dnl needed for making link to setup.h
+AC_PROG_LN_S
+

 dnl libtool checks (disable static libs by default, this takes too much time...)
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 dnl libtool checks (disable static libs by default, this takes too much time...)
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL


@@ -1930,9 +1929,11 @@ AC_SUBST(EXTRA_LIBS)
 AC_SUBST(LIBS)
 
 dnl create the configuration header file from the template
 AC_SUBST(LIBS)
 
 dnl create the configuration header file from the template

-SETUPH_DIR=include/wx/${TOOLKIT_DIR}
-AC_SUBST(SETUPH_DIR)
-AM_CONFIG_HEADER(${SETUPH_DIR}/setup.h:include/wx/unix/setup.h.in)
+dnl
+dnl NB: automake can't work correctly if our header lives in a directory which
+dnl     is only determined at configure time, so we create it on the top-level
+dnl     and make a link to allow '#include "wx/setup.h"' to still work
+AM_CONFIG_HEADER(setup.h:include/wx/unix/setup.h.in)

 
 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
 dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am
 
 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
 dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am


@@ -2004,9 +2005,13 @@ AC_OUTPUT([
           ],
           [
             chmod +x wx-config
           ],
           [
             chmod +x wx-config

+            if test ! -e include/wx/${TOOLKIT_DIR}/setup.h; then
+              ${LN_S} `pwd`/setup.h include/wx/${TOOLKIT_DIR}/setup.h
+            fi

           ],
           [
           ],
           [

-            SETUPH_DIR=${SETUPH_DIR}
+            LN_S="${ac_cv_prog_LN_S}"
+            TOOLKIT_DIR="${TOOLKIT_DIR}"

           ]
          )
 
           ]
          )
 

diff --git a/samples/Makefile.am b/samples/Makefile.am
index 049d87056efdc42eba933f52802cef06cf43e1dc..d119098a496c9267995b4a451c2c60251c8aded4 100644 (file)
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -8,8 +8,17 @@
 SUBDIRS = minimal \
  @SAMPLES_SUBDIRS@
 
 SUBDIRS = minimal \
  @SAMPLES_SUBDIRS@
 

-# do nothing during "make install" in the samples subdirectory (can't override
-# install because install-recursive is its dependency which is still built)
+# do nothing during "make [un]install" in the samples subdirectory (can't
+# override install because install-recursive is its dependency which is still
+# built)
+#
+# this results in warnings from make about "overriding commands for garget
+# install-recursive", but it's more than compensated by the time we gain by not
+# entering/leaving all samples directories (but if somebody has a better
+# solution it would be welcome!)

 install-recursive:
        @true
 
 install-recursive:
        @true
 

+uninstall-recursive:
+       @true
+

diff --git a/wx-config.in b/wx-config.in
index 6b59a40106dac92c33afc013ffa10fe97cfaa3d0..884eb80b1abd016ecb21f006c496e19abba2d7e6 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -44,7 +44,7 @@ while test $# -gt 0; do
           includes=-I@includedir@
         fi
       fi
           includes=-I@includedir@
         fi
       fi

-      includes="$includes -I@includedir@ -I@datadir@/@PACKAGE@/include"
+      includes="$includes -I@datadir@/@PACKAGE@/include"

       echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
       ;;
     --libs)
       echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
       ;;
     --libs)