projects / packages / megacmd.git / blame
| Commit | Line | Data |
|---|---|---|
| c0c97be5 ER |
1 | upstream: |
| 2 | - https://github.com/meganz/MEGAcmd/pull/128 | |
| 3 | - https://github.com/meganz/sdk/pull/1288 | |
| 4 | ||
| 8eb3178f ER |
5 | --- MEGAcmd-0.9.8/sdk/configure.ac~ 2018-03-17 22:07:36.000000000 +0200 |
| 6 | +++ MEGAcmd-0.9.8/sdk/configure.ac 2018-03-17 22:08:09.737558496 +0200 | |
| 7 | @@ -154,7 +154,8 @@ | |
| 8 | WIN32=no | |
| 9 | DARWIN=no | |
| 10 | ANDROID=no | |
| 11 | -AC_MSG_CHECKING([if building for Win32 platform]) | |
| 12 | +LINUX=no | |
| 13 | +AC_MSG_CHECKING([platform options]) | |
| 14 | case $host in | |
| 15 | *-*-cygwin*) | |
| 16 | LIBS_EXTRA="-luser32 -lkernel32" | |
| 17 | @@ -201,7 +201,10 @@ | |
| 18 | ;; | |
| 19 | *-android*) | |
| 20 | ANDROID=yes | |
| 21 | - ;; | |
| 22 | + ;; | |
| 23 | + *-linux*) | |
| 24 | + LINUX=yes | |
| 25 | + ;; | |
| 26 | *) | |
| 27 | LIBS_EXTRA="" | |
| 28 | ;; | |
| 29 | @@ -210,6 +213,7 @@ | |
| 30 | AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) | |
| 31 | AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"]) | |
| 32 | AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"]) | |
| 33 | +AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"]) | |
| 34 | ||
| 35 | AC_SUBST(LIBS_EXTRA) | |
| 36 | ||
| 37 | --- MEGAcmd-0.9.8/sdk/Makefile.am~ 2018-03-17 21:18:50.000000000 +0200 | |
| 38 | +++ MEGAcmd-0.9.8/sdk/Makefile.am 2018-03-17 21:18:53.815527745 +0200 | |
| 39 | @@ -42,6 +42,10 @@ | |
| 40 | AM_LIBTOOLFLAGS="--tag=CXX" | |
| 41 | endif | |
| 42 | ||
| 43 | +if LINUX | |
| 44 | +AM_LIBTOOLFLAGS="--tag=CXX" | |
| 45 | +endif | |
| 46 | + | |
| 47 | VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | |
| 48 | ||
| 49 | CLEANFILES= | |
| bceb490a ER |
50 | --- MEGAcmd-1.0.0/configure.ac~ 2018-09-27 10:53:46.000000000 +0300 |
| 51 | +++ MEGAcmd-1.0.0/configure.ac 2018-11-27 17:15:52.861941207 +0200 | |
| 52 | @@ -157,6 +157,7 @@ | |
| 53 | WIN32=no | |
| 54 | DARWIN=no | |
| 55 | ANDROID=no | |
| 56 | +LINUX=no | |
| 57 | AC_MSG_CHECKING([if building for Win32 platform]) | |
| 58 | case $host in | |
| 59 | *-*-cygwin*) | |
| 60 | @@ -176,6 +177,9 @@ | |
| 61 | *-android*) | |
| 62 | ANDROID=yes | |
| 63 | ;; | |
| 64 | + *-linux*) | |
| 65 | + LINUX=yes | |
| 66 | + ;; | |
| 67 | *) | |
| 68 | LIBS_EXTRA="" | |
| 69 | ;; | |
| 70 | @@ -184,9 +188,7 @@ | |
| 71 | AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) | |
| 72 | AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"]) | |
| 73 | AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"]) | |
| 74 | - | |
| 75 | - | |
| 76 | - | |
| 77 | +AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"]) | |
| 78 | ||
| 79 | SAVE_LDFLAGS=$LDFLAGS | |
| 80 | SAVE_CXXFLAGS=$CXXFLAGS | |
| 81 | --- megacmd/Makefile.am~ 2018-03-17 21:54:10.866756361 +0200 | |
| 82 | +++ megacmd/Makefile.am 2018-11-27 17:11:24.444491866 +0200 | |
| 83 | @@ -35,6 +35,10 @@ | |
| 84 | AM_LIBTOOLFLAGS="--tag=CXX" | |
| 85 | endif | |
| 86 | ||
| 87 | +if LINUX | |
| 88 | +AM_LIBTOOLFLAGS="--tag=CXX" | |
| 89 | +endif | |
| 90 | + | |
| 91 | VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | |
| 92 | ||
| 93 | CLEANFILES= |