Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / png / scripts / libpng-config-body.in

diff --git a/src/png/scripts/libpng-config-body.in b/src/png/scripts/libpng-config-body.in
index 8995df879bf40d0028fa37e1a591128c9a94bff9..b466432d54642032a192cee519fc15e35022ff4c 100755 (executable)
--- a/src/png/scripts/libpng-config-body.in
+++ b/src/png/scripts/libpng-config-body.in
@@ -6,14 +6,20 @@ Usage: libpng-config [OPTION] ...
 
 Known values for OPTION are:
 
 
 Known values for OPTION are:
 

-  --prefix              print libpng prefix
-  --libs                print library linking information
-  --cflags              print compiler flags
-  --cppflags            print pre-processor flags
-  --ldflags             print loader flags
-  --rpath               print path to shared library
-  --help                display this help and exit
-  --version             output version information
+  --prefix        print libpng prefix
+  --libdir        print path to directory containing library
+  --libs          print library linking information
+  --ccopts        print compiler options
+  --cppflags      print pre-processor flags
+  --cflags        print preprocessor flags, I_opts, and compiler options
+  --I_opts        print "-I" include options
+  --L_opts        print linker "-L" flags for dynamic linking
+  --R_opts        print dynamic linker "-R" or "-rpath" flags
+  --ldopts        print linker options
+  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)
+  --static        revise subsequent outputs for static linking
+  --help          print this help and exit
+  --version       print version information

 EOF
 
     exit $1
 EOF
 
     exit $1


@@ -39,24 +45,44 @@ while test $# -gt 0; do
         usage 0
         ;;
 
         usage 0
         ;;
 

-    --cflags)
-        echo ${cflags}
+    --ccopts)
+        echo ${ccopts}

         ;;
 
     --cppflags)
         echo ${cppflags}
         ;;
 
         ;;
 
     --cppflags)
         echo ${cppflags}
         ;;
 

+    --cflags)
+        echo ${I_opts} ${cppflags} ${ccopts}
+        ;;
+
+    --libdir)
+        echo ${libdir}
+        ;;
+

     --libs)
         echo ${libs}
         ;;
 
     --libs)
         echo ${libs}
         ;;
 

-    --rpath)
-        echo ${rpath}
+    --I_opts)
+        echo ${I_opts}
+        ;;
+
+    --L_opts)
+        echo ${L_opts}
+        ;;
+
+    --R_opts)
+        echo ${R_opts}

         ;;
 
     --ldflags)
         ;;
 
     --ldflags)

-        echo ${ldflags}
+        echo ${ldflags} ${L_opts} ${R_opts} ${libs}
+        ;;
+
+    --static)
+        R_opts=""

         ;;
 
     *)
         ;;
 
     *)