comparison configure @ 5724:ede80ef92a74

Make soft links in src for module source files, if built in to the executable. This ensures that those files are built with the same compiler flags as all other source files. See these xemacs-beta messages: <CAHCOHQn+q=Xuwq+y68dvqi7afAP9f-TdB7=8YiZ8VYO816sjHg@mail.gmail.com> <f5by5ejqiyk.fsf@calexico.inf.ed.ac.uk>
author Jerry James <james@xemacs.org>
date Sat, 02 Mar 2013 14:32:37 -0700
parents dede3f658f8e
children 1af0602ff9a2
comparison
equal deleted inserted replaced
5722:fffa15138019 5724:ede80ef92a74
15214 15214
15215 fi 15215 fi
15216 done 15216 done
15217 15217
15218 LIBS="$save_LIBS" 15218 LIBS="$save_LIBS"
15219 MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
15220 need_modules_common=yes
15221 if test "$with_modules" = "yes"; then 15219 if test "$with_modules" = "yes"; then
15220 MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
15222 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi 15221 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
15222 else
15223 mkdir src
15224 for fil in eldap.c eldap.h; do
15225 ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil"
15226 done
15223 fi 15227 fi
15224 fi 15228 fi
15225 15229
15226 15230
15227 postgresql_libs= 15231 postgresql_libs=
15386 cat >>confdefs.h <<_ACEOF 15390 cat >>confdefs.h <<_ACEOF
15387 #define LIBPQ_FE_H_FILE "$libpq_fe_h_file" 15391 #define LIBPQ_FE_H_FILE "$libpq_fe_h_file"
15388 _ACEOF 15392 _ACEOF
15389 15393
15390 postgresql_libs="$pq_libs $postgresql_libs" && if test "$verbose" = "yes"; then echo " Prepending \"$pq_libs\" to \$postgresql_libs"; fi 15394 postgresql_libs="$pq_libs $postgresql_libs" && if test "$verbose" = "yes"; then echo " Prepending \"$pq_libs\" to \$postgresql_libs"; fi
15391 MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
15392 need_modules_common=yes
15393 if test "$with_modules" = "yes"; then 15395 if test "$with_modules" = "yes"; then
15396 MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
15394 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi 15397 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
15398 else
15399 mkdir src
15400 for fil in postgresql.c postgresql.h; do
15401 ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil"
15402 done
15395 fi 15403 fi
15396 elif test "$with_postgresql" = "yes"; then 15404 elif test "$with_postgresql" = "yes"; then
15397 { echo "Error:" "Required PostgreSQL support cannot be provided. Check --with-site-prefixes." >&2; exit 1; } 15405 { echo "Error:" "Required PostgreSQL support cannot be provided. Check --with-site-prefixes." >&2; exit 1; }
15398 fi 15406 fi
15399 fi 15407 fi
17429 if test "$have_canna" = "yes"; then 17437 if test "$have_canna" = "yes"; then
17430 $as_echo "#define HAVE_CANNA 1" >>confdefs.h 17438 $as_echo "#define HAVE_CANNA 1" >>confdefs.h
17431 17439
17432 test -n "$canna_wchar_aware" && $as_echo "#define CANNA_NEW_WCHAR_AWARE 1" >>confdefs.h 17440 test -n "$canna_wchar_aware" && $as_echo "#define CANNA_NEW_WCHAR_AWARE 1" >>confdefs.h
17433 17441
17434 MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi
17435 need_modules_common=yes
17436 if test "$with_modules" = "yes"; then 17442 if test "$with_modules" = "yes"; then
17443 MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi
17437 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi 17444 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
17445 else
17446 mkdir src
17447 ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c"
17438 fi 17448 fi
17439 canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi 17449 canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi
17440 elif test "$with_canna" != "no"; then 17450 elif test "$with_canna" != "no"; then
17441 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Canna configuration failed. If you expected success, 17451 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Canna configuration failed. If you expected success,
17442 maybe you need --with-site-prefixes=/usr/local/canna?" >&5 17452 maybe you need --with-site-prefixes=/usr/local/canna?" >&5