diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-21 06:32:16 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-21 06:32:16 -0700 |
| commit | f8978af7bf5b45287181df05f5c3b0bed2804544 (patch) | |
| tree | bfe96e4c95c909e247c2f9c0bd2de51452aeded8 | |
| parent | f57fafe1d14010961048da5cbf86fe8bda2cd9d0 (diff) | |
glib: Really force static only building
Making --enable-static --disable-shared the default fixes most cases,
but build environments often pass --enable-shared --disable-static for
all autotooled projects. Force static building by setting the
appropriate variables as if they've come from the command line
parameters.
| -rw-r--r-- | glib-patches/static-only.patch | 17 | ||||
| -rw-r--r-- | glib/configure.ac | 7 |
2 files changed, 16 insertions, 8 deletions
diff --git a/glib-patches/static-only.patch b/glib-patches/static-only.patch index 6148bd2..319774b 100644 --- a/glib-patches/static-only.patch +++ b/glib-patches/static-only.patch @@ -1,13 +1,16 @@ diff --git a/glib/configure.ac b/glib/configure.ac -index 160f57d..a78d516 100644 +index 67fa762..5495c75 100644 --- a/glib/configure.ac +++ b/glib/configure.ac -@@ -498,7 +498,7 @@ esac +@@ -485,6 +485,11 @@ case $with_libiconv in + ;; + esac ++dnl Ensure we do a static-only build. This really only matters on Windows, ++dnl but it's safer to do it for all platforms. ++enable_static=yes ++enable_shared=no ++ dnl Initialize libtool LT_PREREQ([2.2]) --LT_INIT([disable-static win32-dll]) -+LT_INIT([disable-shared win32-dll]) - dnl when using libtool 2.x create libtool early, because it's used in configure - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - + LT_INIT([disable-static win32-dll]) diff --git a/glib/configure.ac b/glib/configure.ac index 8ac9631..5495c75 100644 --- a/glib/configure.ac +++ b/glib/configure.ac @@ -485,9 +485,14 @@ case $with_libiconv in ;; esac +dnl Ensure we do a static-only build. This really only matters on Windows, +dnl but it's safer to do it for all platforms. +enable_static=yes +enable_shared=no + dnl Initialize libtool LT_PREREQ([2.2]) -LT_INIT([disable-shared win32-dll]) +LT_INIT([disable-static win32-dll]) dnl when using libtool 2.x create libtool early, because it's used in configure m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) |