diff options
| author | metalefty <meta@vmeta.jp> | 2022-05-28 17:01:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 17:01:22 +0300 |
| commit | 55215cf2716e2915632e6d250fb08d1a53e3e5d0 (patch) | |
| tree | 74bc383418769aada9796e501241a6ef559c32a4 | |
| parent | ab4daf4064177e2701341c53791460aae10b67a7 (diff) | |
| parent | a275c1de926f2974b037a4232225105cdfe54cbf (diff) | |
Merge pull request #2275 from metalefty/ulalaca
Add ulalaca
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rwxr-xr-x | bootstrap | 5 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| m--------- | ulalaca | 0 |
5 files changed, 23 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 5962601a..66ec2efd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,6 @@ url = https://github.com/neutrinolabs/libpainter.git branch = . ignore = untracked +[submodule "ulalaca"] + path = ulalaca + url = https://github.com/neutrinolabs/ulalaca-xrdp.git diff --git a/Makefile.am b/Makefile.am index f6c598e9..7e724f34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,12 @@ else RFXCODECDIR = endif +if XRDP_ULALACA +ULALACADIR = ulalaca +else +ULALACADIR = +endif + SUBDIRS = \ common \ vnc \ @@ -58,6 +64,7 @@ SUBDIRS = \ xrdpapi \ pkgconfig \ $(XRDPVRDIR) \ + $(ULALACADIR) \ tests \ tools @@ -38,4 +38,9 @@ then git submodule update --init librfxcodec fi +if ! test -f ulalaca/Makefile.am +then + git submodule update --init ulalaca +fi + autoreconf -fvi diff --git a/configure.ac b/configure.ac index 59df494e..895319b9 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,7 @@ AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in) AM_INIT_AUTOMAKE([1.7.2 foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC +AC_PROG_CXX AC_C_CONST AC_PROG_LIBTOOL @@ -133,6 +134,12 @@ AC_ARG_ENABLE(neutrinordp, AS_HELP_STRING([--enable-neutrinordp], [Build neutrinordp module (default: no)]), [], [enable_neutrinordp=no]) AM_CONDITIONAL(XRDP_NEUTRINORDP, [test x$enable_neutrinordp = xyes]) + +AC_ARG_ENABLE(ulalaca, AS_HELP_STRING([--enable-ulalaca], + [Build ulalaca module (experimental) (default: no)]), + [], [enable_ulalaca=no]) +AM_CONDITIONAL(XRDP_ULALACA, [test x$enable_ulalaca = xyes]) + AC_ARG_ENABLE(jpeg, AS_HELP_STRING([--enable-jpeg], [Build jpeg module (default: no)]), [], [enable_jpeg=no]) @@ -500,6 +507,7 @@ AC_CONFIG_FILES([ Makefile mc/Makefile neutrinordp/Makefile + ulalaca/Makefile pkgconfig/Makefile pkgconfig/xrdp.pc pkgconfig/xrdp-uninstalled.pc diff --git a/ulalaca b/ulalaca new file mode 160000 +Subproject f683d173a3feaa41c170d4d9ab572bdb60c03d7 |