diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2011-01-09 10:56:38 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-01-09 10:56:38 -0800 |
| commit | 13ba98b4ae9ae1c81daa50145c5018b0439e73b4 (patch) | |
| tree | f768251aabdbdf70acde81e831067fa571b5c886 | |
| parent | 994e6da5758922032d51a6881020742fd1ed20c5 (diff) | |
| download | ofono-13ba98b4ae9ae1c81daa50145c5018b0439e73b4.tar.bz2 | |
build: Fix the CDMA modem autoconf/automake mess
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 4c9fd8ec..eb160019 100644 --- a/Makefile.am +++ b/Makefile.am @@ -245,10 +245,9 @@ conf_DATA += plugins/phonesim.conf endif endif -if CDMA_ATMODEM -builtin_modules += cdma_atmodem -builtin_sources += drivers/cdmamodem/cdmamodem.h \ - drivers/cdmamodem/cdmamodem.c +if CDMAMODEM +builtin_modules += cdmamodem +builtin_sources += drivers/cdmamodem/cdmamodem.h drivers/cdmamodem/cdmamodem.c endif builtin_modules += g1 diff --git a/configure.ac b/configure.ac index 2a260406..c33780f8 100644 --- a/configure.ac +++ b/configure.ac @@ -158,10 +158,10 @@ AC_ARG_ENABLE(atmodem, AC_HELP_STRING([--disable-atmodem], [enable_atmodem=${enableval}]) AM_CONDITIONAL(ATMODEM, test "${enable_atmodem}" != "no") -AC_ARG_ENABLE(cdmaatmodem, AC_HELP_STRING([--disable-cdmamodem], +AC_ARG_ENABLE(cdmamodem, AC_HELP_STRING([--disable-cdmamodem], [disable CDMA AT modem support]), - [enable_cdma_atmodem=${enableval}]) -AM_CONDITIONAL(CDMA_ATMODEM, test "${enable_cdma_atmodem}" != "no") + [enable_cdmamodem=${enableval}]) +AM_CONDITIONAL(CDMAMODEM, test "${enable_cdmamodem}" != "no") AC_ARG_ENABLE(phonesim, AC_HELP_STRING([--disable-phonesim], [disable Phone simulator support]), |