diff options
| author | Malcolm Tredinnick <malcolm@src.gnome.org> | 2004-01-25 12:30:09 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm@src.gnome.org> | 2004-01-25 12:30:09 +0000 |
| commit | ef3e21ee571b0c03ca6898ecbe30d4e5db619c3a (patch) | |
| tree | a739d86fb613185b77c88d4b5be889dd0ea0c200 | |
| parent | 4a6afff62941c5862d6dae3d04f7311b2afeeb9d (diff) | |
| download | gnome-common-ef3e21ee571b0c03ca6898ecbe30d4e5db619c3a.tar.gz | |
Deprecate the use of GNOME2_DIR and allow the use of GNOME2_PATH (bug
* autogen.sh: Deprecate the use of GNOME2_DIR and allow the use
of GNOME2_PATH (bug #130516).
svn path=/trunk/; revision=3435
| -rw-r--r-- | macros2/ChangeLog | 5 | ||||
| -rw-r--r-- | macros2/autogen.sh | 32 |
2 files changed, 27 insertions, 10 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index 4792a09..bcbbc5b 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,8 @@ +2004-01-25 Malcolm Tredinnick <malcolm@commsecure.com.au> + + * autogen.sh: Deprecate the use of GNOME2_DIR and allow the use + of GNOME2_PATH (bug #130516). + 2004-01-02 Malcolm Tredinnick <malcolm@commsecure.com.au> * autogen.sh: Run intltoolize after automake, since intltoolize diff --git a/macros2/autogen.sh b/macros2/autogen.sh index f98bc3d..a4a0070 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -20,16 +20,6 @@ REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0} REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-} -# if GNOME2_DIR set, modify ACLOCAL_FLAGS ... -if [ -n "$GNOME2_DIR" ]; then - ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" - LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" - PATH="$GNOME2_DIR/bin:$PATH" - export PATH - export LD_LIBRARY_PATH -fi - - # Not all echo versions allow -n, so we check what is possible. This test is # based on the one in autoconf. case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in @@ -38,6 +28,28 @@ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in *) ECHO_N= ;; esac +# if GNOME2_DIR or GNOME2_PATH is set, modify ACLOCAL_FLAGS ... +# NOTE: GNOME2_DIR is deprecated (as of Jan 2004), but is left here for +# backwards-compatibility. You should be using GNOME2_PATH, since that is also +# understood by libraries such as libgnome. +if [ -n "$GNOME2_DIR" ]; then + echo "Using GNOME2_DIR is deprecated in gnome-common." + echo "Please use GNOME2_PATH instead (for compatibility with other GNOME pieces)." + ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" + LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" + PATH="$GNOME2_DIR/bin:$PATH" + export PATH + export LD_LIBRARY_PATH +else + if [ -n "$GNOME2_PATH" ]; then + ACLOCAL_FLAGS="-I $GNOME2_PATH/share/aclocal $ACLOCAL_FLAGS" + LD_LIBRARY_PATH="$GNOME2_PATH/lib:$LD_LIBRARY_PATH" + PATH="$GNOME2_PATH/bin:$PATH" + export PATH + export LD_LIBRARY_PATH + fi +fi + # some terminal codes ... boldface="`tput bold 2>/dev/null`" normal="`tput sgr0 2>/dev/null`" |