jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

neutirnordp: purge old freerdp modules from autoconf

Browse Source
This commit is contained in:
speidy 2013-08-24 18:19:45 +03:00
parent 8e76b68102
commit da7a005a59
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1,10 +1,5 @@
EXTRA_DIST = bootstrap COPYING design.txt faq-compile.txt faq-general.txt file-loc.txt install.txt prog_std.txt readme.txt EXTRA_DIST = bootstrap COPYING design.txt faq-compile.txt faq-general.txt file-loc.txt install.txt prog_std.txt readme.txt
if XRDP_FREERDP1
FREERDPDIR = freerdp1
else
FREERDPDIR =
endif
if XRDP_NEUTRINORDP if XRDP_NEUTRINORDP
NEUTRINORDPDIR = neutrinordp NEUTRINORDPDIR = neutrinordp
@ -24,7 +19,6 @@ SUBDIRS = \
rdp \ rdp \
xup \ xup \
mc \ mc \
$(FREERDPDIR) \
$(NEUTRINORDPDIR) \ $(NEUTRINORDPDIR) \
libxrdp \ libxrdp \
xrdp \ xrdp \

13
configure.ac
View File

@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script # Process this file with autoconf to produce a configure script
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([xrdp], [0.6.0], [xrdp-devel@lists.sourceforge.net]) AC_INIT([xrdp], [0.7.0], [xrdp-devel@lists.sourceforge.net])
AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in) AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
AM_INIT_AUTOMAKE([1.6 foreign]) AM_INIT_AUTOMAKE([1.6 foreign])
AC_PROG_CC AC_PROG_CC
@ -31,10 +31,6 @@ AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug],
[Build debug (default: no)]), [Build debug (default: no)]),
[xrdpdebug=true], [xrdpdebug=false]) [xrdpdebug=true], [xrdpdebug=false])
AM_CONDITIONAL(XRDP_DEBUG, [test x$xrdpdebug = xtrue]) AM_CONDITIONAL(XRDP_DEBUG, [test x$xrdpdebug = xtrue])
AC_ARG_ENABLE(freerdp1, AS_HELP_STRING([--enable-freerdp1],
[Build freerdp1 module (default: no)]),
[freerdp1=true], [freerdp1=false])
AM_CONDITIONAL(XRDP_FREERDP1, [test x$freerdp1 = xtrue])
AC_ARG_ENABLE(neutrinordp, AS_HELP_STRING([--enable-neutrinordp], AC_ARG_ENABLE(neutrinordp, AS_HELP_STRING([--enable-neutrinordp],
[Build neutrinordp module (default: no)]), [Build neutrinordp module (default: no)]),
[neutrinordp=true], [neutrinordp=false]) [neutrinordp=true], [neutrinordp=false])
@ -83,8 +79,6 @@ then
AC_DEFINE([USE_NOPAM],1,[Disable PAM]) AC_DEFINE([USE_NOPAM],1,[Disable PAM])
fi fi
AS_IF( [test "x$enable_freerdp1" = "xyes"] , [PKG_CHECK_MODULES(FREERDP, freerdp >= 1.0.0)] )
AS_IF( [test "x$enable_neutrinordp" = "xyes"] , [PKG_CHECK_MODULES(FREERDP, freerdp >= 1.0.0)] ) AS_IF( [test "x$enable_neutrinordp" = "xyes"] , [PKG_CHECK_MODULES(FREERDP, freerdp >= 1.0.0)] )
# checking for libjpeg # checking for libjpeg
@ -128,7 +122,6 @@ AC_CONFIG_FILES([Makefile
libxrdp/Makefile libxrdp/Makefile
xup/Makefile xup/Makefile
mc/Makefile mc/Makefile
freerdp1/Makefile
neutrinordp/Makefile neutrinordp/Makefile
xrdp/Makefile xrdp/Makefile
sesman/Makefile sesman/Makefile
@ -141,8 +134,8 @@ AC_CONFIG_FILES([Makefile
docs/man/Makefile docs/man/Makefile
instfiles/Makefile instfiles/Makefile
instfiles/pam.d/Makefile instfiles/pam.d/Makefile
instfiles/init.d/Makefile instfiles/init.d/Makefile
instfiles/default/Makefile instfiles/default/Makefile
genkeymap/Makefile genkeymap/Makefile
xrdpapi/Makefile xrdpapi/Makefile
xrdpvr/Makefile xrdpvr/Makefile

4
libxrdp/Makefile.am
View File

@ -11,8 +11,8 @@ else
EXTRA_DEFINES += -DXRDP_NODEBUG EXTRA_DEFINES += -DXRDP_NODEBUG
endif endif
if XRDP_FREERDP1 if XRDP_NEUTRINORDP
EXTRA_DEFINES += -DXRDP_FREERDP1 EXTRA_DEFINES += -DXRDP_NEUTRINORDP
EXTRA_LIBS += $(FREERDP_LIBS) EXTRA_LIBS += $(FREERDP_LIBS)
endif endif