diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2004-08-12 16:18:45 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2004-08-12 16:18:45 +0000 |
| commit | 6a4c20067612717286e9c85f06705ff509fcc6c8 (patch) | |
| tree | 0932ca9277bbe5129bfd189e2e31d057284f5146 | |
| parent | c9fc470995095031ac0469bad82eea94cd31468b (diff) | |
Don't enable PIE or debug when --enable-all is specified
| -rw-r--r-- | acinclude.m4 | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4c23ccd1..f50253b7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -175,9 +175,15 @@ AC_DEFUN([AC_ARG_BLUEZ], [ hid2hci_enable=${usb_found} bcm203x_enable=no - AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all], [enable all extra options]), [ - pie_enable=${enableval} + AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [ debug_enable=${enableval} + ]) + + AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], [enable position independent executables flag]), [ + pie_enable=${enableval} + ]) + + AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all], [enable all extra options below]), [ dbus_enable=${enableval} test_enable=${enableval} cups_enable=${enableval} @@ -188,14 +194,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ bcm203x_enable=${enableval} ]) - AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], [enable position independent executables option]), [ - pie_enable=${enableval} - ]) - - AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [ - debug_enable=${enableval} - ]) - AC_ARG_ENABLE(dbus, AC_HELP_STRING([--enable-dbus], [enable D-BUS support]), [ dbus_enable=${enableval} ]) @@ -228,15 +226,15 @@ AC_DEFUN([AC_ARG_BLUEZ], [ bcm203x_enable=${enableval} ]) + if (test "${debug_enable}" = "yes" && test "${ac_cv_prog_cc_g}" = "yes"); then + CFLAGS="$CFLAGS -g" + fi + if (test "${pie_enable}" = "yes" && test "${ac_cv_prog_cc_pie}" = "yes"); then CFLAGS="$CFLAGS -fPIE" LDFLAGS="$LDFLAGS -pie" fi - if (test "${debug_enable}" = "yes" && test "${ac_cv_prog_cc_g}" = "yes"); then - CFLAGS="$CFLAGS -g" - fi - AM_CONDITIONAL(DBUS, test "${dbus_enable}" = "yes" && test "${dbus_found}" = "yes") AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") |