diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
| commit | ae0a2bfdeb9ceacb80aa03375353039d425b14b9 (patch) | |
| tree | daec55145477bcec69273e03d5c9ff10c10a4137 /nxcompshad | |
| parent | cbe2c0e44f412d07024207f374c0f56684adb088 (diff) | |
| parent | 3b7e5a42f5abecb903a9d730d163d704520efb07 (diff) | |
| download | nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.gz nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.bz2 nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.zip | |
Merge branch 'sunweaver-pr/libnx-x11-autoreconf' into 3.6.x
Attributes GH PR #498: https://github.com/ArcticaProject/nx-libs/pull/498
Diffstat (limited to 'nxcompshad')
| -rw-r--r-- | nxcompshad/configure.ac | 2 | ||||
| -rw-r--r-- | nxcompshad/src/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nxcompshad/configure.ac b/nxcompshad/configure.ac index b3abf0efb..34b1c053c 100644 --- a/nxcompshad/configure.ac +++ b/nxcompshad/configure.ac @@ -42,7 +42,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_LANG([C++]) NX_COMPILER_BRAND -NX_COMPILER_FLAGS +NX_DEFAULT_OPTIONS AC_CONFIG_FILES([ Makefile diff --git a/nxcompshad/src/Makefile.am b/nxcompshad/src/Makefile.am index c7f45ba27..6d82dcd88 100644 --- a/nxcompshad/src/Makefile.am +++ b/nxcompshad/src/Makefile.am @@ -18,7 +18,7 @@ libXcompshad_la_LIBADD = \ @Xdamage_LIBS@ \ @Xrandr_LIBS@ \ @Xtst_LIBS@ \ - -L$(top_srcdir)/../nx-X11/exports/lib -lNX_X11 \ + -L$(top_srcdir)/../nx-X11/lib/src/.libs -lNX_X11 \ $(NULL) AM_CFLAGS = \ |