(LINK_GXX_STATICALLY): strip -DSTRING_UTILS_INLINED options.

(reloc_b): excise --enable-framework-dir

diff --git a/ChangeLog b/ChangeLog
index b3cbb385177125877d56da166f30d24ae03a3958..596d3296ccdbf938919af5359ecbe82e77f46182 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-02-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * configure.in (LINK_GXX_STATICALLY): strip -DSTRING_UTILS_INLINED options.
+       (reloc_b): excise --enable-framework-dir 
 
        * lily/relocate.cc (framework_relocation): use getenv
        LILYPOND_GS_VERSION or -DGHOSTSCRIPT_VERSION to set GS version.

diff --git a/configure.in b/configure.in
index fbc4c47ee133c47ebd13ec2af2c03f365712c31c..7ca07e8c9d85bbe76b5ae536a39984619bd40b0b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,33 +34,17 @@ AC_ARG_ENABLE(gui,
     [gui_b=$enableval])
 
 
-
-
 NCSB_DIR=unknown
 AC_ARG_WITH(ncsb-dir,
 [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts
                             Default: detect with locate(1)],
     [NCSB_DIR=$withval])
 
-
 reloc_b=no
 AC_ARG_ENABLE(relocation,
     [  --enable-relocation     compile with dynamic relocation.  Default: off],
     [reloc_b=$enableval])
 
-FRAMEWORKDIR=".."
-AC_ARG_WITH(framework-dir,
-    [  --with-framework-dir=DIR
-                          relative location of framework],[
-       if test "$withval" = "yes" -o "$withval" = "no"; then
-           AC_MSG_WARN(Usage: --with-framework-dir=../lib/FRAMEWORK/DIR)
-       else
-           FRAMEWORKDIR="${withval}"
-           LDFLAGS="$LDFLAGS -Wl,--rpath,'\$\${ORIGIN}/$FRAMEWORKDIR/lib'"
-       fi
-       ])
-AC_DEFINE_UNQUOTED(FRAMEWORKDIR, ["${FRAMEWORKDIR}"])
-
 LINK_GXX_STATICALLY=no
 AC_ARG_ENABLE(static-gxx,
     [  --enable-static-gxx     link libstdc++.a statically. Default: off],