Author: matt
Date: 2012-06-15 15:26:26 -0700 (Fri, 15 Jun 2012)
New Revision: 9617
Log:
Added comamnd line configuration variables.
Modified:
branches/branch-3.0/configure.in
branches/branch-3.0/fluid/file_make.cxx
branches/branch-3.0/makeinclude.in
Modified: branches/branch-3.0/configure.in
===================================================================
--- branches/branch-3.0/configure.in 2012-06-15 21:51:44 UTC (rev 9616)
+++ branches/branch-3.0/configure.in 2012-06-15 22:26:26 UTC (rev 9617)
@@ -832,6 +832,7 @@
LDFLAGS="-mwindows $LDFLAGS"
DSOFLAGS="-mwindows $DSOFLAGS"
LIBS="$LIBS -lole32 -luuid -lcomctl32"
+ CONNECTLIB="-lws2_32"
if test "x$with_optim" = x; then
dnl Avoid -Os optimization on Cygwin/MinGW
with_optim="-O3"
@@ -868,6 +869,7 @@
Darwin*)
# MacOS X uses Cocoa for graphics.
LIBS="$LIBS -framework Cocoa"
+ CONNECTLIB=
if test x$have_pthread = xyes; then
AC_DEFINE(HAVE_PTHREAD)
@@ -922,6 +924,7 @@
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
DSOFLAGS="$X_LIBS $DSOFLAGS"
+ CONNECTLIB=
AC_DEFINE(USE_X11)
if test "x$x_includes" != x; then
ac_cpp="$ac_cpp -I$x_includes"
@@ -1040,6 +1043,7 @@
AC_SUBST(GLDEMOS)
AC_SUBST(GLLIB)
+AC_SUBST(CONNECTLIB)
AC_SUBST(HLINKS)
AC_SUBST(OSX_ONLY)
AC_SUBST(THREADS)
Modified: branches/branch-3.0/fluid/file_make.cxx
===================================================================
--- branches/branch-3.0/fluid/file_make.cxx 2012-06-15 21:51:44 UTC (rev
9616)
+++ branches/branch-3.0/fluid/file_make.cxx 2012-06-15 22:26:26 UTC (rev
9617)
@@ -185,6 +185,7 @@
fprintf(out, "LDLIBS\t\t= @LIBS@\n");
fprintf(out, "GLLIB\t\t= @GLLIB@\n");
fprintf(out, "GLDLIBS\t\t= @GLLIB@ @LIBS@\n");
+ fprintf(out, "CONNECTLIB\t= @CONNECTLIB@\n");
for (tgt=Fl_Target_Type::first_target(workspace); tgt; tgt =
tgt->next_target(workspace)) {
if (tgt->is_lib_target() && tgt->builds_in(FL_ENV_MAKE)) {
@@ -1044,6 +1045,7 @@
fprintf(out, " LDFLAGS=\"-mwindows $LDFLAGS\"\n");
fprintf(out, " DSOFLAGS=\"-mwindows $DSOFLAGS\"\n");
fprintf(out, " LIBS=\"$LIBS -lole32 -luuid -lcomctl32\"\n");
+ fprintf(out, " CONNECTLIB=\"-lws2_32\"\n");
fprintf(out, " if test \"x$with_optim\" = x; then\n");
fprintf(out, " dnl Avoid -Os optimization on Cygwin/MinGW\n");
fprintf(out, " with_optim=\"-O3\"\n");
@@ -1080,6 +1082,7 @@
fprintf(out, " Darwin*)\n");
fprintf(out, " # MacOS X uses Cocoa for graphics.\n");
fprintf(out, " LIBS=\"$LIBS -framework Cocoa\"\n");
+ fprintf(out, " CONNECTLIB=\n");
fprintf(out, "\n");
fprintf(out, " if test x$have_pthread = xyes; then\n");
fprintf(out, " AC_DEFINE(HAVE_PTHREAD)\n");
@@ -1134,6 +1137,7 @@
fprintf(out, " CXXFLAGS=\"$CXXFLAGS $X_CFLAGS\"\n");
fprintf(out, " LDFLAGS=\"$X_LIBS $LDFLAGS\"\n");
fprintf(out, " DSOFLAGS=\"$X_LIBS $DSOFLAGS\"\n");
+ fprintf(out, " CONNECTLIB=\n");
fprintf(out, " AC_DEFINE(USE_X11)\n");
fprintf(out, " if test \"x$x_includes\" != x; then\n");
fprintf(out, " ac_cpp=\"$ac_cpp -I$x_includes\"\n");
@@ -1252,6 +1256,7 @@
fprintf(out, "\n");
fprintf(out, "AC_SUBST(GLDEMOS)\n");
fprintf(out, "AC_SUBST(GLLIB)\n");
+ fprintf(out, "AC_SUBST(CONNECTLIB)\n");
fprintf(out, "AC_SUBST(HLINKS)\n");
fprintf(out, "AC_SUBST(OSX_ONLY)\n");
fprintf(out, "AC_SUBST(THREADS)\n");
Modified: branches/branch-3.0/makeinclude.in
===================================================================
--- branches/branch-3.0/makeinclude.in 2012-06-15 21:51:44 UTC (rev 9616)
+++ branches/branch-3.0/makeinclude.in 2012-06-15 22:26:26 UTC (rev 9617)
@@ -96,6 +96,7 @@
LDLIBS = @LIBS@
GLLIB = @GLLIB@
GLDLIBS = @GLLIB@ @LIBS@
+CONNECTLIB = @CONNECTLIB@
LINK_FLTK3 = @LINK_FLTK3@
LINK_FLTK3GL = @LINK_FLTK3GL@
LINK_FLTK3IMAGES = @LINK_FLTK3IMAGES@
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
